diff --git a/meta-digi-containers/README.md b/meta-digi-containers/README.md index 8be35b9cd..095439cb9 100644 --- a/meta-digi-containers/README.md +++ b/meta-digi-containers/README.md @@ -164,11 +164,11 @@ Set profile and naming in `conf/local.conf`: ```conf DISTRO_FEATURES:append = " virtualization" -DCP_NAME = "webkit" # or: lvgl, chromium, flutter, custom profile +DCP_NAME = "webkit-demo" # or: lvgl-demo, chromium-demo, flutter-demo, custom profile # PODMAN_TAG defaults to "${DCP_NAME}-tag" ``` -If `DCP_NAME` is not set, `dey-image-dcp` now defaults to `lvgl`. +If `DCP_NAME` is not set, `dey-image-dcp` now defaults to `lvgl-demo`. Build: @@ -209,9 +209,10 @@ Profile-specific behavior is controlled with: Current built-in profile examples: -- `container-lvgl` -- `container-flutter` -- `container-webkit` +- `container-lvgl-demo` +- `container-flutter-demo` +- `container-webkit-demo` +- `container-chromium-demo` You can add new profiles by appending variables with `:container-` overrides. @@ -334,15 +335,19 @@ Each profile is self-contained under `containers/`: ```text containers/ - lvgl/ + lvgl-demo/ rootfs_files/ configs_lxc/ artifact/ - flutter/ + chromium-demo/ rootfs_files/ configs_lxc/ artifact/ - webkit/ + flutter-demo/ + rootfs_files/ + configs_lxc/ + artifact/ + webkit-demo/ rootfs_files/ configs_lxc/ artifact/ diff --git a/meta-digi-containers/containers/chromium-demo/artifact/metadata/README.txt b/meta-digi-containers/containers/chromium-demo/artifact/metadata/README.txt new file mode 100644 index 000000000..a390c2cf8 --- /dev/null +++ b/meta-digi-containers/containers/chromium-demo/artifact/metadata/README.txt @@ -0,0 +1 @@ +Placeholder metadata for chromium-demo container artifacts. diff --git a/meta-digi-containers/containers/chromium-demo/artifact/metadata/changelog.txt b/meta-digi-containers/containers/chromium-demo/artifact/metadata/changelog.txt new file mode 100644 index 000000000..d7ddee170 --- /dev/null +++ b/meta-digi-containers/containers/chromium-demo/artifact/metadata/changelog.txt @@ -0,0 +1 @@ +Placeholder changelog for chromium-demo container artifacts. diff --git a/meta-digi-containers/containers/chromium/configs_lxc/config_lxc_ccimx95-dvk b/meta-digi-containers/containers/chromium-demo/configs_lxc/config_lxc_ccimx95-dvk similarity index 100% rename from meta-digi-containers/containers/chromium/configs_lxc/config_lxc_ccimx95-dvk rename to meta-digi-containers/containers/chromium-demo/configs_lxc/config_lxc_ccimx95-dvk diff --git a/meta-digi-containers/containers/chromium/rootfs_files/start-chromium-demo.sh b/meta-digi-containers/containers/chromium-demo/rootfs_files/start-chromium-demo.sh similarity index 100% rename from meta-digi-containers/containers/chromium/rootfs_files/start-chromium-demo.sh rename to meta-digi-containers/containers/chromium-demo/rootfs_files/start-chromium-demo.sh diff --git a/meta-digi-containers/containers/chromium/artifact/metadata/README.txt b/meta-digi-containers/containers/chromium/artifact/metadata/README.txt deleted file mode 100644 index f1249931f..000000000 --- a/meta-digi-containers/containers/chromium/artifact/metadata/README.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder metadata for chromium container artifacts. diff --git a/meta-digi-containers/containers/chromium/artifact/metadata/changelog.txt b/meta-digi-containers/containers/chromium/artifact/metadata/changelog.txt deleted file mode 100644 index a8a8e9675..000000000 --- a/meta-digi-containers/containers/chromium/artifact/metadata/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder changelog for webkit container artifacts. diff --git a/meta-digi-containers/containers/flutter-demo/artifact/metadata/README.txt b/meta-digi-containers/containers/flutter-demo/artifact/metadata/README.txt new file mode 100644 index 000000000..bbf41de2d --- /dev/null +++ b/meta-digi-containers/containers/flutter-demo/artifact/metadata/README.txt @@ -0,0 +1 @@ +Placeholder metadata for flutter-demo container artifacts. diff --git a/meta-digi-containers/containers/flutter-demo/artifact/metadata/changelog.txt b/meta-digi-containers/containers/flutter-demo/artifact/metadata/changelog.txt new file mode 100644 index 000000000..47883dc6a --- /dev/null +++ b/meta-digi-containers/containers/flutter-demo/artifact/metadata/changelog.txt @@ -0,0 +1 @@ +Placeholder changelog for flutter-demo container artifacts. diff --git a/meta-digi-containers/containers/flutter/configs_lxc/config_lxc_ccimx95-dvk b/meta-digi-containers/containers/flutter-demo/configs_lxc/config_lxc_ccimx95-dvk similarity index 100% rename from meta-digi-containers/containers/flutter/configs_lxc/config_lxc_ccimx95-dvk rename to meta-digi-containers/containers/flutter-demo/configs_lxc/config_lxc_ccimx95-dvk diff --git a/meta-digi-containers/containers/flutter/configs_lxc/config_lxc_ccmp25-dvk b/meta-digi-containers/containers/flutter-demo/configs_lxc/config_lxc_ccmp25-dvk similarity index 100% rename from meta-digi-containers/containers/flutter/configs_lxc/config_lxc_ccmp25-dvk rename to meta-digi-containers/containers/flutter-demo/configs_lxc/config_lxc_ccmp25-dvk diff --git a/meta-digi-containers/containers/flutter/rootfs_files/start-flutter-demo.sh b/meta-digi-containers/containers/flutter-demo/rootfs_files/start-flutter-demo.sh similarity index 100% rename from meta-digi-containers/containers/flutter/rootfs_files/start-flutter-demo.sh rename to meta-digi-containers/containers/flutter-demo/rootfs_files/start-flutter-demo.sh diff --git a/meta-digi-containers/containers/flutter/artifact/metadata/README.txt b/meta-digi-containers/containers/flutter/artifact/metadata/README.txt deleted file mode 100644 index 9375355a2..000000000 --- a/meta-digi-containers/containers/flutter/artifact/metadata/README.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder metadata for flutter container artifacts. diff --git a/meta-digi-containers/containers/flutter/artifact/metadata/changelog.txt b/meta-digi-containers/containers/flutter/artifact/metadata/changelog.txt deleted file mode 100644 index 2dc50fb7c..000000000 --- a/meta-digi-containers/containers/flutter/artifact/metadata/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder changelog for flutter container artifacts. diff --git a/meta-digi-containers/containers/lvgl-demo/artifact/metadata/README.txt b/meta-digi-containers/containers/lvgl-demo/artifact/metadata/README.txt new file mode 100644 index 000000000..a8c0477d3 --- /dev/null +++ b/meta-digi-containers/containers/lvgl-demo/artifact/metadata/README.txt @@ -0,0 +1 @@ +Placeholder metadata for lvgl-demo container artifacts. diff --git a/meta-digi-containers/containers/lvgl-demo/artifact/metadata/changelog.txt b/meta-digi-containers/containers/lvgl-demo/artifact/metadata/changelog.txt new file mode 100644 index 000000000..b2b081232 --- /dev/null +++ b/meta-digi-containers/containers/lvgl-demo/artifact/metadata/changelog.txt @@ -0,0 +1 @@ +Placeholder changelog for lvgl-demo container artifacts. diff --git a/meta-digi-containers/containers/lvgl/configs_lxc/config_lxc_ccimx95-dvk b/meta-digi-containers/containers/lvgl-demo/configs_lxc/config_lxc_ccimx95-dvk similarity index 100% rename from meta-digi-containers/containers/lvgl/configs_lxc/config_lxc_ccimx95-dvk rename to meta-digi-containers/containers/lvgl-demo/configs_lxc/config_lxc_ccimx95-dvk diff --git a/meta-digi-containers/containers/lvgl/configs_lxc/config_lxc_ccmp25-dvk b/meta-digi-containers/containers/lvgl-demo/configs_lxc/config_lxc_ccmp25-dvk similarity index 100% rename from meta-digi-containers/containers/lvgl/configs_lxc/config_lxc_ccmp25-dvk rename to meta-digi-containers/containers/lvgl-demo/configs_lxc/config_lxc_ccmp25-dvk diff --git a/meta-digi-containers/containers/lvgl/rootfs_files/.keep b/meta-digi-containers/containers/lvgl-demo/rootfs_files/.keep similarity index 100% rename from meta-digi-containers/containers/lvgl/rootfs_files/.keep rename to meta-digi-containers/containers/lvgl-demo/rootfs_files/.keep diff --git a/meta-digi-containers/containers/lvgl/rootfs_files/start-lvgl-demo.sh b/meta-digi-containers/containers/lvgl-demo/rootfs_files/start-lvgl-demo.sh similarity index 100% rename from meta-digi-containers/containers/lvgl/rootfs_files/start-lvgl-demo.sh rename to meta-digi-containers/containers/lvgl-demo/rootfs_files/start-lvgl-demo.sh diff --git a/meta-digi-containers/containers/lvgl/artifact/metadata/README.txt b/meta-digi-containers/containers/lvgl/artifact/metadata/README.txt deleted file mode 100644 index c7ffcb2c8..000000000 --- a/meta-digi-containers/containers/lvgl/artifact/metadata/README.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder metadata for lvgl container artifacts. diff --git a/meta-digi-containers/containers/lvgl/artifact/metadata/changelog.txt b/meta-digi-containers/containers/lvgl/artifact/metadata/changelog.txt deleted file mode 100644 index 4bd4b9671..000000000 --- a/meta-digi-containers/containers/lvgl/artifact/metadata/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder changelog for lvgl container artifacts. diff --git a/meta-digi-containers/containers/webkit-demo/artifact/metadata/README.txt b/meta-digi-containers/containers/webkit-demo/artifact/metadata/README.txt new file mode 100644 index 000000000..5f452890d --- /dev/null +++ b/meta-digi-containers/containers/webkit-demo/artifact/metadata/README.txt @@ -0,0 +1 @@ +Placeholder metadata for webkit-demo container artifacts. diff --git a/meta-digi-containers/containers/webkit-demo/artifact/metadata/changelog.txt b/meta-digi-containers/containers/webkit-demo/artifact/metadata/changelog.txt new file mode 100644 index 000000000..ae983247c --- /dev/null +++ b/meta-digi-containers/containers/webkit-demo/artifact/metadata/changelog.txt @@ -0,0 +1 @@ +Placeholder changelog for webkit-demo container artifacts. diff --git a/meta-digi-containers/containers/webkit/configs_lxc/config_lxc_ccimx95-dvk b/meta-digi-containers/containers/webkit-demo/configs_lxc/config_lxc_ccimx95-dvk similarity index 100% rename from meta-digi-containers/containers/webkit/configs_lxc/config_lxc_ccimx95-dvk rename to meta-digi-containers/containers/webkit-demo/configs_lxc/config_lxc_ccimx95-dvk diff --git a/meta-digi-containers/containers/webkit/configs_lxc/config_lxc_ccmp25-dvk b/meta-digi-containers/containers/webkit-demo/configs_lxc/config_lxc_ccmp25-dvk similarity index 100% rename from meta-digi-containers/containers/webkit/configs_lxc/config_lxc_ccmp25-dvk rename to meta-digi-containers/containers/webkit-demo/configs_lxc/config_lxc_ccmp25-dvk diff --git a/meta-digi-containers/containers/webkit/rootfs_files/start-webkit-demo.sh b/meta-digi-containers/containers/webkit-demo/rootfs_files/start-webkit-demo.sh similarity index 100% rename from meta-digi-containers/containers/webkit/rootfs_files/start-webkit-demo.sh rename to meta-digi-containers/containers/webkit-demo/rootfs_files/start-webkit-demo.sh diff --git a/meta-digi-containers/containers/webkit/artifact/metadata/README.txt b/meta-digi-containers/containers/webkit/artifact/metadata/README.txt deleted file mode 100644 index 66dfb3828..000000000 --- a/meta-digi-containers/containers/webkit/artifact/metadata/README.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder metadata for webkit container artifacts. diff --git a/meta-digi-containers/containers/webkit/artifact/metadata/changelog.txt b/meta-digi-containers/containers/webkit/artifact/metadata/changelog.txt deleted file mode 100644 index a8a8e9675..000000000 --- a/meta-digi-containers/containers/webkit/artifact/metadata/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder changelog for webkit container artifacts. diff --git a/meta-digi-containers/recipes-core/images/dey-image-dcp.bb b/meta-digi-containers/recipes-core/images/dey-image-dcp.bb index b6455c014..064f70801 100644 --- a/meta-digi-containers/recipes-core/images/dey-image-dcp.bb +++ b/meta-digi-containers/recipes-core/images/dey-image-dcp.bb @@ -21,10 +21,10 @@ NO_RECOMMENDATIONS = "1" ######################## # Container profile ######################## -# Select the profile in local.conf (e.g. DCP_NAME = "lvgl", "webkit", -# "chromium" or "flutter"). Defaults to "lvgl" when not set by the build -# configuration. -DCP_NAME ?= "lvgl" +# Select the profile in local.conf (e.g. DCP_NAME = "lvgl-demo", +# "webkit-demo", "chromium-demo" or "flutter-demo"). Defaults to +# "lvgl-demo" when not set by the build configuration. +DCP_NAME ?= "lvgl-demo" OVERRIDES:append = ":container-${DCP_NAME}" ######################## @@ -104,9 +104,9 @@ IMAGE_INSTALL = " \ ######################## # Container type customizations LVGL ######################## -CONTAINER_INIT_SCRIPT:container-lvgl = "/start-lvgl-demo.sh" -CONTAINER_FRIENDLY_NAME:container-lvgl = "LVGL Demo" -CONTAINER_CREATE_ARGS_PODMAN:container-lvgl:ccmp25 = " \ +CONTAINER_INIT_SCRIPT:container-lvgl-demo = "/start-lvgl-demo.sh" +CONTAINER_FRIENDLY_NAME:container-lvgl-demo = "LVGL Demo" +CONTAINER_CREATE_ARGS_PODMAN:container-lvgl-demo:ccmp25 = " \ --privileged \ --network none \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -120,7 +120,7 @@ CONTAINER_CREATE_ARGS_PODMAN:container-lvgl:ccmp25 = " \ --volume /run/udev:/run/udev:ro \ --tty \ " -CONTAINER_CREATE_ARGS_PODMAN:container-lvgl:ccimx95 = " \ +CONTAINER_CREATE_ARGS_PODMAN:container-lvgl-demo:ccimx95 = " \ --privileged \ --network none \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -135,20 +135,20 @@ CONTAINER_CREATE_ARGS_PODMAN:container-lvgl:ccimx95 = " \ --volume /run/udev:/run/udev:ro \ --tty \ " -IMAGE_INSTALL:append:container-lvgl = " \ +IMAGE_INSTALL:append:container-lvgl-demo = " \ lvgl-demo \ weston \ weston-init \ " -DISTRO_FEATURES:remove:container-lvgl = " wayland" +DISTRO_FEATURES:remove:container-lvgl-demo = " wayland" ######################## # Container type customizations webkit ######################## -CONTAINER_INIT_SCRIPT:container-webkit = "/start-webkit-demo.sh" -CONTAINER_FRIENDLY_NAME:container-webkit = "WebKit Demo" -CONTAINER_CREATE_ARGS_PODMAN:container-webkit:ccmp25 = " \ +CONTAINER_INIT_SCRIPT:container-webkit-demo = "/start-webkit-demo.sh" +CONTAINER_FRIENDLY_NAME:container-webkit-demo = "WebKit Demo" +CONTAINER_CREATE_ARGS_PODMAN:container-webkit-demo:ccmp25 = " \ --privileged \ --network host \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -193,7 +193,7 @@ CONTAINER_CREATE_ARGS_PODMAN:container-webkit:ccmp25 = " \ --env PULSE_SERVER=unix:/run/pulse/native \ --tty \ " -IMAGE_INSTALL:append:container-webkit = " \ +IMAGE_INSTALL:append:container-webkit-demo = " \ adwaita-icon-theme-symbolic \ alsa-utils \ bluez5 \ @@ -221,7 +221,7 @@ IMAGE_INSTALL:append:container-webkit = " \ weston-init \ " -IMAGE_INSTALL:append:container-webkit:ccmp25 = " \ +IMAGE_INSTALL:append:container-webkit-demo:ccmp25 = " \ gcnano-userland-multi-binary-stm32mp \ libgles1-gcnano \ libopenvg-gcnano \ @@ -232,8 +232,8 @@ IMAGE_INSTALL:append:container-webkit:ccmp25 = " \ ######################## # Container type customizations chromium ######################## -CONTAINER_INIT_SCRIPT:container-chromium = "/start-chromium-demo.sh" -CONTAINER_CREATE_ARGS_PODMAN:container-chromium = " \ +CONTAINER_INIT_SCRIPT:container-chromium-demo = "/start-chromium-demo.sh" +CONTAINER_CREATE_ARGS_PODMAN:container-chromium-demo = " \ --privileged \ --network host \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -268,7 +268,7 @@ CONTAINER_CREATE_ARGS_PODMAN:container-chromium = " \ --env PULSE_SERVER=unix:/run/pulse/native \ --tty \ " -IMAGE_INSTALL:append:container-chromium = " \ +IMAGE_INSTALL:append:container-chromium-demo = " \ adwaita-icon-theme-symbolic \ alsa-utils \ bluez5 \ @@ -300,9 +300,9 @@ IMAGE_INSTALL:append:container-chromium = " \ ######################## # Container type customizations flutter ######################## -CONTAINER_INIT_SCRIPT:container-flutter = "/start-flutter-demo.sh" -CONTAINER_FRIENDLY_NAME:container-flutter = "Flutter Demo" -CONTAINER_CREATE_ARGS_PODMAN:container-flutter:ccmp25 = " \ +CONTAINER_INIT_SCRIPT:container-flutter-demo = "/start-flutter-demo.sh" +CONTAINER_FRIENDLY_NAME:container-flutter-demo = "Flutter Demo" +CONTAINER_CREATE_ARGS_PODMAN:container-flutter-demo:ccmp25 = " \ --privileged \ --network none \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -316,7 +316,7 @@ CONTAINER_CREATE_ARGS_PODMAN:container-flutter:ccmp25 = " \ --volume /run/udev:/run/udev:ro \ --tty \ " -CONTAINER_CREATE_ARGS_PODMAN:container-flutter:ccimx95 = " \ +CONTAINER_CREATE_ARGS_PODMAN:container-flutter-demo:ccimx95 = " \ --privileged \ --network none \ --tmpfs /dev/shm:rw,nosuid,nodev,mode=1777 \ @@ -331,12 +331,12 @@ CONTAINER_CREATE_ARGS_PODMAN:container-flutter:ccimx95 = " \ --volume /run/udev:/run/udev:ro \ --tty \ " -IMAGE_INSTALL:append:container-flutter = " \ +IMAGE_INSTALL:append:container-flutter-demo = " \ liberation-fonts \ packagegroup-dey-flutter \ " -IMAGE_INSTALL:append:container-flutter:ccmp25 = " \ +IMAGE_INSTALL:append:container-flutter-demo:ccmp25 = " \ gcnano-userland-multi-binary-stm32mp \ libgles2-gcnano \ " -DISTRO_FEATURES:remove:container-flutter = " wayland" +DISTRO_FEATURES:remove:container-flutter-demo = " wayland"