images: add podman-host-image

2021-01-28 13:52:11 +01:00
11 changed files with 17 additions and 39 deletions
--- a/buildconf/beaglebone-yocto/conf-notes.txt
+++ b/buildconf/beaglebone-yocto/conf-notes.txt
@ -1,8 +1,7 @@
 Common targets are:
    console-image
    console-dev-image
-    docker-host-image
-    docker-host-dev-image
+    docker-image
    tiny-image
    core-image-minimal
    core-image-sato
--- a/buildconf/beaglebone-yocto/local.conf.sample
+++ b/buildconf/beaglebone-yocto/local.conf.sample
@ -46,7 +46,5 @@ 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 \
-"
+ICECC_USER_PACKAGE_BL = "pkgconfig-native"
+
--- a/buildconf/qemuarm/conf-notes.txt
+++ b/buildconf/qemuarm/conf-notes.txt
@ -1,8 +1,7 @@
 Common targets are:
    console-image
    console-dev-image
-    docker-host-image
-    docker-host-dev-image
+    docker-image
    tiny-image
    core-image-minimal
    core-image-sato
--- a/buildconf/qemuarm/local.conf.sample
+++ b/buildconf/qemuarm/local.conf.sample
@ -13,6 +13,8 @@ PACKAGE_CLASSES ?= "package_ipk"

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

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

 PATCHRESOLVE = "noop"
@ -44,7 +46,5 @@ 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 \
-"
+ICECC_USER_PACKAGE_BL = "pkgconfig-native"
+
--- a/buildconf/raspberrypi3-64/conf-notes.txt
+++ b/buildconf/raspberrypi3-64/conf-notes.txt
@ -2,8 +2,7 @@ Common targets are:
    console-image
    console-dev-image
    tiny-image
-    docker-host-image
-    docker-host-dev-image
+    docker-image
    core-image-minimal
    core-image-sato
    meta-toolchain
--- a/buildconf/raspberrypi3-64/local.conf.sample
+++ b/buildconf/raspberrypi3-64/local.conf.sample
@ -44,7 +44,5 @@ 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 \
-"
+ICECC_USER_PACKAGE_BL = "pkgconfig-native"
+
--- a/buildconf/raspberrypi4-64/conf-notes.txt
+++ b/buildconf/raspberrypi4-64/conf-notes.txt
@ -2,8 +2,7 @@ Common targets are:
    console-image
    console-dev-image
    tiny-image
-    docker-host-image
-    docker-host-dev-image
+    docker-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 ?= "raspberrypi4-64"
+MACHINE ?= "raspberrypi3-64"

 DISTRO ?= "roro"
 PACKAGE_CLASSES ?= "package_ipk"
@ -44,7 +44,5 @@ 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 \
-"
+ICECC_USER_PACKAGE_BL = "pkgconfig-native"
+
--- a/recipes-core/images/docker-host-dev-image.bb
+++ b/recipes-core/images/docker-host-dev-image.bb
@ -1,13 +0,0 @@
-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-host-image"
+export IMAGE_BASENAME = "docker-image"

--- a/recipes-core/images/podman-host-image.bb
+++ b/recipes-core/images/podman-host-image.bb
@ -9,6 +9,7 @@ IMAGE_INSTALL_append = " \
    init-ifupdown \
    podman \
    podman-compose \
+    crun \
    cgroup-lite \
 "