| 1 |
commit: e9064501872b6529ea79c9672df80664f426c942 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 12 04:21:15 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 13 04:49:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e9064501 |
| 7 |
|
| 8 |
specs/hppa: Rename kernels |
| 9 |
|
| 10 |
Now that the kernel configs are consolidated, maybe we can share them |
| 11 |
between the netboot images and the installcd. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
releases/specs/hppa/installcd-stage2-minimal.spec | 20 ++++++++++---------- |
| 16 |
releases/specs/hppa/netboot-hppa32.spec | 8 ++++---- |
| 17 |
releases/specs/hppa/netboot-hppa64.spec | 8 ++++---- |
| 18 |
3 files changed, 18 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec |
| 21 |
index ad132917..10a1a30d 100644 |
| 22 |
--- a/releases/specs/hppa/installcd-stage2-minimal.spec |
| 23 |
+++ b/releases/specs/hppa/installcd-stage2-minimal.spec |
| 24 |
@@ -14,11 +14,11 @@ livecd/fstype: squashfs |
| 25 |
livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-@TIMESTAMP@.iso |
| 26 |
livecd/type: gentoo-release-minimal |
| 27 |
|
| 28 |
-boot/kernel: livecd32 livecd64 |
| 29 |
+boot/kernel: hppa32 hppa64 |
| 30 |
|
| 31 |
-boot/kernel/livecd32/sources: sys-kernel/gentoo-sources |
| 32 |
-boot/kernel/livecd32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 33 |
-boot/kernel/livecd32/use: |
| 34 |
+boot/kernel/hppa32/sources: sys-kernel/gentoo-sources |
| 35 |
+boot/kernel/hppa32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 36 |
+boot/kernel/hppa32/use: |
| 37 |
-* |
| 38 |
python_targets_python3_9 |
| 39 |
python_single_target_python3_9 |
| 40 |
@@ -38,16 +38,16 @@ boot/kernel/livecd32/use: |
| 41 |
unicode |
| 42 |
usb |
| 43 |
|
| 44 |
-boot/kernel/livecd64/sources: sys-kernel/gentoo-sources |
| 45 |
-boot/kernel/livecd64/config: @REPO_DIR@/releases/kconfig/hppa/hppa64.config |
| 46 |
-boot/kernel/livecd64/gk_kernargs: |
| 47 |
+boot/kernel/hppa64/sources: sys-kernel/gentoo-sources |
| 48 |
+boot/kernel/hppa64/config: @REPO_DIR@/releases/kconfig/hppa/hppa64.config |
| 49 |
+boot/kernel/hppa64/gk_kernargs: |
| 50 |
--all-ramdisk-modules |
| 51 |
--kernel-ar=hppa64-unknown-linux-gnu-ar |
| 52 |
--kernel-as=hppa64-unknown-linux-gnu-as |
| 53 |
--kernel-cc=hppa64-unknown-linux-gnu-cc |
| 54 |
--kernel-ld=hppa64-unknown-linux-gnu-ld |
| 55 |
--kernel-nm=hppa64-unknown-linux-gnu-nm |
| 56 |
-boot/kernel/livecd64/use: |
| 57 |
+boot/kernel/hppa64/use: |
| 58 |
-* |
| 59 |
python_targets_python3_9 |
| 60 |
python_single_target_python3_9 |
| 61 |
@@ -67,8 +67,8 @@ boot/kernel/livecd64/use: |
| 62 |
unicode |
| 63 |
usb |
| 64 |
|
| 65 |
-boot/kernel/livecd32/extraversion: livecd32 |
| 66 |
-boot/kernel/livecd64/extraversion: livecd64 |
| 67 |
+boot/kernel/hppa32/extraversion: hppa32 |
| 68 |
+boot/kernel/hppa64/extraversion: hppa64 |
| 69 |
|
| 70 |
livecd/unmerge: |
| 71 |
app-admin/eselect |
| 72 |
|
| 73 |
diff --git a/releases/specs/hppa/netboot-hppa32.spec b/releases/specs/hppa/netboot-hppa32.spec |
| 74 |
index 4908c222..5a04d882 100644 |
| 75 |
--- a/releases/specs/hppa/netboot-hppa32.spec |
| 76 |
+++ b/releases/specs/hppa/netboot-hppa32.spec |
| 77 |
@@ -11,10 +11,10 @@ rel_type: default |
| 78 |
profile: default/linux/hppa/17.0 |
| 79 |
|
| 80 |
# netboot stuff |
| 81 |
-boot/kernel: netboot32 |
| 82 |
-boot/kernel/netboot32/sources: sys-kernel/gentoo-sources |
| 83 |
-boot/kernel/netboot32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 84 |
-boot/kernel/netboot32/gk_kernargs: --all-ramdisk-modules |
| 85 |
+boot/kernel: hppa32 |
| 86 |
+boot/kernel/hppa32/sources: sys-kernel/gentoo-sources |
| 87 |
+boot/kernel/hppa32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 88 |
+boot/kernel/hppa32/gk_kernargs: --all-ramdisk-modules |
| 89 |
|
| 90 |
netboot/use: |
| 91 |
-* |
| 92 |
|
| 93 |
diff --git a/releases/specs/hppa/netboot-hppa64.spec b/releases/specs/hppa/netboot-hppa64.spec |
| 94 |
index 992fc3db..75039c30 100644 |
| 95 |
--- a/releases/specs/hppa/netboot-hppa64.spec |
| 96 |
+++ b/releases/specs/hppa/netboot-hppa64.spec |
| 97 |
@@ -10,10 +10,10 @@ subarch: hppa2.0 |
| 98 |
rel_type: default |
| 99 |
profile: default/linux/hppa/17.0 |
| 100 |
|
| 101 |
-boot/kernel: netboot64 |
| 102 |
-boot/kernel/netboot64/sources: sys-kernel/gentoo-sources |
| 103 |
-boot/kernel/netboot64/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 104 |
-boot/kernel/netboot64/gk_kernargs: |
| 105 |
+boot/kernel: hppa64 |
| 106 |
+boot/kernel/hppa64/sources: sys-kernel/gentoo-sources |
| 107 |
+boot/kernel/hppa64/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config |
| 108 |
+boot/kernel/hppa64/gk_kernargs: |
| 109 |
--all-ramdisk-modules |
| 110 |
--kernel-ar=hppa64-unknown-linux-gnu-ar |
| 111 |
--kernel-as=hppa64-unknown-linux-gnu-as |
Archives