commit: 71e4b843b89ba8d5ebe4c1414225dc8e8e1271e6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 21:45:21 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 04:49:29 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=71e4b843
specs/hppa: netboot2 -> netboot
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../{netboot2-hppa32.spec => netboot-hppa32.spec} | 38 +++++++++++-----------
.../{netboot2-hppa64.spec => netboot-hppa64.spec} | 36 ++++++++++----------
tools/catalyst-auto-hppa.conf | 14 ++++----
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/releases/specs/hppa/netboot2-hppa32.spec
b/releases/specs/hppa/netboot-hppa32.spec
similarity index 82%
rename from releases/specs/hppa/netboot2-hppa32.spec
rename to releases/specs/hppa/netboot-hppa32.spec
index b50bb8f0..e2e15639 100644
--- a/releases/specs/hppa/netboot2-hppa32.spec
+++ b/releases/specs/hppa/netboot-hppa32.spec
@@ -2,21 +2,21 @@
version_stamp: @TIMESTAMP@
snapshot: @TIMESTAMP@
source_subpath: default/stage3-hppa1.1-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa32
+pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa32
# these shouldn't change
-target: netboot2
+target: netboot
subarch: hppa1.1
rel_type: default
profile: default/linux/hppa/17.0
-# netboot2 stuff
+# netboot stuff
boot/kernel: netboot32
boot/kernel/netboot32/sources: sys-kernel/gentoo-sources
boot/kernel/netboot32/config:
/root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config
boot/kernel/netboot32/gk_kernargs: --all-ramdisk-modules
-netboot2/use:
+netboot/use:
-*
multicall
shadow
@@ -24,7 +24,7 @@ netboot2/use:
ssl
unicode
-netboot2/packages:
+netboot/packages:
sys-boot/palo
sys-fs/mdadm
sys-fs/e2fsprogs
@@ -43,14 +43,14 @@ netboot2/packages:
#needed for the kernel to compile
sys-devel/bc
-netboot2/packages/sys-boot/palo/files:
+netboot/packages/sys-boot/palo/files:
/sbin/palo
/usr/share/palo/iplboot
-netboot2/packages/sys-fs/mdadm/files:
+netboot/packages/sys-fs/mdadm/files:
/sbin/mdadm
-netboot2/packages/sys-fs/e2fsprogs/files:
+netboot/packages/sys-fs/e2fsprogs/files:
/usr/bin/chattr
/usr/bin/lsattr
/usr/bin/uuidgen
@@ -84,14 +84,14 @@ netboot2/packages/sys-fs/e2fsprogs/files:
/usr/lib/e2initrd_helper
/lib/libpthread*
-netboot2/packages/sys-fs/xfsprogs/files:
+netboot/packages/sys-fs/xfsprogs/files:
/sbin/mkfs.xfs
/sbin/fsck.xfs
/sbin/xfs_repair
/lib/librt*
-netboot2/packages/sys-apps/util-linux/files:
+netboot/packages/sys-apps/util-linux/files:
/usr/sbin/partx
/usr/sbin/delpart
/usr/sbin/rtcwake
@@ -146,10 +146,10 @@ netboot2/packages/sys-apps/util-linux/files:
/lib/libmount.so.*
/lib/libuuid.so.*
-netboot2/packages/app-editors/nano/files:
+netboot/packages/app-editors/nano/files:
/bin/nano
-netboot2/packages/sys-libs/ncurses/files:
+netboot/packages/sys-libs/ncurses/files:
/lib/libncurses.so.*
/lib/libncursesw.so.*
/etc/terminfo
@@ -174,22 +174,22 @@ netboot2/packages/sys-libs/ncurses/files:
/usr/share/terminfo/x/xterm-color
/usr/share/terminfo/x/xterm-xfree86
-netboot2/packages/net-misc/wget/files:
+netboot/packages/net-misc/wget/files:
/usr/bin/wget
/lib/libss.so.*
/lib/libz.so.*
-netboot2/packages/dev-libs/openssl/files:
+netboot/packages/dev-libs/openssl/files:
/usr/lib/libssl.so*
/usr/lib/libcrypto.so*
-netboot2/packages/net-misc/rsync/files:
+netboot/packages/net-misc/rsync/files:
/usr/bin/rsync
-netboot2/packages/dev-libs/popt/files:
+netboot/packages/dev-libs/popt/files:
/usr/lib/libpopt.so*
-netboot2/packages/net-misc/dropbear/files:
+netboot/packages/net-misc/dropbear/files:
/usr/bin/dbclient
/usr/bin/dbscp
/usr/bin/dropbearconvert
@@ -202,12 +202,12 @@ netboot2/packages/net-misc/dropbear/files:
/lib/libresolv*
/lib/libnss_dns*
-netboot2/packages/dev-libs/libtommath/files:
+netboot/packages/dev-libs/libtommath/files:
/usr/lib/libtommath.so*
/usr/lib/libtommath.so
/lib/libutil*
-netboot2/packages/app-misc/screen/files:
+netboot/packages/app-misc/screen/files:
/usr/bin/screen
/etc/screenrc
/lib/libdl*
diff --git a/releases/specs/hppa/netboot2-hppa64.spec
b/releases/specs/hppa/netboot-hppa64.spec
similarity index 83%
rename from releases/specs/hppa/netboot2-hppa64.spec
rename to releases/specs/hppa/netboot-hppa64.spec
index 93463ca7..b0241dc6 100644
--- a/releases/specs/hppa/netboot2-hppa64.spec
+++ b/releases/specs/hppa/netboot-hppa64.spec
@@ -2,10 +2,10 @@
version_stamp: @TIMESTAMP@
snapshot: @TIMESTAMP@
source_subpath: default/stage3-hppa2.0-@TIMESTAMP@
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa64
+pkgcache_path: /var/tmp/catalyst/packages/default/netboot-hppa64
# these shouldn't change
-target: netboot2
+target: netboot
subarch: hppa2.0
rel_type: default
profile: default/linux/hppa/17.0
@@ -15,7 +15,7 @@ boot/kernel/netboot64/sources: sys-kernel/gentoo-sources
boot/kernel/netboot64/config:
/root/releng/releases/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config
boot/kernel/netboot64/gk_kernargs: --cross-compile=hppa64-unknown-linux-gnu
--all-ramdisk-modules
-netboot2/use:
+netboot/use:
-*
multicall
shadow
@@ -23,7 +23,7 @@ netboot2/use:
ssl
unicode
-netboot2/packages:
+netboot/packages:
sys-boot/palo
sys-fs/mdadm
sys-fs/e2fsprogs
@@ -45,14 +45,14 @@ netboot2/packages:
sys-devel/bc
-netboot2/packages/sys-boot/palo/files:
+netboot/packages/sys-boot/palo/files:
/sbin/palo
/usr/share/palo/iplboot
-netboot2/packages/sys-fs/mdadm/files:
+netboot/packages/sys-fs/mdadm/files:
/sbin/mdadm
-netboot2/packages/sys-fs/e2fsprogs/files:
+netboot/packages/sys-fs/e2fsprogs/files:
/usr/bin/chattr
/usr/bin/lsattr
/usr/bin/uuidgen
@@ -86,14 +86,14 @@ netboot2/packages/sys-fs/e2fsprogs/files:
/usr/lib/e2initrd_helper
/lib/libpthread*
-netboot2/packages/sys-fs/xfsprogs/files:
+netboot/packages/sys-fs/xfsprogs/files:
/sbin/mkfs.xfs
/sbin/fsck.xfs
/sbin/xfs_repair
/lib/librt*
-netboot2/packages/sys-apps/util-linux/files:
+netboot/packages/sys-apps/util-linux/files:
/usr/sbin/partx
/usr/sbin/delpart
/usr/sbin/rtcwake
@@ -148,10 +148,10 @@ netboot2/packages/sys-apps/util-linux/files:
/lib/libmount.so.*
/lib/libuuid.so.*
-netboot2/packages/app-editors/nano/files:
+netboot/packages/app-editors/nano/files:
/bin/nano
-netboot2/packages/sys-libs/ncurses/files:
+netboot/packages/sys-libs/ncurses/files:
/lib/libncurses.so.*
/lib/libncursesw.so.*
/etc/terminfo
@@ -176,22 +176,22 @@ netboot2/packages/sys-libs/ncurses/files:
/usr/share/terminfo/x/xterm-color
/usr/share/terminfo/x/xterm-xfree86
-netboot2/packages/net-misc/wget/files:
+netboot/packages/net-misc/wget/files:
/usr/bin/wget
/lib/libss.so.*
/lib/libz.so.*
-netboot2/packages/dev-libs/openssl/files:
+netboot/packages/dev-libs/openssl/files:
/usr/lib/libssl.so*
/usr/lib/libcrypto.so*
-netboot2/packages/net-misc/rsync/files:
+netboot/packages/net-misc/rsync/files:
/usr/bin/rsync
-netboot2/packages/dev-libs/popt/files:
+netboot/packages/dev-libs/popt/files:
/usr/lib/libpopt.so*
-netboot2/packages/net-misc/dropbear/files:
+netboot/packages/net-misc/dropbear/files:
/usr/bin/dbclient
/usr/bin/dbscp
/usr/bin/dropbearconvert
@@ -204,12 +204,12 @@ netboot2/packages/net-misc/dropbear/files:
/lib/libresolv*
/lib/libnss_dns*
-netboot2/packages/dev-libs/libtommath/files:
+netboot/packages/dev-libs/libtommath/files:
/usr/lib/libtommath.so*
/usr/lib/libtommath.so
/lib/libutil*
-netboot2/packages/app-misc/screen/files:
+netboot/packages/app-misc/screen/files:
/usr/bin/screen
/etc/screenrc
/lib/libdl*
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index d666addf..07da406d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -13,7 +13,7 @@ SET_hppa2_0_SPECS="hppa2.0/stage1.spec hppa2.0/stage3.spec"
SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_hppa_netboot_SPECS="netboot2-hppa32.spec netboot2-hppa64.spec"
+SET_hppa_netboot_SPECS="netboot-hppa32.spec netboot-hppa64.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
@@ -40,13 +40,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- netboot2-hppa32.spec)
- mv netboot2-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif
netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
- upload
netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ netboot-hppa32.spec)
+ mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ upload
netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
;;
- netboot2-hppa64.spec)
- mv netboot2-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif
netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
- upload
netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ netboot-hppa64.spec)
+ mv netboot-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ upload
netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
;;
installcd-stage2-minimal.spec)
upload install-hppa-minimal-*${TIMESTAMP}*.iso*
