Rename docker-image -> docker-host-image

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

@@ -46,5 +46,7 @@ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 ICECC_PARALLEL_MAKE = "-j 24"
 INHERIT += "icecc"
 
-ICECC_USER_PACKAGE_BL = "pkgconfig-native"
-
+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

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

buildconf/qemuarm/local.conf.sample

@@ -0,0 +1,50 @@
+MACHINE ?= "qemuarm"
+
+#DL_DIR ?= "${TOPDIR}/../../downloads"
+#SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
+#TMPDIR = "${TOPDIR}/tmp"
+
+DISTRO ?= "roro"
+PACKAGE_CLASSES ?= "package_ipk"
+
+#SDKMACHINE ?= "i686"
+
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+SERIAL_CONSOLES = "115200;ttyS0"
+
+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"
+
+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 \
+"

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

@@ -44,5 +44,7 @@ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 ICECC_PARALLEL_MAKE = "-j 24"
 INHERIT += "icecc"
 
-ICECC_USER_PACKAGE_BL = "pkgconfig-native"
-
+ICECC_USER_PACKAGE_BL = "pkgconfig-native \
+    json-c \
+    podman \
+"

buildconf/raspberrypi4-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/raspberrypi4-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/raspberrypi4-64/local.conf.sample

@@ -1,4 +1,4 @@
-MACHINE ?= "raspberrypi3-64"
+MACHINE ?= "raspberrypi4-64"
 
 DISTRO ?= "roro"
 PACKAGE_CLASSES ?= "package_ipk"
@@ -44,5 +44,7 @@ export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 ICECC_PARALLEL_MAKE = "-j 24"
 INHERIT += "icecc"
 
-ICECC_USER_PACKAGE_BL = "pkgconfig-native"
-
+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 = "dunfell zeus warrior thud sumo rocko"
+LAYERSERIES_COMPAT_meta-blackfinn = "gatesgarth dunfell zeus warrior thud sumo rocko"
 

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-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-raspberrypi_%.bbappend

@@ -4,3 +4,6 @@ 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,12 +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 \