Rename docker-image -> docker-host-image

Signed-off-by: Thomas Klaehn <thomas.klaehn@perinet.io>

buildconf/beaglebone-yocto/bblayers.conf.sample

@@ -12,9 +12,11 @@ BBLAYERS ?= " \
   ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \
   ${TOPDIR}/../layers/meta-openembedded/meta-oe \
   ${TOPDIR}/../layers/meta-openembedded/meta-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-perl \
   ${TOPDIR}/../layers/meta-openembedded/meta-python \
   ${TOPDIR}/../layers/meta-virtualization \
   ${TOPDIR}/../layers/meta-raspberrypi \
+  ${TOPDIR}/../layers/meta-security \
   ${TOPDIR}/../layers/meta-blackfinn \
   "
 

buildconf/beaglebone-yocto/conf-notes.txt

@@ -1,7 +1,8 @@
 Common targets are:
     console-image
     console-dev-image
-    docker-image
+    docker-host-image
+    docker-host-dev-image
     tiny-image
     core-image-minimal
     core-image-sato

buildconf/beaglebone-yocto/local.conf.sample

@@ -42,3 +42,11 @@ SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
 BB_GENERATE_MIRROR_TARBALLS = "1"
 
 export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
+
+ICECC_PARALLEL_MAKE = "-j 24"
+INHERIT += "icecc"
+
+ICECC_USER_PACKAGE_BL = "pkgconfig-native \
+    json-c \
+    podman \
+"

buildconf/qemuarm/bblayers.conf.sample

@@ -0,0 +1,22 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "3"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ${TOPDIR}/../layers/poky/meta \
+  ${TOPDIR}/../layers/poky/meta-poky \
+  ${TOPDIR}/../layers/poky/meta-yocto-bsp \
+  ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \
+  ${TOPDIR}/../layers/meta-openembedded/meta-oe \
+  ${TOPDIR}/../layers/meta-openembedded/meta-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-perl \
+  ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-virtualization \
+  ${TOPDIR}/../layers/meta-raspberrypi \
+  ${TOPDIR}/../layers/meta-security \
+  ${TOPDIR}/../layers/meta-blackfinn \
+  "
+

buildconf/qemuarm/conf-notes.txt

@@ -1,6 +1,8 @@
 Common targets are:
     console-image
     console-dev-image
+    docker-host-image
+    docker-host-dev-image
     tiny-image
     core-image-minimal
     core-image-sato

buildconf/qemuarm/local.conf.sample

@@ -1,4 +1,4 @@
-MACHINE ?= "bananapi-m3"
+MACHINE ?= "qemuarm"
 
 #DL_DIR ?= "${TOPDIR}/../../downloads"
 #SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
@@ -13,6 +13,8 @@ PACKAGE_CLASSES ?= "package_ipk"
 
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
+SERIAL_CONSOLES = "115200;ttyS0"
+
 PATCHRESOLVE = "noop"
 
 BB_DISKMON_DIRS = "\
@@ -39,3 +41,10 @@ BB_GENERATE_MIRROR_TARBALLS = "1"
 
 export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 
+ICECC_PARALLEL_MAKE = "-j 24"
+INHERIT += "icecc"
+
+ICECC_USER_PACKAGE_BL = "pkgconfig-native \
+    json-c \
+    podman \
+"

buildconf/raspberrypi3-64/bblayers.conf.sample

@@ -12,8 +12,10 @@ BBLAYERS ?= " \
   ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \
   ${TOPDIR}/../layers/meta-openembedded/meta-oe \
   ${TOPDIR}/../layers/meta-openembedded/meta-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-perl \
   ${TOPDIR}/../layers/meta-openembedded/meta-python \
   ${TOPDIR}/../layers/meta-raspberrypi \
   ${TOPDIR}/../layers/meta-virtualization \
+  ${TOPDIR}/../layers/meta-security \
   ${TOPDIR}/../layers/meta-blackfinn \
   "

buildconf/raspberrypi3-64/conf-notes.txt

@@ -2,7 +2,8 @@ Common targets are:
     console-image
     console-dev-image
     tiny-image
-    docker-image
+    docker-host-image
+    docker-host-dev-image
     core-image-minimal
     core-image-sato
     meta-toolchain

buildconf/raspberrypi3-64/local.conf.sample

@@ -31,6 +31,8 @@ ENABLE_UART = "1"
 ENABLE_SPI_BUS = "1"
 ENABLE_I2C = "1"
 
+RPI_USE_U_BOOT = "1"
+
 INHERIT += "rm_work"
 
 INHERIT += "own-mirrors"
@@ -39,3 +41,10 @@ BB_GENERATE_MIRROR_TARBALLS = "1"
 
 export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 
+ICECC_PARALLEL_MAKE = "-j 24"
+INHERIT += "icecc"
+
+ICECC_USER_PACKAGE_BL = "pkgconfig-native \
+    json-c \
+    podman \
+"

buildconf/raspberrypi4-64/bblayers.conf.sample

@@ -1,6 +1,6 @@
 # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
+POKY_BBLAYERS_CONF_VERSION = "3"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -8,9 +8,14 @@ BBFILES ?= ""
 BBLAYERS ?= " \
   ${TOPDIR}/../layers/poky/meta \
   ${TOPDIR}/../layers/poky/meta-poky \
+  ${TOPDIR}/../layers/poky/meta-yocto-bsp \
+  ${TOPDIR}/../layers/meta-openembedded/meta-filesystems \
   ${TOPDIR}/../layers/meta-openembedded/meta-oe \
   ${TOPDIR}/../layers/meta-openembedded/meta-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-perl \
   ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-raspberrypi \
+  ${TOPDIR}/../layers/meta-virtualization \
+  ${TOPDIR}/../layers/meta-security \
   ${TOPDIR}/../layers/meta-blackfinn \
-  ${TOPDIR}/../layers/meta-sunxi \
   "

buildconf/raspberrypi4-64/conf-notes.txt

@@ -0,0 +1,12 @@
+Common targets are:
+    console-image
+    console-dev-image
+    tiny-image
+    docker-host-image
+    docker-host-dev-image
+    core-image-minimal
+    core-image-sato
+    meta-toolchain
+    adt-installer
+    meta-ide-support
+

buildconf/raspberrypi4-64/local.conf.sample

@@ -0,0 +1,50 @@
+MACHINE ?= "raspberrypi4-64"
+
+DISTRO ?= "roro"
+PACKAGE_CLASSES ?= "package_ipk"
+
+#SDKMACHINE ?= "i686"
+
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+PATCHRESOLVE = "noop"
+
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+CONF_VERSION = "1"
+
+ENABLE_UART = "1"
+ENABLE_SPI_BUS = "1"
+ENABLE_I2C = "1"
+
+RPI_USE_U_BOOT = "1"
+
+INHERIT += "rm_work"
+
+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"
+
+ICECC_PARALLEL_MAKE = "-j 24"
+INHERIT += "icecc"
+
+ICECC_USER_PACKAGE_BL = "pkgconfig-native \
+    json-c \
+    podman \
+"

conf/layer.conf

@@ -9,7 +9,7 @@ BBFILES += " \
 
 BBFILE_COLLECTIONS += "meta-blackfinn"
 BBFILE_PATTERN_meta-blackfinn = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-blackfinn = "11"
+BBFILE_PRIORITY_meta-blackfinn = "12"
 
-LAYERSERIES_COMPAT_meta-blackfinn = "zeus warrior thud sumo rocko"
+LAYERSERIES_COMPAT_meta-blackfinn = "gatesgarth dunfell zeus warrior thud sumo rocko"
 

conf/machine/bananapi-m3.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m3
-#@DESCRIPTION: Machine configuration for the Bananapi M3, based on the
-#Allwinner A83T CPU.
-
-require conf/machine/include/sun8i.inc
-
-PREFERRED_VERSION_u-boot = "v2018.09%"
-UBOOT_MACHINE = "Sinovoip_BPI_M3_defconfig"
-
-PREFERRED_VERSION_virtual/kernel = "4.20.15"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "sun8i-a83t-bananapi-m3.dtb"
-

recipes-connectivity/openssh/openssh_%.bbappend

@@ -1,9 +0,0 @@
-do_install_append () {
-        install -d ${D}${sysconfdir}/
-        install -d ${D}${sysconfdir}/rcS.d/
-
-        cd ${D}${sysconfdir}/rcS.d/
-        ln -s ../init.d/sshd S47sshd.sh
-
-}
-

recipes-containers/docker/docker-ce_git.bbappend

@@ -1,5 +1,13 @@
 LICENSE = "GPLv2"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += " file://docker.init"
+SRC_URI += " \
+    file://docker.init \
+    file://daemon.json \
+"
 
+do_install_append() {
+    install -d ${D}${sysconfdir}/
+    install -d ${D}${sysconfdir}/docker/
+    install -m 0600 ${WORKDIR}/daemon.json ${D}${sysconfdir}/docker/
+}

recipes-containers/docker/files/daemon.json

@@ -0,0 +1,5 @@
+{
+  "ipv6": true,
+  "fixed-cidr-v6": "2001:db8:1::/64"
+}
+

recipes-core/base-files/files/bananapi-m3/motd

@@ -1,12 +0,0 @@
-
-
-______                                     _  ___  ___ _____ 
-| ___ \                                   (_) |  \/  ||____ |
-| |_/ / __ _ _ __   __ _ _ __   __ _ _ __  _  | .  . |    / /
-| ___ \/ _` | '_ \ / _` | '_ \ / _` | '_ \| | | |\/| |    \ \
-| |_/ / (_| | | | | (_| | | | | (_| | |_) | | | |  | |.___/ /
-\____/ \__,_|_| |_|\__,_|_| |_|\__,_| .__/|_| \_|  |_/\____/ 
-                                    | |                      
-                                    |_|                      
-
-

recipes-core/busybox/busybox-initcfg.bb

@@ -22,6 +22,7 @@ do_install_append () {
 
         cd ${D}${sysconfdir}/rcS.d/
         ln -s ../init.d/networking S40networking.sh
+	ln -s ../init.d/dropbear S47dropbear.sh
         ln -s ../init.d/ntpd S48ntpd.sh
         ln -s ../init.d/docker.init S50docker.sh
 }

recipes-core/images/console-image-base.inc

@@ -74,7 +74,6 @@ IMAGE_INSTALL += " \
 "
 
 IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
-IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
 
 set_local_timezone() {
     ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime

recipes-core/images/docker-host-dev-image.bb

@@ -0,0 +1,13 @@
+SUMMARY = "Development image for docker host system"
+HOMEPAGE = "https://blackfinn.de"
+LICENSE = "MIT"
+
+require docker-host-image.bb
+
+IMAGE_INSTALL_append = " \
+    git \
+    vim \
+"
+
+export IMAGE_BASENAME = "docker-host-dev-image"
+

recipes-core/images/docker-host-image.bb

@@ -10,5 +10,5 @@ EXTRA_USERS_PARAMS += " \
     usermod -a -G docker tkl \
 "
 
-export IMAGE_BASENAME = "docker-image"
+export IMAGE_BASENAME = "docker-host-image"
 

recipes-core/images/podman-host-image.bb

@@ -0,0 +1,15 @@
+SUMMARY = "A tiny image"
+HOMEPAGE = "https://blackfinn.de"
+LICENSE = "MIT"
+
+require tiny-image-base.inc
+
+IMAGE_INSTALL_append = " \
+    initscripts \
+    init-ifupdown \
+    podman \
+    podman-compose \
+    cgroup-lite \
+"
+
+export IMAGE_BASENAME = "podman-host-image"

recipes-core/images/tiny-image-base.inc

@@ -6,9 +6,7 @@ IMAGE_FEATURES += "package-management"
 
 CORE_OS = " \
 	busybox-initcfg \
-	openssh \
-	openssh-keygen \
-	openssh-sftp-server \
+	dropbear \
 	psplash \
 	tzdata \
 "
@@ -32,7 +30,6 @@ IMAGE_INSTALL += " \
 "
 
 IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
-IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
 
 set_local_timezone() {
 	ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime

recipes-devtools/opkg/files/raspberrypi4_64/opkg.conf

@@ -25,8 +25,8 @@
 #option offline_root target
 
 src/gz all https://opkg.blackfinn.de/thud/all
-src/gz armv7vet2hf-neon https://opkg.blackfinn.de/thud/armv7vet2hf-neon
-src/gz bananapi_m3 https://opkg.blackfinn.de/thud/bananapi_m3
+src/gz raspberrypi4_64 https://opkg.blackfinn.de/thud/raspberrypi4_64
+src/gz aarch64 https://opkg.blackfinn.de/thud/aarch64
 
 # Default destination for installed packages
 dest root /

recipes-kernel/linux/files/bananapi-m3/defconfig

@@ -1,153 +0,0 @@
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_CGROUPS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_PERF_EVENTS=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_CMA=y
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_CAN=y
-CONFIG_CAN_SUN4I=y
-# CONFIG_WIRELESS is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_AHCI_SUNXI=y
-CONFIG_NETDEVICES=y
-CONFIG_SUN4I_EMAC=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-CONFIG_STMMAC_ETH=y
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_WLAN is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_SUN4I_LRADC=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_SUN4I=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AXP20X_PEK=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_RUNTIME_UARTS=8
-CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MV64XXX=y
-CONFIG_I2C_SUN6I_P2WI=y
-CONFIG_SPI=y
-CONFIG_SPI_SUN4I=y
-CONFIG_SPI_SUN6I=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_CHARGER_AXP20X=y
-CONFIG_BATTERY_AXP20X=y
-CONFIG_AXP20X_POWER=y
-CONFIG_THERMAL=y
-CONFIG_CPU_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_SUNXI_WATCHDOG=y
-CONFIG_MFD_AC100=y
-CONFIG_MFD_AXP20X_I2C=y
-CONFIG_MFD_AXP20X_RSB=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_AXP20X=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_RC_CORE=y
-CONFIG_RC_DEVICES=y
-CONFIG_IR_SUNXI=y
-CONFIG_DRM=y
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_DUMB_VGA_DAC=y
-CONFIG_FB_SIMPLE=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SUN4I_CODEC=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_SUNXI=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GADGET=y
-CONFIG_MMC=y
-CONFIG_MMC_SUNXI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_INTF_SYSFS is not set
-# CONFIG_RTC_INTF_PROC is not set
-CONFIG_RTC_DRV_AC100=y
-CONFIG_RTC_DRV_SUNXI=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_SUN6I=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXTCON=y
-CONFIG_IIO=y
-CONFIG_AXP20X_ADC=y
-CONFIG_PWM=y
-CONFIG_PWM_SUN4I=y
-CONFIG_PHY_SUN4I_USB=y
-CONFIG_PHY_SUN9I_USB=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SUNXI_SID=y
-CONFIG_EXT4_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-CONFIG_CRYPTO_DEV_SUN4I_SS=y

recipes-kernel/linux/files/raspberrypi3-64/config.cfg

@@ -0,0 +1,2 @@
+CONFIG_I2C_BCM2835=y
+CONFIG_DRM=y

recipes-kernel/linux/files/raspberrypi4-64/config.cfg

@@ -0,0 +1,2 @@
+CONFIG_I2C_BCM2835=y
+CONFIG_DRM=y

recipes-kernel/linux/linux-mainline_4.20.15.bb

@@ -1,27 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "sun8i"
-
-inherit kernel
-
-# Since we're not using git, this doesn't make a difference, but we need to fill
-# in something or kernel-yocto.bbclass will fail.
-KBRANCH ?= "master"
-
-# Pull in the devicetree files into the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-S = "${WORKDIR}/linux-${PV}"
-
-SRC_URI[md5sum] = "8e2e10238ce5698904e9ea1e851f4ddd"
-SRC_URI[sha256sum] = "d93b1b216e909e4ea8441a41a070f839f55ac9cf5f7effb16e1b04e7f5688407"
-
-SRC_URI = " \
-	https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
-	file://defconfig \
-"
-

recipes-kernel/linux/linux-raspberrypi_%.bbappend

@@ -1,2 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+KERNEL_FEATURES_remove = " cfg/virtio.scc"
+
 KERNEL_MODULE_AUTOLOAD += " brcmfmac i2c-dev spi-bcm2835"
 
+SRC_URI += " \
+    file://config.cfg \
+"

recipes-kernel/linux/linux-yocto_5.%.bbappend

@@ -1,11 +1,12 @@
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-KERNEL_MODULE_AUTOLOAD += " rtl8192cu"
+KERNEL_MODULE_AUTOLOAD_ti33x += " rtl8192cu"
 
-SRC_URI += " \
+
+SRC_URI_ti33x += " \
 	file://rtl8192cu.cfg \
 	file://enable_onboard_leds.cfg \
 	file://enable_hostap_wext.cfg \