docker image: reorder recipes to prevent influence on console-images

recipes-connectivity/openssh/openssh_%.bbappend

@@ -0,0 +1,9 @@
+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,18 +1,5 @@
 LICENSE = "GPLv2"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += " \
+SRC_URI += " file://docker.init"
-	file://docker.init \
-    file://S49cgroups_mount.sh \
-"
-
-do_install_append () {
-        install -d ${D}${sysconfdir}/
-        install -d ${D}${sysconfdir}/rcS.d/
-        install -m 0755 ${WORKDIR}/S49cgroups_mount.sh ${D}${sysconfdir}/rcS.d/
-
-        cd ${D}${sysconfdir}/rcS.d/
-        ln -s ../init.d/docker.init S50docker.sh
-
-}
 

recipes-core/busybox/busybox-initcfg.bb

@@ -0,0 +1,28 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+#file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += " \
+        file://S20load_modules.sh \
+        file://S49cgroups_mount.sh \
+        file://ntp.conf \
+        file://ntpd \
+"
+
+do_install_append () {
+        install -d ${D}${sysconfdir}/
+        install -d ${D}${sysconfdir}/rcS.d/
+        install -d ${D}${sysconfdir}/init.d/
+        install -m 0644 ${WORKDIR}/ntp.conf ${D}${sysconfdir}
+        install -m 0755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d/
+        install -m 0755 ${WORKDIR}/S20load_modules.sh ${D}${sysconfdir}/rcS.d/
+        install -m 0755 ${WORKDIR}/S49cgroups_mount.sh ${D}${sysconfdir}/rcS.d/
+
+        cd ${D}${sysconfdir}/rcS.d/
+        ln -s ../init.d/networking S40networking.sh
+        ln -s ../init.d/ntpd S48ntpd.sh
+        ln -s ../init.d/docker.init S50docker.sh
+}
+

recipes-core/busybox/busybox_%.bbappend

@@ -1,19 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += " \
+SRC_URI += " file://fragments.cfg"
-	file://S20load_modules.sh \
-	file://fragments.cfg \
-	file://ntp.conf \
-	file://ntpd \
-"
-
-do_install_append () {
-        install -d ${D}${sysconfdir}/rcS.d/
-        install -m 0644 ${WORKDIR}/ntp.conf ${D}${sysconfdir}
-        install -m 0755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d/
-        install -m 0755 ${WORKDIR}/S20load_modules.sh ${D}${sysconfdir}/rcS.d/
-
-        cd ${D}${sysconfdir}/rcS.d/
-        ln -s ../init.d/ntpd S48ntpd.sh
-}
 

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

@@ -40,7 +40,6 @@ EXTRA_TOOLS_INSTALL = " \
     e2fsprogs-mke2fs \
     ethtool \
     findutils \
-    htop \
     i2c-tools \
     less \
     mc \

recipes-core/images/docker-image.bb

@@ -6,5 +6,9 @@ require tiny-image-base.inc
 
 IMAGE_INSTALL_append = " initscripts init-ifupdown docker-ce"
 
+EXTRA_USERS_PARAMS += " \
+    usermod -a -G docker tkl \
+"
+
 export IMAGE_BASENAME = "docker-image"
 

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

@@ -5,6 +5,7 @@ require users.inc
 IMAGE_FEATURES += "package-management"
 
 CORE_OS = " \
+	busybox-initcfg \
 	openssh \
 	openssh-keygen \
 	openssh-sftp-server \
@@ -31,7 +32,6 @@ IMAGE_INSTALL += " \
 "
 
 IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
-#IMAGE_INSTALL_append_raspberrypi3_64 += " linux-firmware-bcm43430"
 IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
 
 set_local_timezone() {
@@ -45,5 +45,5 @@ disable_bootlogd() {
 ROOTFS_POSTPROCESS_COMMAND += " \
 	set_local_timezone ; \
 	disable_bootlogd ; \
- "
+"
 

recipes-core/init-ifupdown-1.0/init-ifupdown_1.0.bbappend

@@ -1,8 +1,2 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-do_install_append () {
-        mkdir -p ${D}${sysconfdir}/rcS.d/
-        cd ${D}${sysconfdir}/rcS.d/
-        ln -s ../init.d/networking S40networking.sh
-}
-

tatus

@@ -0,0 +1,89 @@
+commit f5a399e87a63543d5ffe2a32895fddb8560a6765 (HEAD -> develop/docker-image, bf/develop/docker-image)
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Sun Jan 26 12:42:49 2020 +0100
+
+    docker-image: add beaglebone
+
+commit 2ea40c1e8aea2a92670adf95cd8a7fd4c105e57d (m/master, bf/zeus)
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Thu Jan 23 18:58:15 2020 +0100
+
+    docker image for rpi3_64
+
+commit f655d5f14b2716262c99a0396c01f46619ae893e
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Mon Jan 20 15:09:26 2020 +0100
+
+    Add docker-image in order to launch a base system capable of running docker daemon
+
+commit 63182b910a07b438aba7fa51580e6c65dd23ad09
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Sun Dec 1 08:13:02 2019 +0100
+
+    recipes-core: Reorder console-image and console-dev-image
+
+commit e13e24240612de06a58a029c5808683e1a5eef49
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Fri Nov 29 20:21:11 2019 +0100
+
+    conf: New branch zeus
+
+commit 6d422b1544e00fc65a2a85fa7d109880f6774fb7 (bf/warrior)
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Fri Nov 29 07:36:46 2019 +0100
+
+    conf: New branch warrior
+
+commit 81715eee0344574f50370cad3052d22b83009980 (bf/thud)
+Author: Thomas Klaehn <thomas.klaehn@perinet.io>
+Date:   Fri Nov 29 07:18:14 2019 +0100
+
+    recipes-core: Add new development console image
+
+commit 4106b9bfce4a928c7ef14aec4137ecf9508471a6
+Author: Thomas Klaehn <tkl@blackfinn.de>
+Date:   Tue Mar 12 08:58:52 2019 +0100
+
+    meta-blackfinn: Unify layer structure
+    
+    Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>
+
+commit 3d6da70452493b18d54bfc08fe8b66cdaef31eb9
+Author: Thomas Klaehn <tkl@blackfinn.de>
+Date:   Tue Mar 12 06:22:10 2019 +0100
+
+    conf: Add machine configuration for bananapi-m3
+    
+    Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>
+
+commit 2424981737dde7b9eb8f8d12c6930b81ca511a9d
+Author: Thomas Klaehn <tkl@blackfinn.de>
+Date:   Tue Mar 12 06:16:55 2019 +0100
+
+    meta-blackfinn: Fix layer config
+    
+    Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>
+
+commit cd3f5d98cd552bf9e98604ce148a0fba13eef492
+Author: Thomas Klaehn <tkl@blackfinn.de>
+Date:   Sun Mar 3 14:02:48 2019 +0100
+
+    condloe-image: Add packagegroup-board
+    
+    Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>
+
+commit 19ab0af33a3997d4486a03a90161bfa2bb8c5add
+Author: Thomas Klaehn <tkl@blackfinn.de>
+Date:   Sat Mar 2 08:05:03 2019 +0100
+
+    buildconf: Add init environment script for bbb and rpi
+    
+    Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>
+
+commit baa49abfdd418ac82a9808323e5281ee34139596
+Author: Thomas Klaehn <thomas.klaehn@u-blox.com>
+Date:   Fri Jan 25 15:20:21 2019 +0100
+
+    meta-blackfinn: Initial commit
+    
+    Signed-off-by: Thomas Klaehn <thomas.klaehn@u-blox.com>