From 3da96e404d3df28113b20cbeaab07168c4fa7ef1 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Fri, 8 Jun 2018 14:12:51 -0400 Subject: package.keywords is deprecated, please use package.accept_keywords --- .../weekly/portage/isos/package.accept_keywords/admincd-packages | 8 ++++++++ releases/weekly/portage/isos/package.accept_keywords/genkernel | 2 ++ releases/weekly/portage/isos/package.accept_keywords/portage | 1 + releases/weekly/portage/isos/package.accept_keywords/zfs | 3 +++ releases/weekly/portage/isos/package.keywords/admincd-packages | 8 -------- releases/weekly/portage/isos/package.keywords/genkernel | 2 -- releases/weekly/portage/isos/package.keywords/portage | 1 - releases/weekly/portage/isos/package.keywords/zfs | 3 --- .../weekly/portage/stages/package.accept_keywords/releng/portage | 1 + releases/weekly/portage/stages/package.keywords/releng/portage | 1 - .../portage.amd64.hardened-stage4/package.accept_keywords/stage4 | 4 ++++ tools-musl/portage.amd64.hardened-stage4/package.keywords/stage4 | 4 ---- tools-musl/stage4-fsscript.sh | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 releases/weekly/portage/isos/package.accept_keywords/admincd-packages create mode 100644 releases/weekly/portage/isos/package.accept_keywords/genkernel create mode 100644 releases/weekly/portage/isos/package.accept_keywords/portage create mode 100644 releases/weekly/portage/isos/package.accept_keywords/zfs delete mode 100644 releases/weekly/portage/isos/package.keywords/admincd-packages delete mode 100644 releases/weekly/portage/isos/package.keywords/genkernel delete mode 100644 releases/weekly/portage/isos/package.keywords/portage delete mode 100644 releases/weekly/portage/isos/package.keywords/zfs create mode 100644 releases/weekly/portage/stages/package.accept_keywords/releng/portage delete mode 100644 releases/weekly/portage/stages/package.keywords/releng/portage create mode 100644 tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4 delete mode 100644 tools-musl/portage.amd64.hardened-stage4/package.keywords/stage4 diff --git a/releases/weekly/portage/isos/package.accept_keywords/admincd-packages b/releases/weekly/portage/isos/package.accept_keywords/admincd-packages new file mode 100644 index 00000000..b85e1bbf --- /dev/null +++ b/releases/weekly/portage/isos/package.accept_keywords/admincd-packages @@ -0,0 +1,8 @@ +sys-block/lsiutil +sys-block/megacli +sys-block/megarc +sys-fs/btrfs-progs +sys-fs/dislocker +sys-fs/exfat-utils +sys-fs/ext3grep +sys-fs/nilfs-utils diff --git a/releases/weekly/portage/isos/package.accept_keywords/genkernel b/releases/weekly/portage/isos/package.accept_keywords/genkernel new file mode 100644 index 00000000..3ca4af85 --- /dev/null +++ b/releases/weekly/portage/isos/package.accept_keywords/genkernel @@ -0,0 +1,2 @@ +# Pull in newer version for System.map fixes. +=sys-kernel/genkernel-3.4.52.4-r1 diff --git a/releases/weekly/portage/isos/package.accept_keywords/portage b/releases/weekly/portage/isos/package.accept_keywords/portage new file mode 100644 index 00000000..d8a4ac6e --- /dev/null +++ b/releases/weekly/portage/isos/package.accept_keywords/portage @@ -0,0 +1 @@ +~sys-apps/portage-2.3.24 diff --git a/releases/weekly/portage/isos/package.accept_keywords/zfs b/releases/weekly/portage/isos/package.accept_keywords/zfs new file mode 100644 index 00000000..492060f9 --- /dev/null +++ b/releases/weekly/portage/isos/package.accept_keywords/zfs @@ -0,0 +1,3 @@ +sys-kernel/spl +sys-fs/zfs-kmod +sys-fs/zfs diff --git a/releases/weekly/portage/isos/package.keywords/admincd-packages b/releases/weekly/portage/isos/package.keywords/admincd-packages deleted file mode 100644 index b85e1bbf..00000000 --- a/releases/weekly/portage/isos/package.keywords/admincd-packages +++ /dev/null @@ -1,8 +0,0 @@ -sys-block/lsiutil -sys-block/megacli -sys-block/megarc -sys-fs/btrfs-progs -sys-fs/dislocker -sys-fs/exfat-utils -sys-fs/ext3grep -sys-fs/nilfs-utils diff --git a/releases/weekly/portage/isos/package.keywords/genkernel b/releases/weekly/portage/isos/package.keywords/genkernel deleted file mode 100644 index 3ca4af85..00000000 --- a/releases/weekly/portage/isos/package.keywords/genkernel +++ /dev/null @@ -1,2 +0,0 @@ -# Pull in newer version for System.map fixes. -=sys-kernel/genkernel-3.4.52.4-r1 diff --git a/releases/weekly/portage/isos/package.keywords/portage b/releases/weekly/portage/isos/package.keywords/portage deleted file mode 100644 index d8a4ac6e..00000000 --- a/releases/weekly/portage/isos/package.keywords/portage +++ /dev/null @@ -1 +0,0 @@ -~sys-apps/portage-2.3.24 diff --git a/releases/weekly/portage/isos/package.keywords/zfs b/releases/weekly/portage/isos/package.keywords/zfs deleted file mode 100644 index 492060f9..00000000 --- a/releases/weekly/portage/isos/package.keywords/zfs +++ /dev/null @@ -1,3 +0,0 @@ -sys-kernel/spl -sys-fs/zfs-kmod -sys-fs/zfs diff --git a/releases/weekly/portage/stages/package.accept_keywords/releng/portage b/releases/weekly/portage/stages/package.accept_keywords/releng/portage new file mode 100644 index 00000000..d8a4ac6e --- /dev/null +++ b/releases/weekly/portage/stages/package.accept_keywords/releng/portage @@ -0,0 +1 @@ +~sys-apps/portage-2.3.24 diff --git a/releases/weekly/portage/stages/package.keywords/releng/portage b/releases/weekly/portage/stages/package.keywords/releng/portage deleted file mode 100644 index d8a4ac6e..00000000 --- a/releases/weekly/portage/stages/package.keywords/releng/portage +++ /dev/null @@ -1 +0,0 @@ -~sys-apps/portage-2.3.24 diff --git a/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4 b/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4 new file mode 100644 index 00000000..c636d541 --- /dev/null +++ b/tools-musl/portage.amd64.hardened-stage4/package.accept_keywords/stage4 @@ -0,0 +1,4 @@ +=net-analyzer/macchanger-1.7.0-r1 ~amd64 +=sys-apps/busybox-1.26.2-r1::musl ~amd64 +=sys-kernel/genkernel-3.5.2.4 ~amd64 +=app-misc/pax-utils-1.2.2-r2 ~amd64 diff --git a/tools-musl/portage.amd64.hardened-stage4/package.keywords/stage4 b/tools-musl/portage.amd64.hardened-stage4/package.keywords/stage4 deleted file mode 100644 index c636d541..00000000 --- a/tools-musl/portage.amd64.hardened-stage4/package.keywords/stage4 +++ /dev/null @@ -1,4 +0,0 @@ -=net-analyzer/macchanger-1.7.0-r1 ~amd64 -=sys-apps/busybox-1.26.2-r1::musl ~amd64 -=sys-kernel/genkernel-3.5.2.4 ~amd64 -=app-misc/pax-utils-1.2.2-r2 ~amd64 diff --git a/tools-musl/stage4-fsscript.sh b/tools-musl/stage4-fsscript.sh index ce419be5..18017c7d 100755 --- a/tools-musl/stage4-fsscript.sh +++ b/tools-musl/stage4-fsscript.sh @@ -52,8 +52,8 @@ nameserver 2001:4860:4860::8888 EOL # make sure musl stuff is available -echo "=app-portage/layman-2.4.1-r1 ~amd64" >> /etc/portage/package.keywords/layman -echo "=dev-python/ssl-fetch-0.4 ~amd64" >> /etc/portage/package.keywords/layman +echo "=app-portage/layman-2.4.1-r1 ~amd64" >> /etc/portage/package.accept_keywords/layman +echo "=dev-python/ssl-fetch-0.4 ~amd64" >> /etc/portage/package.accept_keywords/layman emerge -vq --jobs=4 layman dev-vcs/git layman -L layman -a musl -- cgit v1.2.3-65-gdbad