Rename docker-image -> docker-host-image

images: add podman-host-image
2021-02-04 14:55:27 +01:00 · 2021-02-04 14:55:27 +01:00
15 changed files with 62 additions and 16 deletions
--- a/buildconf/beaglebone-yocto/bblayers.conf.sample
+++ b/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 \
  "

--- a/buildconf/beaglebone-yocto/conf-notes.txt
+++ b/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
--- a/buildconf/beaglebone-yocto/local.conf.sample
+++ b/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 \
+"
--- a/buildconf/qemuarm/bblayers.conf.sample
+++ b/buildconf/qemuarm/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 \
  "

--- a/buildconf/qemuarm/conf-notes.txt
+++ b/buildconf/qemuarm/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
--- a/buildconf/qemuarm/local.conf.sample
+++ b/buildconf/qemuarm/local.conf.sample
@ -13,8 +13,6 @@ PACKAGE_CLASSES ?= "package_ipk"

 USER_CLASSES ?= "buildstats image-mklibs image-prelink"

-IMAGE_BOOT_FILES_append = " uEnv.txt"
-
 SERIAL_CONSOLES = "115200;ttyS0"

 PATCHRESOLVE = "noop"
@ -46,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 \
+"
--- a/buildconf/raspberrypi3-64/bblayers.conf.sample
+++ b/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 \
  "
--- a/buildconf/raspberrypi3-64/conf-notes.txt
+++ b/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
--- a/buildconf/raspberrypi3-64/local.conf.sample
+++ b/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 \
+"
--- a/buildconf/raspberrypi4-64/bblayers.conf.sample
+++ b/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 \
  "
--- a/buildconf/raspberrypi4-64/conf-notes.txt
+++ b/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
--- a/buildconf/raspberrypi4-64/local.conf.sample
+++ b/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 \
+"
--- a/recipes-core/images/docker-host-dev-image.bb
+++ b/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"
+
--- a/recipes-core/images/docker-host-image.bb
+++ b/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"

--- a/recipes-core/images/podman-host-image.bb
+++ b/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"
Author	SHA1	Message	Date
tkl	497d6aa4e3	Rename docker-image -> docker-host-image	2021-02-04 14:55:27 +01:00
Thomas Klaehn	d698d2f609	images: add podman-host-image	2021-02-04 14:55:27 +01:00