From 497d6aa4e32200826b688d661357383f5df8c9e4 Mon Sep 17 00:00:00 2001 From: tkl Date: Thu, 4 Feb 2021 14:51:30 +0100 Subject: [PATCH] Rename docker-image -> docker-host-image --- buildconf/beaglebone-yocto/conf-notes.txt | 3 ++- buildconf/beaglebone-yocto/local.conf.sample | 6 ++++-- buildconf/qemuarm/conf-notes.txt | 3 ++- buildconf/qemuarm/local.conf.sample | 8 ++++---- buildconf/raspberrypi3-64/conf-notes.txt | 3 ++- buildconf/raspberrypi3-64/local.conf.sample | 6 ++++-- buildconf/raspberrypi4-64/conf-notes.txt | 3 ++- buildconf/raspberrypi4-64/local.conf.sample | 8 +++++--- recipes-core/images/docker-host-dev-image.bb | 13 +++++++++++++ .../{docker-image.bb => docker-host-image.bb} | 2 +- 10 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 recipes-core/images/docker-host-dev-image.bb rename recipes-core/images/{docker-image.bb => docker-host-image.bb} (83%) diff --git a/buildconf/beaglebone-yocto/conf-notes.txt b/buildconf/beaglebone-yocto/conf-notes.txt index c24917c..e2864e7 100644 --- 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 diff --git a/buildconf/beaglebone-yocto/local.conf.sample b/buildconf/beaglebone-yocto/local.conf.sample index 70bf2e6..2e3ac05 100644 --- 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 \ +" diff --git a/buildconf/qemuarm/conf-notes.txt b/buildconf/qemuarm/conf-notes.txt index c24917c..e2864e7 100644 --- 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 diff --git a/buildconf/qemuarm/local.conf.sample b/buildconf/qemuarm/local.conf.sample index 9666b22..20ea531 100644 --- 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 \ +" diff --git a/buildconf/raspberrypi3-64/conf-notes.txt b/buildconf/raspberrypi3-64/conf-notes.txt index 48af6bd..2a250aa 100644 --- 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 diff --git a/buildconf/raspberrypi3-64/local.conf.sample b/buildconf/raspberrypi3-64/local.conf.sample index 377dd45..9ac13e2 100644 --- 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 \ +" diff --git a/buildconf/raspberrypi4-64/conf-notes.txt b/buildconf/raspberrypi4-64/conf-notes.txt index 48af6bd..2a250aa 100644 --- 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 diff --git a/buildconf/raspberrypi4-64/local.conf.sample b/buildconf/raspberrypi4-64/local.conf.sample index 377dd45..3c33a0f 100644 --- 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 \ +" diff --git a/recipes-core/images/docker-host-dev-image.bb b/recipes-core/images/docker-host-dev-image.bb new file mode 100644 index 0000000..84cf684 --- /dev/null +++ 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" + diff --git a/recipes-core/images/docker-image.bb b/recipes-core/images/docker-host-image.bb similarity index 83% rename from recipes-core/images/docker-image.bb rename to recipes-core/images/docker-host-image.bb index 5e8977a..c71f624 100644 --- a/recipes-core/images/docker-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"