| 1 |
commit: ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 4 02:38:42 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 4 02:38:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ed422ec6 |
| 7 |
|
| 8 |
tools-hardened: fix stage names in template |
| 9 |
|
| 10 |
tools-hardened/run-systemd.sh | 5 +++-- |
| 11 |
tools-hardened/stage-all.conf.template | 4 ++-- |
| 12 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh |
| 15 |
old mode 100644 |
| 16 |
new mode 100755 |
| 17 |
index 94c57d1..1160d42 |
| 18 |
--- a/tools-hardened/run-systemd.sh |
| 19 |
+++ b/tools-hardened/run-systemd.sh |
| 20 |
@@ -13,11 +13,12 @@ prepare_confs() { |
| 21 |
local pstage=stage${p} |
| 22 |
|
| 23 |
local parch="${arch}" |
| 24 |
- [[ "${arch}" == "i686" ]] && parch="x86" |
| 25 |
+ [[ "${arch}" == "i686" ]] && parch="x86" |
| 26 |
|
| 27 |
cat stage-all.conf.template | \ |
| 28 |
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ |
| 29 |
- -e "s:STAGE:${cstage}:g" \ |
| 30 |
+ -e "s:CSTAGE:${cstage}:g" \ |
| 31 |
+ -e "s:PSTAGE:${pstage}:g" \ |
| 32 |
-e "s:SARCH:${arch}:g" \ |
| 33 |
-e "s:PARCH:${parch}:g" \ |
| 34 |
> stage${s}-${arch}-systemd.conf |
| 35 |
|
| 36 |
diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template |
| 37 |
index 942ddc7..5e4cb39 100644 |
| 38 |
--- a/tools-hardened/stage-all.conf.template |
| 39 |
+++ b/tools-hardened/stage-all.conf.template |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
subarch: SARCH |
| 42 |
-target: STAGE |
| 43 |
+target: CSTAGE |
| 44 |
version_stamp: systemd |
| 45 |
rel_type: systemd/SARCH |
| 46 |
profile: default/linux/PARCH/13.0/systemd |
| 47 |
snapshot: current |
| 48 |
-source_subpath: systemd/SARCH/STAGE-SARCH-systemd |
| 49 |
+source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd |
Archives