From 13876614a73879049024263ec0846bad888937c7 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 8 Jun 2020 12:43:47 +0200 Subject: [PATCH] profiles: enable bind-tools again for ARM bind-tools has been disabled since a long time, probably because of build errors around cross-compilation for ARM. However, bind-tools binaries should be at least included in ARM images. So enable bind-tools again for ARM without gssapi included. To do that, disable gssapi for bind-tools only in the ARM profile, and enable gssapi only in the AMD profile. --- .../coreos-overlay/profiles/coreos/amd64/generic/package.use | 3 +++ .../coreos-overlay/profiles/coreos/arm64/package.provided | 3 --- .../coreos-overlay/profiles/coreos/arm64/package.use | 3 +++ .../coreos-overlay/profiles/coreos/base/package.use | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use index 6703f07327..f39aadd998 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use @@ -15,3 +15,6 @@ app-arch/tar selinux # Only ship microcode currently distributed by Intel # See https://bugs.gentoo.org/654638#c11 by iucode-tool maintainer sys-firmware/intel-microcode vanilla + +# Enable gssapi only for amd64, to avoid build errors in arm64. +net-dns/bind-tools gssapi diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided index 2fdc03a5c7..940169a8de 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided @@ -1,6 +1,3 @@ # arm64 provided dev-libs/gobject-introspection-1.40.0-r1 - -# build errors -net-dns/bind-tools-9.11.2_p1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use index 1730b342ee..dedfdcde32 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use @@ -1,5 +1,8 @@ # arm64 use +# Disable gssapi for arm64 to avoid build errors +net-dns/bind-tools -gssapi + # FIXME: why isn't this set by default??? sys-libs/ncurses unicode diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 887c1c1ea6..bb7a47c329 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -68,7 +68,6 @@ sys-kernel/coreos-sources symlink # set build options for ssdp net-nds/openldap minimal sasl sys-libs/glibc nscd -net-dns/bind-tools gssapi # disable database build because otherwise it tries to generate a database in /etc dev-libs/cyrus-sasl kerberos -berkdb -gdbm