From 0f32bf3fcbdb13a9c5ac6ba2ad20944dfd761efc Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:34:29 -0600 Subject: [PATCH] prepare: Ignore ACCEPT_KEYWORDS in crossdev.conf _crossdev_ sets `ACCEPT_KEYWORDS="${ARCH} ~${ARCH}" by default, even when run with `--stable`. This can cause conflicts when the host system does not accept ~arch, and may not be desirable anyway. Projects that want to use ~arch can set it in their own `make.conf`. The _u-boot_ package does not have any stable keywords, so we have to explicitly accept it. --- portage/package.accept_keywords/uboot | 1 + prepare.sh | 1 + 2 files changed, 2 insertions(+) create mode 100644 portage/package.accept_keywords/uboot diff --git a/portage/package.accept_keywords/uboot b/portage/package.accept_keywords/uboot new file mode 100644 index 0000000..639ddc2 --- /dev/null +++ b/portage/package.accept_keywords/uboot @@ -0,0 +1 @@ +sys-boot/u-boot ~arm64 diff --git a/prepare.sh b/prepare.sh index 6054f58..02a2747 100755 --- a/prepare.sh +++ b/prepare.sh @@ -37,6 +37,7 @@ if [ ! -f portage/make.conf/10-crossdev.conf ]; then sed -r \ -e 's: ?-pam::' \ -e '/PKGDIR=/d' \ + -e '/ACCEPT_KEYWORDS/d' \ /usr/${target}/etc/portage/make.conf \ > "${O}"/portage/etc/portage/make.conf/10-crossdev.conf fi