gg-images: add cgexec, fix venv

thomas-roos · thomas-roos · commit 388dd7bc5c12 · 2025-02-05T09:47:40.000+01:00
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-image/aws-iot-greengrass-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-image/aws-iot-greengrass-demo-image.bb
@@ -14,6 +14,7 @@ IMAGE_INSTALL += "\
 ### AWS ###
 IMAGE_INSTALL:append = " greengrass-bin udev"
 IMAGE_INSTALL:append = " aws-iot-device-sdk-python-v2"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 ### rauc ###
 CORE_IMAGE_EXTRA_INSTALL:append = " rauc-grow-data-part"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/aws-iot-greengrass-demo-simple-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/aws-iot-greengrass-demo-simple-image.bb
@@ -14,6 +14,7 @@ IMAGE_INSTALL += "\
     "
 ### AWS ###
 IMAGE_INSTALL:append = " greengrass-bin udev"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 # only adding if device is rpi, as others might have a different partition layout
 IMAGE_INSTALL:append:rpi = " greengrass-config-init yq"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/aws-iot-greengrass-lite-container-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/aws-iot-greengrass-lite-container-demo-image.bb
@@ -20,6 +20,8 @@ IMAGE_INSTALL = " \
        ${CONTAINER_SHELL} \
 "
 
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
+
 # If the following is configured in local.conf (or the distro):
 #      PACKAGE_EXTRA_ARCHS:append = " container-dummy-provides"
 #
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-image.bb
@@ -16,7 +16,7 @@ IMAGE_INSTALL += "\
 IMAGE_INSTALL:append = " greengrass-lite"
 IMAGE_INSTALL:append = " aws-iot-device-sdk-python-v2"
 IMAGE_INSTALL:append = " jq"
-IMAGE_INSTALL:append = " python3-virtualenv python3-pip"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 ### rauc ###
 CORE_IMAGE_EXTRA_INSTALL:append = " rauc-grow-data-part"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/aws-iot-greengrass-lite-demo-simple-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/aws-iot-greengrass-lite-demo-simple-image.bb
@@ -23,6 +23,7 @@ IMAGE_INSTALL:append = " tmux"
 GLIBC_GENERATE_LOCALES = "en_US.UTF-8 UTF-8"
 IMAGE_INSTALL:append = " glibc-utils localedef "
 IMAGE_INSTALL:append = " ssh openssh-sshd openssh-sftp"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 ### aws-iot-device-client ###
 # IMAGE_INSTALL:append = " aws-iot-device-client"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-tiny-image/aws-iot-greengrass-lite-demo-tiny-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-tiny-image/aws-iot-greengrass-lite-demo-tiny-image.bb
@@ -9,6 +9,7 @@ inherit core-image
 ### AWS ###
 # disabled as there is a link issue
 IMAGE_INSTALL:append = " greengrass-lite"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 # only adding if device is rpi
 IMAGE_INSTALL:append:rpi = " greengrass-config-init"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/aws-iot-greengrass-lite-webrtc-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/aws-iot-greengrass-lite-webrtc-demo-image.bb
@@ -16,7 +16,7 @@ IMAGE_INSTALL += "\
 IMAGE_INSTALL:append = " greengrass-lite"
 IMAGE_INSTALL:append = " aws-iot-device-sdk-python-v2"
 IMAGE_INSTALL:append = " jq"
-IMAGE_INSTALL:append = " python3-virtualenv python3-pip"
+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"
 
 ### rauc ###
 CORE_IMAGE_EXTRA_INSTALL:append = " rauc-grow-data-part"

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ IMAGE_INSTALL += "\`
`14`	`14`	`"`
`15`	`15`	`### AWS ###`
`16`	`16`	`IMAGE_INSTALL:append = " greengrass-bin udev"`
	`17`	`+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"`
`17`	`18`
`18`	`19`	`# only adding if device is rpi, as others might have a different partition layout`
`19`	`20`	`IMAGE_INSTALL:append:rpi = " greengrass-config-init yq"`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ IMAGE_INSTALL = " \`
`20`	`20`	`${CONTAINER_SHELL} \`
`21`	`21`	`"`
`22`	`22`
	`23`	`+IMAGE_INSTALL:append = " python3-misc python3-venv python3-tomllib python3-ensurepip libcgroup python3-pip"`
	`24`	`+`
`23`	`25`	`# If the following is configured in local.conf (or the distro):`
`24`	`26`	`# PACKAGE_EXTRA_ARCHS:append = " container-dummy-provides"`
`25`	`27`	`#`