commit: a7850c4bf2a2e890e3382f069e09f0c86cf305a0 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sun Oct 28 15:01:29 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sun Oct 28 15:01:29 2018 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a7850c4b
tools-uclibc: workaround multilib-strict for file tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 | 1 + tools-uclibc/portage.amd64.hardened/package.accept_keywords | 2 +- tools-uclibc/portage.amd64.hardened/package.env | 1 + tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 | 1 + tools-uclibc/portage.amd64.vanilla/package.accept_keywords | 2 +- tools-uclibc/portage.amd64.vanilla/package.env | 1 + tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 | 1 + tools-uclibc/portage.i686.hardened/package.accept_keywords | 2 +- tools-uclibc/portage.i686.hardened/package.env | 2 +- tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 | 1 + tools-uclibc/portage.i686.vanilla/package.accept_keywords | 2 +- tools-uclibc/portage.i686.vanilla/package.env | 1 + 12 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 b/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 new file mode 100644 index 00000000..6490f7bb --- /dev/null +++ b/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 @@ -0,0 +1 @@ +FEATURES="-multilib-strict" diff --git a/tools-uclibc/portage.amd64.hardened/package.accept_keywords b/tools-uclibc/portage.amd64.hardened/package.accept_keywords index 70b1b9dc..d3121c24 100644 --- a/tools-uclibc/portage.amd64.hardened/package.accept_keywords +++ b/tools-uclibc/portage.amd64.hardened/package.accept_keywords @@ -1 +1 @@ ->=sys-apps/iproute2-4.18.0 ~amd64 +=sys-apps/iproute2-4.18.0 ~amd64 diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env index dd59e5f1..2d99438b 100644 --- a/tools-uclibc/portage.amd64.hardened/package.env +++ b/tools-uclibc/portage.amd64.hardened/package.env @@ -1 +1,2 @@ net-misc/iputils net-misc_iputils_0 +sys-apps/file sys-apps_file_0 diff --git a/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 b/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 new file mode 100644 index 00000000..6490f7bb --- /dev/null +++ b/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 @@ -0,0 +1 @@ +FEATURES="-multilib-strict" diff --git a/tools-uclibc/portage.amd64.vanilla/package.accept_keywords b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords index 70b1b9dc..d3121c24 100644 --- a/tools-uclibc/portage.amd64.vanilla/package.accept_keywords +++ b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords @@ -1 +1 @@ ->=sys-apps/iproute2-4.18.0 ~amd64 +=sys-apps/iproute2-4.18.0 ~amd64 diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env index dd59e5f1..2d99438b 100644 --- a/tools-uclibc/portage.amd64.vanilla/package.env +++ b/tools-uclibc/portage.amd64.vanilla/package.env @@ -1 +1,2 @@ net-misc/iputils net-misc_iputils_0 +sys-apps/file sys-apps_file_0 diff --git a/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 b/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 new file mode 100644 index 00000000..6490f7bb --- /dev/null +++ b/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 @@ -0,0 +1 @@ +FEATURES="-multilib-strict" diff --git a/tools-uclibc/portage.i686.hardened/package.accept_keywords b/tools-uclibc/portage.i686.hardened/package.accept_keywords index d4072570..e6b927af 100644 --- a/tools-uclibc/portage.i686.hardened/package.accept_keywords +++ b/tools-uclibc/portage.i686.hardened/package.accept_keywords @@ -1 +1 @@ ->=sys-apps/iproute2-4.18.0 ~x86 +=sys-apps/iproute2-4.18.0 ~x86 diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env index 1dfa69a0..2d99438b 100644 --- a/tools-uclibc/portage.i686.hardened/package.env +++ b/tools-uclibc/portage.i686.hardened/package.env @@ -1,2 +1,2 @@ -dev-lang/perl dev-lang_perl_0 net-misc/iputils net-misc_iputils_0 +sys-apps/file sys-apps_file_0 diff --git a/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 b/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 new file mode 100644 index 00000000..6490f7bb --- /dev/null +++ b/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 @@ -0,0 +1 @@ +FEATURES="-multilib-strict" diff --git a/tools-uclibc/portage.i686.vanilla/package.accept_keywords b/tools-uclibc/portage.i686.vanilla/package.accept_keywords index d4072570..e6b927af 100644 --- a/tools-uclibc/portage.i686.vanilla/package.accept_keywords +++ b/tools-uclibc/portage.i686.vanilla/package.accept_keywords @@ -1 +1 @@ ->=sys-apps/iproute2-4.18.0 ~x86 +=sys-apps/iproute2-4.18.0 ~x86 diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env index dd59e5f1..2d99438b 100644 --- a/tools-uclibc/portage.i686.vanilla/package.env +++ b/tools-uclibc/portage.i686.vanilla/package.env @@ -1 +1,2 @@ net-misc/iputils net-misc_iputils_0 +sys-apps/file sys-apps_file_0
