From 182e5d767fa7a7336a5fdbd61ebdb4d0159911ee Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 25 Feb 2022 09:54:11 +0100 Subject: [PATCH 1/2] sys-auth/polkit: mark duktape dependency with := The ':=' slot operator forces a package to be rebuilt when a dependency slot/subslot changes. Duktape has the slot definition '0/${PV}' and with the upgrade to 2.7.0 the soname changed, so polkit needs rebuilding. This is also done this way in recent upstream gentoo ebuilds for polkit. Signed-off-by: Jeremi Piotrowski --- .../coreos-overlay/sys-auth/polkit/polkit-0.120-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.120-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.120-r2.ebuild index d67f0082af..ef9f163b96 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.120-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.120-r2.ebuild @@ -32,7 +32,7 @@ BDEPEND=" introspection? ( dev-libs/gobject-introspection ) " DEPEND=" - dev-lang/duktape + dev-lang/duktape:= dev-libs/glib:2 dev-libs/expat pam? ( From c34235f8561ea1c3e9cc76d304765e25c3fb0e23 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Sat, 19 Feb 2022 17:05:26 +0100 Subject: [PATCH 2/2] coreos-devel/sdk-depends: mark sys-boot/shim amd64 only The version of shim that we carry was never tested on arm64 and was never intended to work. It also doesn't correctly link against the newest versions of gnu-efi. Mark it amd64 to exclude it from arm64 sdk. Signed-off-by: Jeremi Piotrowski --- .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 7b1fb8b3ef..e31235168a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -46,7 +46,7 @@ DEPEND=" amd64? ( sys-apps/iucode_tool ) sys-apps/seismograph sys-boot/grub - sys-boot/shim + amd64? ( sys-boot/shim ) sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup