From abe8bf683a29058af7ef3a3a5a56235bb443964f Mon Sep 17 00:00:00 2001 From: Krish Jain Date: Wed, 19 Jul 2023 01:10:46 +0530 Subject: [PATCH] Use helper function query_available_package() --- build_library/build_image_util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index 55956015ea..ae20ca1bf8 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -628,7 +628,7 @@ finish_image() { # Ship the docker systemd-sysext image and rip out torcx in same go; TODO: create seperate sysext images for containerd and docker mkdir -p ${PORTAGE_CONFIGROOT}/etc/portage/profile - echo $(equery -q --no-color list --format '$cpv' -po app-containers/containerd | grep -v 9999 | tail -n 1) > ${PORTAGE_CONFIGROOT}/etc/portage/profile/package.provided # use a temporary package.provided to make emerge believe the dependencies are already installed + query_available_package containerd > ${PORTAGE_CONFIGROOT}/etc/portage/profile/package.provided # use a temporary package.provided to make emerge believe the dependencies are already installed emerge-"${FLAGS_board}" app-containers/docker sudo "${SCRIPTS_DIR}/build_sysext" --board="${BOARD}" --image_builddir=${BUILD_DIR} --squashfs_base="${BUILD_DIR}/${image_sysext_base}" --manglefs_script="${SCRIPTS_DIR}/manglefs_docker" docker-flatcar app-containers/docker sudo install -m 0644 -D "${BUILD_DIR}/docker-flatcar.raw" "${root_fs_dir}"/usr/share/flatcar/