| 1 |
commit: c83425ba001a06b90ebe666f77dba02c0ba917bf |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 05:13:21 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 05:14:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c83425ba |
| 7 |
|
| 8 |
simplify minimal stage4s |
| 9 |
|
| 10 |
releases/weekly/specs/amd64/hardened/stage4-minimal.spec | 3 +-- |
| 11 |
releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 3 +-- |
| 12 |
releases/weekly/specs/amd64/stage4-minimal.spec | 3 +-- |
| 13 |
releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec | 3 +-- |
| 14 |
tools-systemd/stage4-amd64.spec | 3 +-- |
| 15 |
5 files changed, 5 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec |
| 18 |
index b2c847e3..ba0f14a8 100644 |
| 19 |
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec |
| 20 |
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec |
| 21 |
@@ -18,13 +18,11 @@ stage4/use: |
| 22 |
urandom |
| 23 |
|
| 24 |
stage4/packages: |
| 25 |
- app-admin/sudo |
| 26 |
net-misc/dhcp |
| 27 |
sys-boot/grub |
| 28 |
sys-apps/dmidecode |
| 29 |
sys-apps/gptfdisk |
| 30 |
sys-apps/iproute2 |
| 31 |
- sys-apps/lsb-release |
| 32 |
sys-devel/bc |
| 33 |
sys-power/acpid |
| 34 |
stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh |
| 35 |
@@ -42,6 +40,7 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 36 |
|
| 37 |
# all of the cleanup... |
| 38 |
stage4/unmerge: |
| 39 |
+ sys-devel/bc |
| 40 |
sys-kernel/genkernel |
| 41 |
sys-kernel/gentoo-sources |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec |
| 45 |
index 1944ced4..3986cee8 100644 |
| 46 |
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec |
| 47 |
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec |
| 48 |
@@ -18,13 +18,11 @@ stage4/use: |
| 49 |
urandom |
| 50 |
|
| 51 |
stage4/packages: |
| 52 |
- app-admin/sudo |
| 53 |
net-misc/dhcp |
| 54 |
net-misc/iputils |
| 55 |
sys-boot/grub |
| 56 |
sys-apps/gptfdisk |
| 57 |
sys-apps/iproute2 |
| 58 |
- sys-apps/lsb-release |
| 59 |
sys-devel/bc |
| 60 |
sys-power/acpid |
| 61 |
stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh |
| 62 |
@@ -42,6 +40,7 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 63 |
|
| 64 |
# all of the cleanup... |
| 65 |
stage4/unmerge: |
| 66 |
+ sys-devel/bc |
| 67 |
sys-kernel/genkernel |
| 68 |
sys-kernel/gentoo-sources |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec |
| 72 |
index a868b635..312150ab 100644 |
| 73 |
--- a/releases/weekly/specs/amd64/stage4-minimal.spec |
| 74 |
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec |
| 75 |
@@ -18,13 +18,11 @@ stage4/use: |
| 76 |
urandom |
| 77 |
|
| 78 |
stage4/packages: |
| 79 |
- app-admin/sudo |
| 80 |
net-misc/dhcp |
| 81 |
net-misc/iputils |
| 82 |
sys-boot/grub |
| 83 |
sys-apps/gptfdisk |
| 84 |
sys-apps/iproute2 |
| 85 |
- sys-apps/lsb-release |
| 86 |
sys-devel/bc |
| 87 |
sys-power/acpid |
| 88 |
stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh |
| 89 |
@@ -42,6 +40,7 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 90 |
|
| 91 |
# all of the cleanup... |
| 92 |
stage4/unmerge: |
| 93 |
+ sys-devel/bc |
| 94 |
sys-kernel/genkernel |
| 95 |
sys-kernel/gentoo-sources |
| 96 |
|
| 97 |
|
| 98 |
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec |
| 99 |
index 76bf8106..32f5629a 100644 |
| 100 |
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec |
| 101 |
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec |
| 102 |
@@ -18,13 +18,11 @@ stage4/use: |
| 103 |
urandom |
| 104 |
|
| 105 |
stage4/packages: |
| 106 |
- app-admin/sudo |
| 107 |
net-misc/dhcp |
| 108 |
net-misc/iputils |
| 109 |
sys-boot/grub |
| 110 |
sys-apps/gptfdisk |
| 111 |
sys-apps/iproute2 |
| 112 |
- sys-apps/lsb-release |
| 113 |
sys-devel/bc |
| 114 |
sys-power/acpid |
| 115 |
stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh |
| 116 |
@@ -42,6 +40,7 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 117 |
|
| 118 |
# all of the cleanup... |
| 119 |
stage4/unmerge: |
| 120 |
+ sys-devel/bc |
| 121 |
sys-kernel/genkernel |
| 122 |
sys-kernel/gentoo-sources |
| 123 |
|
| 124 |
|
| 125 |
diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec |
| 126 |
index 720fc694..880db3ad 100644 |
| 127 |
--- a/tools-systemd/stage4-amd64.spec |
| 128 |
+++ b/tools-systemd/stage4-amd64.spec |
| 129 |
@@ -19,13 +19,11 @@ stage4/use: |
| 130 |
urandom |
| 131 |
|
| 132 |
stage4/packages: |
| 133 |
- app-admin/sudo |
| 134 |
net-misc/dhcp |
| 135 |
net-misc/iputils |
| 136 |
sys-boot/grub |
| 137 |
sys-apps/gptfdisk |
| 138 |
sys-apps/iproute2 |
| 139 |
- sys-apps/lsb-release |
| 140 |
sys-devel/bc |
| 141 |
sys-power/acpid |
| 142 |
stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh |
| 143 |
@@ -43,6 +41,7 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 144 |
|
| 145 |
# all of the cleanup... |
| 146 |
stage4/unmerge: |
| 147 |
+ sys-devel/bc |
| 148 |
sys-kernel/genkernel |
| 149 |
sys-kernel/gentoo-sources |
Archives