From b3d2dfd48654503d7860a9ab987a6b0f638d290b Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 15:55:45 +0000 Subject: [PATCH] profiles: Drop dead arm64 settings Also drop the obsolete GCC lines. --- .../profiles/coreos/arm64/README | 4 -- .../profiles/coreos/arm64/generic/dev/parent | 2 - .../coreos/arm64/generic/make.defaults | 2 - .../coreos/arm64/generic/oem-aci/parent | 2 - .../profiles/coreos/arm64/generic/parent | 2 - .../profiles/coreos/arm64/generic/prod/parent | 2 - .../profiles/coreos/arm64/make.defaults | 0 .../coreos/arm64/package.accept_keywords | 63 ------------------- .../profiles/coreos/arm64/package.provided | 6 -- .../profiles/coreos/arm64/package.use | 8 --- .../profiles/coreos/arm64/package.use.force | 2 - .../profiles/coreos/arm64/package.use.mask | 5 -- .../profiles/coreos/arm64/packages | 3 - .../profiles/coreos/arm64/parent | 3 - .../profiles/coreos/arm64/sdk/make.defaults | 2 - .../profiles/coreos/arm64/sdk/parent | 2 - .../profiles/coreos/arm64/use.mask | 1 - .../coreos/base/package.accept_keywords | 19 +++--- .../coreos/targets/sdk/package.use.mask | 4 -- .../coreos-overlay/profiles/profiles.desc | 5 -- 20 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README deleted file mode 100644 index 0e500caef1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README +++ /dev/null @@ -1,4 +0,0 @@ -This profile (and its sub-profiles) should *only* contain -architecture specific settings. Architecture independent settings should -go under coreos/base (applies to everything) or coreos/targets/* -(applies to the sdk, amd64-usr, etc.). diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent deleted file mode 100644 index 35ac69992e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/dev diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults deleted file mode 100644 index a7f431d3ca..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -CFLAGS="-O2 -pipe -mtune=generic -g" -CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent deleted file mode 100644 index cfacbaa8c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/oem-aci diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent deleted file mode 100644 index 767f085901..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent deleted file mode 100644 index 89b629a19e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/prod diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords deleted file mode 100644 index 4e7e344770..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ /dev/null @@ -1,63 +0,0 @@ -# arm64 keywords -# Keep these in alphabetical order. - -=app-arch/bzip2-1.0.6-r8 ~arm64 -=app-arch/libarchive-3.3.1 ~arm64 -=app-crypt/mit-krb5-1.14.2 ~arm64 -=app-text/asciidoc-8.6.9-r3 ~arm64 -=dev-cpp/gflags-2.2.0 ~arm64 -=dev-cpp/glog-0.3.4-r1 ~arm64 -=dev-lang/perl-5.24.1-r2 ~arm64 -=dev-lang/swig-3.0.12 ~arm64 -=dev-libs/apr-util-1.5.4-r1 ~arm64 -=dev-libs/elfutils-0.169-r1 ~arm64 -=dev-libs/libassuan-2.5.1 ~arm64 -=dev-libs/libevent-2.1.8 ~arm64 -=dev-libs/liblinear-210-r1 ~arm64 -=dev-libs/libnl-3.2.27 ~arm64 -=dev-libs/libpcre-8.41 ~arm64 -=dev-libs/libpcre2-10.30 ~arm64 -=dev-libs/libusb-1.0.21 ~arm64 -=dev-libs/nss-3.29.5 ~arm64 -=dev-libs/userspace-rcu-0.9.1 ** -=dev-perl/libintl-perl-1.240.0-r2 ~arm64 -=dev-perl/Text-Unidecode-1.270.0 ~arm64 -=dev-util/meson-0.43.0 ~arm64 -=dev-util/ninja-1.8.2 ~arm64 -=dev-util/re2c-0.16 ~arm64 -=net-analyzer/nmap-7.40 ~arm64 -=net-analyzer/tcpdump-4.9.2 ~arm64 -=net-dialup/minicom-2.7.1 ~arm64 -=net-dns/bind-tools-9.11.2_p1 ~arm64 -=net-dns/dnsmasq-2.78 ~arm64 -=net-firewall/ebtables-2.0.10.4-r1 ~arm64 -=net-firewall/ipset-6.29 ~arm64 -=net-libs/libmicrohttpd-0.9.52 ** -=net-libs/libnftnl-1.0.6 ** -=net-libs/serf-1.3.8-r1 ~arm64 -=net-misc/bridge-utils-1.5 ~arm64 -=net-misc/iperf-3.1.3 ** -=net-misc/socat-1.7.3.2 ~arm64 -=net-nds/openldap-2.4.44 ~arm64 -=perl-core/File-Path-2.130.0 ~arm64 -=sys-apps/i2c-tools-3.1.1-r1 ~arm64 -=sys-apps/lshw-02.17b-r2 ** -=sys-apps/man-db-2.7.6.1-r2 ~arm64 -=sys-apps/rng-tools-5-r2 ** -=sys-apps/sandbox-2.12 ~arm64 -=sys-apps/smartmontools-6.4 ** -=sys-block/parted-3.2-r1 ~arm64 -=sys-block/thin-provisioning-tools-0.7.0 ~arm64 -=sys-cluster/ipvsadm-1.27-r1 ** -=sys-fs/btrfs-progs-4.10.2 ~arm64 -=sys-fs/cryptsetup-1.7.5 ~arm64 -=sys-fs/lsscsi-0.28 ~arm64 -=sys-fs/mdadm-3.4 ** -=sys-fs/multipath-tools-0.6.4-r1 ~arm64 -=sys-fs/quota-4.04-r1 ~arm64 -=sys-libs/binutils-libs-2.29.1-r1 ~arm64 -=sys-libs/libcap-ng-0.7.8 ~arm64 -=virtual/krb5-0-r1 ~arm64 -=virtual/libudev-232 ~arm64 -=virtual/libusb-1-r2 ~arm64 -=virtual/perl-File-Path-2.130.0 ~arm64 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 deleted file mode 100644 index 2fdc03a5c7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 1730b342ee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use +++ /dev/null @@ -1,8 +0,0 @@ -# arm64 use - -# FIXME: why isn't this set by default??? -sys-libs/ncurses unicode - -sys-apps/systemd -selinux - -sys-auth/polkit -introspection diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force deleted file mode 100644 index 1947a2fd59..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force +++ /dev/null @@ -1,2 +0,0 @@ -sys-auth/polkit -introspection -sys-apps/systemd -introspection diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask deleted file mode 100644 index 97d928a576..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask +++ /dev/null @@ -1,5 +0,0 @@ -# This fails from -Werror=implicit-fallthrough, and it's disabled in the SDK. -sys-devel/gcc sanitize - -# Undo Gentoo masking all this on arm64. -sys-apps/systemd -cryptsetup -http -policykit -qrcode -xkb diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages deleted file mode 100644 index 511adccb20..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages +++ /dev/null @@ -1,3 +0,0 @@ -# Disable PAX utilities, we don't use grsec kernels --*sys-apps/paxctl --*sys-apps/elfix diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent deleted file mode 100644 index abb3d18940..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent +++ /dev/null @@ -1,3 +0,0 @@ -#portage-stable:hardened/linux/arm64 -- switch when available -portage-stable:default/linux/arm64 -:coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults deleted file mode 100644 index 01f715c2c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -CFLAGS="-O2 -pipe -mtune=generic" -CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent deleted file mode 100644 index f0c938676d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/sdk diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask deleted file mode 100644 index ff5beb9b41..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask +++ /dev/null @@ -1 +0,0 @@ --ldap diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index a6a31f34a5..2726cb3ba8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -21,11 +21,11 @@ dev-python/boto dev-util/checkbashisms # Older versions of sssd fail to build -=sys-auth/sssd-1.13.1 ~amd64 ~arm64 +=sys-auth/sssd-1.13.1 ~amd64 # heap overflow fix # https://bugs.gentoo.org/show_bug.cgi?id=580606 -=app-misc/jq-1.5-r2 ~amd64 ~arm64 +=app-misc/jq-1.5-r2 ~amd64 # Must use the same version across all architectures =dev-libs/protobuf-2.6.1-r3 @@ -42,7 +42,7 @@ dev-util/checkbashisms # systemd v238 requires libseccomp 2.3.3 =sys-libs/libseccomp-2.3.3 ** -# All versions are ~amd64 and not enabled on arm64 +# All versions are ~amd64 =sys-apps/nvme-cli-1.1 ** # CVE-2017-8779 @@ -53,14 +53,9 @@ dev-util/checkbashisms # iproute2 4.13 includes a patch to avoid leaking netns mounts in rkt # https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git/commit/?id=d6a4076b6ba6547d7e52c377a7c58c56eb5ea16e -=sys-apps/iproute2-4.13.0 ~amd64 ~arm64 - -# Upgrade to GCC 7.3 for retpoline support. -=sys-devel/gcc-7.3.0 -=cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64 -=cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64 +=sys-apps/iproute2-4.13.0 ~amd64 # Force upgrades to work around catalyst problems while upgrading ncurses. -=app-crypt/gnupg-2.2.7 ~amd64 ~arm64 -=sys-apps/gptfdisk-1.0.3 ~amd64 ~arm64 -=sys-apps/util-linux-2.32 ~amd64 ~arm64 +=app-crypt/gnupg-2.2.7 ~amd64 +=sys-apps/gptfdisk-1.0.3 ~amd64 +=sys-apps/util-linux-2.32 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask index 8e6ec6044f..811692a9e5 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask @@ -1,6 +1,2 @@ # Allow smartcard support in the SDK for image signing app-crypt/gnupg -smartcard - -# hardened and sanitize are masked for arm64, cross compilers should agree -cross-aarch64-cros-linux-gnu/gcc hardened sanitize -cross-aarch64-cros-linux-gnu/glibc hardened diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc index 1ef2a7e05b..0385f806b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc @@ -4,8 +4,3 @@ amd64 coreos/amd64/generic/prod dev amd64 coreos/amd64/sdk dev amd64 default/linux/amd64/10.0 dev amd64 default/linux/amd64/10.0/coreos dev - -arm64 coreos/arm64/generic dev -arm64 coreos/arm64/generic/dev dev -arm64 coreos/arm64/generic/prod dev -arm64 coreos/arm64/sdk dev