| 1 |
commit: f6b8f9cf9ca9454d81ee1bc6cd207eaa15ea65cb |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 6 18:07:59 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 6 18:07:59 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f6b8f9cf |
| 7 |
|
| 8 |
First try at qemu hppa builds |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs-qemu/hppa/hppa1.1/stage1-openrc.spec | 10 ++++++++++ |
| 13 |
releases/specs-qemu/hppa/hppa1.1/stage1.spec | 10 ---------- |
| 14 |
releases/specs-qemu/hppa/hppa1.1/stage2.spec | 9 --------- |
| 15 |
.../hppa/hppa1.1/{stage3.spec => stage3-openrc.spec} | 6 +++--- |
| 16 |
.../hppa/hppa2.0/{stage1.spec => stage1-openrc.spec} | 6 +++--- |
| 17 |
releases/specs-qemu/hppa/hppa2.0/stage2.spec | 9 --------- |
| 18 |
.../hppa/hppa2.0/{stage3.spec => stage3-openrc.spec} | 6 +++--- |
| 19 |
releases/specs-qemu/hppa/installcd-stage1.spec | 6 +++--- |
| 20 |
releases/specs-qemu/hppa/installcd-stage2-minimal.spec | 4 ++-- |
| 21 |
releases/specs-qemu/hppa/netboot2-hppa32.spec | 4 ++-- |
| 22 |
releases/specs-qemu/hppa/netboot2-hppa64.spec | 4 ++-- |
| 23 |
11 files changed, 28 insertions(+), 46 deletions(-) |
| 24 |
|
| 25 |
diff --git a/releases/specs-qemu/hppa/hppa1.1/stage1-openrc.spec b/releases/specs-qemu/hppa/hppa1.1/stage1-openrc.spec |
| 26 |
new file mode 100644 |
| 27 |
index 00000000..d63a4218 |
| 28 |
--- /dev/null |
| 29 |
+++ b/releases/specs-qemu/hppa/hppa1.1/stage1-openrc.spec |
| 30 |
@@ -0,0 +1,10 @@ |
| 31 |
+subarch: hppa1.1 |
| 32 |
+target: stage1 |
| 33 |
+version_stamp: openrc-@TIMESTAMP@ |
| 34 |
+rel_type: default |
| 35 |
+profile: default/linux/hppa/17.0 |
| 36 |
+snapshot: @TIMESTAMP@ |
| 37 |
+source_subpath: default/stage3-hppa1.1-openrc-latest |
| 38 |
+update_seed: yes |
| 39 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 40 |
+interpreter: /usr/bin/qemu-hppa |
| 41 |
|
| 42 |
diff --git a/releases/specs-qemu/hppa/hppa1.1/stage1.spec b/releases/specs-qemu/hppa/hppa1.1/stage1.spec |
| 43 |
deleted file mode 100644 |
| 44 |
index 373b331c..00000000 |
| 45 |
--- a/releases/specs-qemu/hppa/hppa1.1/stage1.spec |
| 46 |
+++ /dev/null |
| 47 |
@@ -1,10 +0,0 @@ |
| 48 |
-subarch: hppa1.1 |
| 49 |
-target: stage1 |
| 50 |
-version_stamp: @TIMESTAMP@ |
| 51 |
-rel_type: default |
| 52 |
-profile: default/linux/hppa/17.0 |
| 53 |
-snapshot: @TIMESTAMP@ |
| 54 |
-source_subpath: default/stage3-hppa1.1-latest |
| 55 |
-update_seed: yes |
| 56 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 57 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1 |
| 58 |
|
| 59 |
diff --git a/releases/specs-qemu/hppa/hppa1.1/stage2.spec b/releases/specs-qemu/hppa/hppa1.1/stage2.spec |
| 60 |
deleted file mode 100644 |
| 61 |
index f9e3a42b..00000000 |
| 62 |
--- a/releases/specs-qemu/hppa/hppa1.1/stage2.spec |
| 63 |
+++ /dev/null |
| 64 |
@@ -1,9 +0,0 @@ |
| 65 |
-subarch: hppa1.1 |
| 66 |
-target: stage2 |
| 67 |
-version_stamp: @TIMESTAMP@ |
| 68 |
-rel_type: default |
| 69 |
-profile: default/linux/hppa/17.0 |
| 70 |
-snapshot: @TIMESTAMP@ |
| 71 |
-source_subpath: default/stage1-hppa1.1-@TIMESTAMP@ |
| 72 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 73 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa1.1 |
| 74 |
|
| 75 |
diff --git a/releases/specs-qemu/hppa/hppa1.1/stage3.spec b/releases/specs-qemu/hppa/hppa1.1/stage3-openrc.spec |
| 76 |
similarity index 52% |
| 77 |
rename from releases/specs-qemu/hppa/hppa1.1/stage3.spec |
| 78 |
rename to releases/specs-qemu/hppa/hppa1.1/stage3-openrc.spec |
| 79 |
index 8350f712..1c009a58 100644 |
| 80 |
--- a/releases/specs-qemu/hppa/hppa1.1/stage3.spec |
| 81 |
+++ b/releases/specs-qemu/hppa/hppa1.1/stage3-openrc.spec |
| 82 |
@@ -1,9 +1,9 @@ |
| 83 |
subarch: hppa1.1 |
| 84 |
target: stage3 |
| 85 |
-version_stamp: @TIMESTAMP@ |
| 86 |
+version_stamp: openrc-@TIMESTAMP@ |
| 87 |
rel_type: default |
| 88 |
profile: default/linux/hppa/17.0 |
| 89 |
snapshot: @TIMESTAMP@ |
| 90 |
-source_subpath: default/stage1-hppa1.1-@TIMESTAMP@ |
| 91 |
+source_subpath: default/stage1-hppa1.1-openrc-@TIMESTAMP@ |
| 92 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 93 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1 |
| 94 |
+interpreter: /usr/bin/qemu-hppa |
| 95 |
|
| 96 |
diff --git a/releases/specs-qemu/hppa/hppa2.0/stage1.spec b/releases/specs-qemu/hppa/hppa2.0/stage1-openrc.spec |
| 97 |
similarity index 55% |
| 98 |
rename from releases/specs-qemu/hppa/hppa2.0/stage1.spec |
| 99 |
rename to releases/specs-qemu/hppa/hppa2.0/stage1-openrc.spec |
| 100 |
index 71f2e1f2..e1118dde 100644 |
| 101 |
--- a/releases/specs-qemu/hppa/hppa2.0/stage1.spec |
| 102 |
+++ b/releases/specs-qemu/hppa/hppa2.0/stage1-openrc.spec |
| 103 |
@@ -1,10 +1,10 @@ |
| 104 |
subarch: hppa2.0 |
| 105 |
target: stage1 |
| 106 |
-version_stamp: @TIMESTAMP@ |
| 107 |
+version_stamp: openrc-@TIMESTAMP@ |
| 108 |
rel_type: default |
| 109 |
profile: default/linux/hppa/17.0 |
| 110 |
snapshot: @TIMESTAMP@ |
| 111 |
-source_subpath: default/stage3-hppa2.0-latest |
| 112 |
+source_subpath: default/stage3-hppa2.0-openrc-latest |
| 113 |
update_seed: yes |
| 114 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 115 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0 |
| 116 |
+interpreter: /usr/bin/qemu-hppa |
| 117 |
|
| 118 |
diff --git a/releases/specs-qemu/hppa/hppa2.0/stage2.spec b/releases/specs-qemu/hppa/hppa2.0/stage2.spec |
| 119 |
deleted file mode 100644 |
| 120 |
index 32ea73a2..00000000 |
| 121 |
--- a/releases/specs-qemu/hppa/hppa2.0/stage2.spec |
| 122 |
+++ /dev/null |
| 123 |
@@ -1,9 +0,0 @@ |
| 124 |
-subarch: hppa2.0 |
| 125 |
-target: stage2 |
| 126 |
-version_stamp: @TIMESTAMP@ |
| 127 |
-rel_type: default |
| 128 |
-profile: default/linux/hppa/17.0 |
| 129 |
-snapshot: @TIMESTAMP@ |
| 130 |
-source_subpath: default/stage1-hppa2.0-@TIMESTAMP@ |
| 131 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 132 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa2.0 |
| 133 |
|
| 134 |
diff --git a/releases/specs-qemu/hppa/hppa2.0/stage3.spec b/releases/specs-qemu/hppa/hppa2.0/stage3-openrc.spec |
| 135 |
similarity index 52% |
| 136 |
rename from releases/specs-qemu/hppa/hppa2.0/stage3.spec |
| 137 |
rename to releases/specs-qemu/hppa/hppa2.0/stage3-openrc.spec |
| 138 |
index 4c9d072b..0bbe5bb3 100644 |
| 139 |
--- a/releases/specs-qemu/hppa/hppa2.0/stage3.spec |
| 140 |
+++ b/releases/specs-qemu/hppa/hppa2.0/stage3-openrc.spec |
| 141 |
@@ -1,9 +1,9 @@ |
| 142 |
subarch: hppa2.0 |
| 143 |
target: stage3 |
| 144 |
-version_stamp: @TIMESTAMP@ |
| 145 |
+version_stamp: openrc-@TIMESTAMP@ |
| 146 |
rel_type: default |
| 147 |
profile: default/linux/hppa/17.0 |
| 148 |
snapshot: @TIMESTAMP@ |
| 149 |
-source_subpath: default/stage1-hppa2.0-@TIMESTAMP@ |
| 150 |
+source_subpath: default/stage1-hppa2.0-openrc-@TIMESTAMP@ |
| 151 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 152 |
-pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0 |
| 153 |
+interpreter: /usr/bin/qemu-hppa |
| 154 |
|
| 155 |
diff --git a/releases/specs-qemu/hppa/installcd-stage1.spec b/releases/specs-qemu/hppa/installcd-stage1.spec |
| 156 |
index 5a490a46..1d92fa11 100644 |
| 157 |
--- a/releases/specs-qemu/hppa/installcd-stage1.spec |
| 158 |
+++ b/releases/specs-qemu/hppa/installcd-stage1.spec |
| 159 |
@@ -4,9 +4,9 @@ target: livecd-stage1 |
| 160 |
rel_type: default |
| 161 |
profile: default/linux/hppa/17.0 |
| 162 |
snapshot: @TIMESTAMP@ |
| 163 |
-source_subpath: default/stage3-hppa1.1-@TIMESTAMP@ |
| 164 |
-pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage1 |
| 165 |
-portage_confdir: @REPO_DIR@/releases/portage/isos |
| 166 |
+source_subpath: default/stage3-hppa1.1-openrc-@TIMESTAMP@ |
| 167 |
+portage_confdir: @REPO_DIR@/releases/portage/isos-qemu |
| 168 |
+interpreter: /usr/bin/qemu-hppa |
| 169 |
livecd/use: |
| 170 |
-* |
| 171 |
python_targets_python3_6 |
| 172 |
|
| 173 |
diff --git a/releases/specs-qemu/hppa/installcd-stage2-minimal.spec b/releases/specs-qemu/hppa/installcd-stage2-minimal.spec |
| 174 |
index c1705741..1d146a65 100644 |
| 175 |
--- a/releases/specs-qemu/hppa/installcd-stage2-minimal.spec |
| 176 |
+++ b/releases/specs-qemu/hppa/installcd-stage2-minimal.spec |
| 177 |
@@ -5,8 +5,8 @@ rel_type: default |
| 178 |
profile: default/linux/hppa/17.0 |
| 179 |
snapshot: @TIMESTAMP@ |
| 180 |
source_subpath: default/livecd-stage1-hppa1.1-@TIMESTAMP@ |
| 181 |
-pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage2 |
| 182 |
-portage_confdir: @REPO_DIR@/releases/portage/isos |
| 183 |
+portage_confdir: @REPO_DIR@/releases/portage/isos-qemu |
| 184 |
+interpreter: /usr/bin/qemu-hppa |
| 185 |
|
| 186 |
livecd/volid: Gentoo hppa @TIMESTAMP@ |
| 187 |
livecd/bootargs: dokeymap |
| 188 |
|
| 189 |
diff --git a/releases/specs-qemu/hppa/netboot2-hppa32.spec b/releases/specs-qemu/hppa/netboot2-hppa32.spec |
| 190 |
index b50bb8f0..628a78c2 100644 |
| 191 |
--- a/releases/specs-qemu/hppa/netboot2-hppa32.spec |
| 192 |
+++ b/releases/specs-qemu/hppa/netboot2-hppa32.spec |
| 193 |
@@ -1,8 +1,8 @@ |
| 194 |
# HPPA Netboot spec file by Guy Martin |
| 195 |
version_stamp: @TIMESTAMP@ |
| 196 |
snapshot: @TIMESTAMP@ |
| 197 |
-source_subpath: default/stage3-hppa1.1-@TIMESTAMP@ |
| 198 |
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa32 |
| 199 |
+source_subpath: default/stage3-hppa1.1-openrc-@TIMESTAMP@ |
| 200 |
+interpreter: /usr/bin/qemu-hppa |
| 201 |
|
| 202 |
# these shouldn't change |
| 203 |
target: netboot2 |
| 204 |
|
| 205 |
diff --git a/releases/specs-qemu/hppa/netboot2-hppa64.spec b/releases/specs-qemu/hppa/netboot2-hppa64.spec |
| 206 |
index 93463ca7..5d571628 100644 |
| 207 |
--- a/releases/specs-qemu/hppa/netboot2-hppa64.spec |
| 208 |
+++ b/releases/specs-qemu/hppa/netboot2-hppa64.spec |
| 209 |
@@ -1,8 +1,8 @@ |
| 210 |
# HPPA Netboot spec file by Guy Martin |
| 211 |
version_stamp: @TIMESTAMP@ |
| 212 |
snapshot: @TIMESTAMP@ |
| 213 |
-source_subpath: default/stage3-hppa2.0-@TIMESTAMP@ |
| 214 |
-pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-hppa64 |
| 215 |
+source_subpath: default/stage3-hppa2.0-openrc-@TIMESTAMP@ |
| 216 |
+interpreter: /usr/bin/qemu-hppa |
| 217 |
|
| 218 |
# these shouldn't change |
| 219 |
target: netboot2 |
Archives