| 1 |
commit: 71e4b843b89ba8d5ebe4c1414225dc8e8e1271e6 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 10 21:45:21 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 13 04:49:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=71e4b843 |
| 7 |
|
| 8 |
specs/hppa: netboot2 -> netboot |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{netboot2-hppa32.spec => netboot-hppa32.spec} | 38 +++++++++++----------- |
| 13 |
.../{netboot2-hppa64.spec => netboot-hppa64.spec} | 36 ++++++++++---------- |
| 14 |
tools/catalyst-auto-hppa.conf | 14 ++++---- |
| 15 |
3 files changed, 44 insertions(+), 44 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/specs/hppa/netboot2-hppa32.spec b/releases/specs/hppa/netboot-hppa32.spec |
| 18 |
similarity index 82% |
| 19 |
rename from releases/specs/hppa/netboot2-hppa32.spec |
| 20 |
rename to releases/specs/hppa/netboot-hppa32.spec |
| 21 |
index b50bb8f0..e2e15639 100644 |
| 22 |
--- a/releases/specs/hppa/netboot2-hppa32.spec |
| 23 |
+++ b/releases/specs/hppa/netboot-hppa32.spec |
| 24 |
@@ -2,21 +2,21 @@ |
| 25 |
version_stamp: @TIMESTAMP@ |
| 26 |
snapshot: @TIMESTAMP@ |
| 27 |
source_subpath: default/stage3-hppa1.1-@TIMESTAMP@ |
| 28 |
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa32 |
| 29 |
+pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa32 |
| 30 |
|
| 31 |
# these shouldn't change |
| 32 |
-target: netboot2 |
| 33 |
+target: netboot |
| 34 |
subarch: hppa1.1 |
| 35 |
rel_type: default |
| 36 |
profile: default/linux/hppa/17.0 |
| 37 |
|
| 38 |
-# netboot2 stuff |
| 39 |
+# netboot stuff |
| 40 |
boot/kernel: netboot32 |
| 41 |
boot/kernel/netboot32/sources: sys-kernel/gentoo-sources |
| 42 |
boot/kernel/netboot32/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config |
| 43 |
boot/kernel/netboot32/gk_kernargs: --all-ramdisk-modules |
| 44 |
|
| 45 |
-netboot2/use: |
| 46 |
+netboot/use: |
| 47 |
-* |
| 48 |
multicall |
| 49 |
shadow |
| 50 |
@@ -24,7 +24,7 @@ netboot2/use: |
| 51 |
ssl |
| 52 |
unicode |
| 53 |
|
| 54 |
-netboot2/packages: |
| 55 |
+netboot/packages: |
| 56 |
sys-boot/palo |
| 57 |
sys-fs/mdadm |
| 58 |
sys-fs/e2fsprogs |
| 59 |
@@ -43,14 +43,14 @@ netboot2/packages: |
| 60 |
#needed for the kernel to compile |
| 61 |
sys-devel/bc |
| 62 |
|
| 63 |
-netboot2/packages/sys-boot/palo/files: |
| 64 |
+netboot/packages/sys-boot/palo/files: |
| 65 |
/sbin/palo |
| 66 |
/usr/share/palo/iplboot |
| 67 |
|
| 68 |
-netboot2/packages/sys-fs/mdadm/files: |
| 69 |
+netboot/packages/sys-fs/mdadm/files: |
| 70 |
/sbin/mdadm |
| 71 |
|
| 72 |
-netboot2/packages/sys-fs/e2fsprogs/files: |
| 73 |
+netboot/packages/sys-fs/e2fsprogs/files: |
| 74 |
/usr/bin/chattr |
| 75 |
/usr/bin/lsattr |
| 76 |
/usr/bin/uuidgen |
| 77 |
@@ -84,14 +84,14 @@ netboot2/packages/sys-fs/e2fsprogs/files: |
| 78 |
/usr/lib/e2initrd_helper |
| 79 |
/lib/libpthread* |
| 80 |
|
| 81 |
-netboot2/packages/sys-fs/xfsprogs/files: |
| 82 |
+netboot/packages/sys-fs/xfsprogs/files: |
| 83 |
/sbin/mkfs.xfs |
| 84 |
/sbin/fsck.xfs |
| 85 |
/sbin/xfs_repair |
| 86 |
/lib/librt* |
| 87 |
|
| 88 |
|
| 89 |
-netboot2/packages/sys-apps/util-linux/files: |
| 90 |
+netboot/packages/sys-apps/util-linux/files: |
| 91 |
/usr/sbin/partx |
| 92 |
/usr/sbin/delpart |
| 93 |
/usr/sbin/rtcwake |
| 94 |
@@ -146,10 +146,10 @@ netboot2/packages/sys-apps/util-linux/files: |
| 95 |
/lib/libmount.so.* |
| 96 |
/lib/libuuid.so.* |
| 97 |
|
| 98 |
-netboot2/packages/app-editors/nano/files: |
| 99 |
+netboot/packages/app-editors/nano/files: |
| 100 |
/bin/nano |
| 101 |
|
| 102 |
-netboot2/packages/sys-libs/ncurses/files: |
| 103 |
+netboot/packages/sys-libs/ncurses/files: |
| 104 |
/lib/libncurses.so.* |
| 105 |
/lib/libncursesw.so.* |
| 106 |
/etc/terminfo |
| 107 |
@@ -174,22 +174,22 @@ netboot2/packages/sys-libs/ncurses/files: |
| 108 |
/usr/share/terminfo/x/xterm-color |
| 109 |
/usr/share/terminfo/x/xterm-xfree86 |
| 110 |
|
| 111 |
-netboot2/packages/net-misc/wget/files: |
| 112 |
+netboot/packages/net-misc/wget/files: |
| 113 |
/usr/bin/wget |
| 114 |
/lib/libss.so.* |
| 115 |
/lib/libz.so.* |
| 116 |
|
| 117 |
-netboot2/packages/dev-libs/openssl/files: |
| 118 |
+netboot/packages/dev-libs/openssl/files: |
| 119 |
/usr/lib/libssl.so* |
| 120 |
/usr/lib/libcrypto.so* |
| 121 |
|
| 122 |
-netboot2/packages/net-misc/rsync/files: |
| 123 |
+netboot/packages/net-misc/rsync/files: |
| 124 |
/usr/bin/rsync |
| 125 |
|
| 126 |
-netboot2/packages/dev-libs/popt/files: |
| 127 |
+netboot/packages/dev-libs/popt/files: |
| 128 |
/usr/lib/libpopt.so* |
| 129 |
|
| 130 |
-netboot2/packages/net-misc/dropbear/files: |
| 131 |
+netboot/packages/net-misc/dropbear/files: |
| 132 |
/usr/bin/dbclient |
| 133 |
/usr/bin/dbscp |
| 134 |
/usr/bin/dropbearconvert |
| 135 |
@@ -202,12 +202,12 @@ netboot2/packages/net-misc/dropbear/files: |
| 136 |
/lib/libresolv* |
| 137 |
/lib/libnss_dns* |
| 138 |
|
| 139 |
-netboot2/packages/dev-libs/libtommath/files: |
| 140 |
+netboot/packages/dev-libs/libtommath/files: |
| 141 |
/usr/lib/libtommath.so* |
| 142 |
/usr/lib/libtommath.so |
| 143 |
/lib/libutil* |
| 144 |
|
| 145 |
-netboot2/packages/app-misc/screen/files: |
| 146 |
+netboot/packages/app-misc/screen/files: |
| 147 |
/usr/bin/screen |
| 148 |
/etc/screenrc |
| 149 |
/lib/libdl* |
| 150 |
|
| 151 |
diff --git a/releases/specs/hppa/netboot2-hppa64.spec b/releases/specs/hppa/netboot-hppa64.spec |
| 152 |
similarity index 83% |
| 153 |
rename from releases/specs/hppa/netboot2-hppa64.spec |
| 154 |
rename to releases/specs/hppa/netboot-hppa64.spec |
| 155 |
index 93463ca7..b0241dc6 100644 |
| 156 |
--- a/releases/specs/hppa/netboot2-hppa64.spec |
| 157 |
+++ b/releases/specs/hppa/netboot-hppa64.spec |
| 158 |
@@ -2,10 +2,10 @@ |
| 159 |
version_stamp: @TIMESTAMP@ |
| 160 |
snapshot: @TIMESTAMP@ |
| 161 |
source_subpath: default/stage3-hppa2.0-@TIMESTAMP@ |
| 162 |
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa64 |
| 163 |
+pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa64 |
| 164 |
|
| 165 |
# these shouldn't change |
| 166 |
-target: netboot2 |
| 167 |
+target: netboot |
| 168 |
subarch: hppa2.0 |
| 169 |
rel_type: default |
| 170 |
profile: default/linux/hppa/17.0 |
| 171 |
@@ -15,7 +15,7 @@ boot/kernel/netboot64/sources: sys-kernel/gentoo-sources |
| 172 |
boot/kernel/netboot64/config: /root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config |
| 173 |
boot/kernel/netboot64/gk_kernargs: --cross-compile=hppa64-unknown-linux-gnu --all-ramdisk-modules |
| 174 |
|
| 175 |
-netboot2/use: |
| 176 |
+netboot/use: |
| 177 |
-* |
| 178 |
multicall |
| 179 |
shadow |
| 180 |
@@ -23,7 +23,7 @@ netboot2/use: |
| 181 |
ssl |
| 182 |
unicode |
| 183 |
|
| 184 |
-netboot2/packages: |
| 185 |
+netboot/packages: |
| 186 |
sys-boot/palo |
| 187 |
sys-fs/mdadm |
| 188 |
sys-fs/e2fsprogs |
| 189 |
@@ -45,14 +45,14 @@ netboot2/packages: |
| 190 |
sys-devel/bc |
| 191 |
|
| 192 |
|
| 193 |
-netboot2/packages/sys-boot/palo/files: |
| 194 |
+netboot/packages/sys-boot/palo/files: |
| 195 |
/sbin/palo |
| 196 |
/usr/share/palo/iplboot |
| 197 |
|
| 198 |
-netboot2/packages/sys-fs/mdadm/files: |
| 199 |
+netboot/packages/sys-fs/mdadm/files: |
| 200 |
/sbin/mdadm |
| 201 |
|
| 202 |
-netboot2/packages/sys-fs/e2fsprogs/files: |
| 203 |
+netboot/packages/sys-fs/e2fsprogs/files: |
| 204 |
/usr/bin/chattr |
| 205 |
/usr/bin/lsattr |
| 206 |
/usr/bin/uuidgen |
| 207 |
@@ -86,14 +86,14 @@ netboot2/packages/sys-fs/e2fsprogs/files: |
| 208 |
/usr/lib/e2initrd_helper |
| 209 |
/lib/libpthread* |
| 210 |
|
| 211 |
-netboot2/packages/sys-fs/xfsprogs/files: |
| 212 |
+netboot/packages/sys-fs/xfsprogs/files: |
| 213 |
/sbin/mkfs.xfs |
| 214 |
/sbin/fsck.xfs |
| 215 |
/sbin/xfs_repair |
| 216 |
/lib/librt* |
| 217 |
|
| 218 |
|
| 219 |
-netboot2/packages/sys-apps/util-linux/files: |
| 220 |
+netboot/packages/sys-apps/util-linux/files: |
| 221 |
/usr/sbin/partx |
| 222 |
/usr/sbin/delpart |
| 223 |
/usr/sbin/rtcwake |
| 224 |
@@ -148,10 +148,10 @@ netboot2/packages/sys-apps/util-linux/files: |
| 225 |
/lib/libmount.so.* |
| 226 |
/lib/libuuid.so.* |
| 227 |
|
| 228 |
-netboot2/packages/app-editors/nano/files: |
| 229 |
+netboot/packages/app-editors/nano/files: |
| 230 |
/bin/nano |
| 231 |
|
| 232 |
-netboot2/packages/sys-libs/ncurses/files: |
| 233 |
+netboot/packages/sys-libs/ncurses/files: |
| 234 |
/lib/libncurses.so.* |
| 235 |
/lib/libncursesw.so.* |
| 236 |
/etc/terminfo |
| 237 |
@@ -176,22 +176,22 @@ netboot2/packages/sys-libs/ncurses/files: |
| 238 |
/usr/share/terminfo/x/xterm-color |
| 239 |
/usr/share/terminfo/x/xterm-xfree86 |
| 240 |
|
| 241 |
-netboot2/packages/net-misc/wget/files: |
| 242 |
+netboot/packages/net-misc/wget/files: |
| 243 |
/usr/bin/wget |
| 244 |
/lib/libss.so.* |
| 245 |
/lib/libz.so.* |
| 246 |
|
| 247 |
-netboot2/packages/dev-libs/openssl/files: |
| 248 |
+netboot/packages/dev-libs/openssl/files: |
| 249 |
/usr/lib/libssl.so* |
| 250 |
/usr/lib/libcrypto.so* |
| 251 |
|
| 252 |
-netboot2/packages/net-misc/rsync/files: |
| 253 |
+netboot/packages/net-misc/rsync/files: |
| 254 |
/usr/bin/rsync |
| 255 |
|
| 256 |
-netboot2/packages/dev-libs/popt/files: |
| 257 |
+netboot/packages/dev-libs/popt/files: |
| 258 |
/usr/lib/libpopt.so* |
| 259 |
|
| 260 |
-netboot2/packages/net-misc/dropbear/files: |
| 261 |
+netboot/packages/net-misc/dropbear/files: |
| 262 |
/usr/bin/dbclient |
| 263 |
/usr/bin/dbscp |
| 264 |
/usr/bin/dropbearconvert |
| 265 |
@@ -204,12 +204,12 @@ netboot2/packages/net-misc/dropbear/files: |
| 266 |
/lib/libresolv* |
| 267 |
/lib/libnss_dns* |
| 268 |
|
| 269 |
-netboot2/packages/dev-libs/libtommath/files: |
| 270 |
+netboot/packages/dev-libs/libtommath/files: |
| 271 |
/usr/lib/libtommath.so* |
| 272 |
/usr/lib/libtommath.so |
| 273 |
/lib/libutil* |
| 274 |
|
| 275 |
-netboot2/packages/app-misc/screen/files: |
| 276 |
+netboot/packages/app-misc/screen/files: |
| 277 |
/usr/bin/screen |
| 278 |
/etc/screenrc |
| 279 |
/lib/libdl* |
| 280 |
|
| 281 |
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf |
| 282 |
index d666addf..07da406d 100644 |
| 283 |
--- a/tools/catalyst-auto-hppa.conf |
| 284 |
+++ b/tools/catalyst-auto-hppa.conf |
| 285 |
@@ -13,7 +13,7 @@ SET_hppa2_0_SPECS="hppa2.0/stage1.spec hppa2.0/stage3.spec" |
| 286 |
|
| 287 |
SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 288 |
|
| 289 |
-SET_hppa_netboot_SPECS="netboot2-hppa32.spec netboot2-hppa64.spec" |
| 290 |
+SET_hppa_netboot_SPECS="netboot-hppa32.spec netboot-hppa64.spec" |
| 291 |
|
| 292 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa |
| 293 |
|
| 294 |
@@ -40,13 +40,13 @@ post_build() { |
| 295 |
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
| 296 |
|
| 297 |
case ${spec} in |
| 298 |
- netboot2-hppa32.spec) |
| 299 |
- mv netboot2-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif |
| 300 |
- upload netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif |
| 301 |
+ netboot-hppa32.spec) |
| 302 |
+ mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif |
| 303 |
+ upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif |
| 304 |
;; |
| 305 |
- netboot2-hppa64.spec) |
| 306 |
- mv netboot2-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif |
| 307 |
- upload netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif |
| 308 |
+ netboot-hppa64.spec) |
| 309 |
+ mv netboot-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif |
| 310 |
+ upload netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif |
| 311 |
;; |
| 312 |
installcd-stage2-minimal.spec) |
| 313 |
upload install-hppa-minimal-*${TIMESTAMP}*.iso* |
Archives