meta-rpi: Remove recipes moved to meta-blackfinn

Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>

Readme.md

@@ -1,4 +1,4 @@
-# meta-bbb
+# meta-rpi
-Yocto meta layer to customize the beaglebone black yocto distribution.
+Yocto meta layer to customize the raspberrypi.
 
 

buildconf/bblayers.conf.sample

@@ -13,5 +13,6 @@ BBLAYERS ?= " \
   ${TOPDIR}/../layers/meta-openembedded/meta-networking \
   ${TOPDIR}/../layers/meta-openembedded/meta-python \
   ${TOPDIR}/../layers/meta-raspberrypi \
+  ${TOPDIR}/../layers/meta-blackfinn \
   ${TOPDIR}/../layers/meta-rpi \
   "

buildconf/local.conf.sample

@@ -1,9 +1,5 @@
 MACHINE ?= "raspberrypi3-64"
 
-#DL_DIR ?= "${TOPDIR}/../../downloads"
-#SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
-#TMPDIR = "${TOPDIR}/tmp"
-
 DISTRO ?= "poky"
 PACKAGE_CLASSES ?= "package_ipk"
 
@@ -13,8 +9,6 @@ PACKAGE_CLASSES ?= "package_ipk"
 
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
-#IMAGE_BOOT_FILES_append = " uEnv.txt"
-
 PATCHRESOLVE = "noop"
 
 BB_DISKMON_DIRS = "\
@@ -35,12 +29,9 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 
-#INHERIT += "icecc"
-#ICECC_PATH = "/usr/bin/icecc"
-#ICECC_PARALLEL_MAKE = "-j 20"
-
 INHERIT += "own-mirrors"
 SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
 BB_GENERATE_MIRROR_TARBALLS = "1"
 
 export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
+

conf/layer.conf

@@ -4,7 +4,6 @@ BBPATH .= ":${LAYERDIR}"
 # We have recipes-* directories, add to BBFILES
 BBFILES += " \
 	${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/images/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend \
 "
 
@@ -12,3 +11,5 @@ BBFILE_COLLECTIONS += "meta-rpi"
 BBFILE_PATTERN_meta-rpi = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-rpi = "7"
 
+LAYERSERIES_COMPAT_meta-rpi = "thud sumo rocko"
+

images/console-image.bb

@@ -1,96 +0,0 @@
-SUMMARY = "A console image with some additional tools"
-HOMEPAGE = "https://blackfinn.de"
-LICENSE = "MIT"
-
-inherit core-image extrausers
-
-IMAGE_FEATURES += "package-management"
-
-# Encrypt the password with: echo "<password>" | openssl passwd -1 -stdin
-EXTRA_USERS_PARAMS = " \
-    usermod -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' root; \
-    useradd -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' tkl; \
-"
-
-CORE_OS = " \
-    openssh \
-    openssh-keygen \
-    openssh-sftp-server \
-    psplash \
-    tzdata \
-"
-
-KERNEL_EXTRA_INSTALL = " \
-    kernel-modules \
- "
-
-WIFI_SUPPORT = " \
-    iw \
-    linux-firmware-rtl8192cu \
-    wireless-tools \
-    wpa-supplicant \
- "
-
-DEV_SDK_INSTALL = " \
-    file \
-    git \
-    make \
-    perl-modules \
-    pkgconfig \
-    python-modules \
- "
-
-EXTRA_TOOLS_INSTALL = " \
-    acpid \
-    bc \
-    bzip2 \
-    dosfstools \
-    e2fsprogs-mke2fs \
-    ethtool \
-    findutils \
-    htop \
-    i2c-tools \
-    less \
-    mc \
-    procps \
-    rsync \
-    sysfsutils \
-    unzip \
-    util-linux \
-    util-linux-blkid \
-    vim \
-    wget \
-    curl \
-    zip \
-    ntp \
- "
-
-MQTT = " \
-    python-paho-mqtt \
-"
-
-
-IMAGE_INSTALL += " \
-    ${CORE_OS} \
-    ${DEV_SDK_INSTALL} \
-    ${EXTRA_TOOLS_INSTALL} \
-    ${KERNEL_EXTRA_INSTALL} \
-    ${WIFI_SUPPORT} \
-    ${MQTT} \
-"
-
-set_local_timezone() {
-    ln -sf /usr/share/zoneinfo/Etc/UTC ${IMAGE_ROOTFS}/etc/localtime
-}
-
-disable_bootlogd() {
-    echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
-}
-
-ROOTFS_POSTPROCESS_COMMAND += " \
-    set_local_timezone ; \
-    disable_bootlogd ; \
- "
-
-export IMAGE_BASENAME = "console-image"
-

recipes-connectivity/wpa-supplicant/files/wpa_supplicant.conf

@@ -1,17 +1,17 @@
 #create encrypted passphrase with: wpa_passphrase '<ssid>' '<decrypted_key>'
-country=DE                                                               
+country=DE
-ctrl_interface=DIR=/var/run/wpa_supplicant                               
+ctrl_interface=DIR=/var/run/wpa_supplicant
-update_config=1                                                          
+update_config=1
-network={                                                                
+network={
-        ssid="FRITZ!Box 7330_EXT"                                        
+        ssid="FRITZ!Box 7330_EXT"
         psk=6bee2296d336ab07a1aca9f210be55095896e740225d920c0d7f15906dc35846
-        id_str="home_outdoor"                                               
+        id_str="home_outdoor"
-        priority=1                                                          
+        priority=2
-}                                                                           
+}
-network={                                                                   
+network={
-        ssid="FRITZ!Box 7330"                                               
+        ssid="FRITZ!Box 7330"
         psk=44df1640e42b8f4e4b424a39af700c817bc2b89f13c324d29c10bf7ba3028258
-        id_str="home_indoor"                                                
+        id_str="home_indoor"
-        priority=2                                                          
+        priority=1
 }
 

recipes-devtools/opkg/files/opkg.conf

@@ -24,9 +24,9 @@
 # Offline mode (for use in constructing flash images offline)
 #option offline_root target
 
-src/gz all https://opkg.blackfinn.de/sumo/all
+src/gz all https://opkg.blackfinn.de/thud/all
-src/gz beaglebone https://opkg.blackfinn.de/sumo/raspberrypi3_64
+src/gz raspberrypi3_64 https://opkg.blackfinn.de/thud/raspberrypi3_64
-src/gz cortexa8hf-neon https://opkg.blackfinn.de/sumo/aarch64
+src/gz aarch https://opkg.blackfinn.de/thud/aarch64
 
 # Default destination for installed packages
 dest root /

recipes-support/ntp/files/ntp.conf

@@ -1,19 +0,0 @@
-# This is the most basic ntp configuration file
-# The driftfile must remain in a place specific to this
-# machine - it records the machine specific clock error
-driftfile /var/lib/ntp/drift
-# This should be a server that is close (in IP terms)
-# to the machine.  Add other servers as required.
-# Unless you un-comment the line below ntpd will sync
-# only against the local system clock.
-#
-# server time.server.example.com
-server 192.168.178.1
-#
-# Using local hardware clock as fallback
-# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
-server 127.127.1.0
-fudge 127.127.1.0 stratum 14
-# Defining a default security setting
-restrict default
-

recipes-support/ntp/ntp_%.bbappend

@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-

tools/scripts/flash_bbb.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Remove old partitions on emmc.
-dd if=/dev/zero of=/dev/mmcblk1 bs=512 count=1
-
-# Create new partition table.
-echo "n
-p
-1
-
-+70M
-a
-t
-c
-n
-p
-
-
-
-w" | fdisk /dev/mmcblk1
-
-# Create file systems.
-mkfs.vfat -F 32 -n "boot" /dev/mmcblk1p1
-yes | mkfs.ext4 -L "rootfs" /dev/mmcblk1p2
-
-
-# Flash boot partition.
-mount /dev/mmcblk1p1 /media
-cp MLO /media
-cp u-boot.img /media
-cp uExt.txt /media
-sync
-umount /dev/mmcblk1p1
-
-# Flash rootfs partition
-mount /dev/mmcblk1p2 /media
-tar -C /media -xf rootfs.tar.bz2
-sync
-umount /dev/mmcblk1p2
-

tools/scripts/sync_ipk_up.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ -n "$1" ]; then
-	rsync -avz -e "ssh -o StrictHostKeyChecking=no" --progress tmp/deploy/ipk/ tkl@e320:/srv/ipk/$1
-else
-	echo "Which branch?"
-	exit -1
-fi
-

tools/scripts/sync_src_up.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-rsync -avz -e "ssh -o StrictHostKeyChecking=no" --progress downloads/ tkl@e320:/srv/files/mirror/sources
-