From 1ac17be8d54be2d81d6511a50115b72d866823d0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 15 Sep 2023 16:01:14 +0200 Subject: [PATCH] overlay coreos-base/coreos-oem-gce: Pull in sys-apps/gentoo-functions too Previously the sys-apps/gentoo-functions package was pulled in into the GCE image by the sys-libs/glibc package. After the sys-libs/glibc package update, the dependency disappeared. This resulted in gentoo-functions not being installed and the build to fail a check for dangling symlinks: broken link: b'/etc/init.d/functions.sh' -> b'../../lib/gentoo/functions.sh' ERROR build_oem_aci: test_image_content: Failed symlink check The `/etc/init.d/functions.sh` symlink is installed by sys-apps/baselayout in postinst phase. The package also has a dependency on sys-apps/gentoo-functions, but it is not pulled in into the image, because baselayout is installed specially - without dependencies. It would probably be better to just drop the symlink, but it's here for compatibility purposes. We also can't remove the symlink in the manglefs script, as it gets executed after the filesystem checks. --- ...os-oem-gce-0.0.1-r5.ebuild => coreos-oem-gce-0.0.1-r6.ebuild} | 0 .../coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/{coreos-oem-gce-0.0.1-r5.ebuild => coreos-oem-gce-0.0.1-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild index e1ee050a08..062aa7eebf 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild @@ -14,6 +14,7 @@ IUSE="" RDEPEND=" app-emulation/google-compute-engine app-shells/bash + sys-apps/gentoo-functions sys-libs/glibc sys-libs/nss-usrfiles "