| 1 |
commit: cee3787b3f30dec1e47d674c0db885b1fb0d5abb |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 3 12:02:36 2020 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 3 12:02:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cee3787b |
| 7 |
|
| 8 |
Try to fix the symlink creation for x86 by copying the code form amd64. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
tools/catalyst-auto-x86.conf | 18 +++++++++++++----- |
| 13 |
1 file changed, 13 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf |
| 16 |
index 064881d4..52f07b12 100644 |
| 17 |
--- a/tools/catalyst-auto-x86.conf |
| 18 |
+++ b/tools/catalyst-auto-x86.conf |
| 19 |
@@ -32,9 +32,17 @@ update_symlinks() { |
| 20 |
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
| 21 |
pushd $d >/dev/null |
| 22 |
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 23 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
| 24 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
| 25 |
- ln -sf $f $of |
| 26 |
+ # 20yymmddThhmmssZ |
| 27 |
+ # 20yymmddhhmmss |
| 28 |
+ # 20yymmdd |
| 29 |
+ # 20yy.n |
| 30 |
+ of=$(perl -p \ |
| 31 |
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \ |
| 32 |
+ -e 's/20\d{6}\d{6}/latest/g;' \ |
| 33 |
+ -e 's/20\d{6}/latest/g;' \ |
| 34 |
+ -e 's/20\d{2}\.\d{2}/latest/g;' \ |
| 35 |
+ <<<"$f") |
| 36 |
+ ln -svf "$f" "$of" |
| 37 |
done |
| 38 |
popd >/dev/null |
| 39 |
done |
| 40 |
@@ -61,7 +69,7 @@ post_build() { |
| 41 |
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null |
| 42 |
mkdir -p ${TMPDIR}/empty |
| 43 |
"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT} |
| 44 |
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do |
| 45 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do |
| 46 |
if [ -f $file ]; then |
| 47 |
"${cmd[@]}" ${file}* ${DEST_DEFAULT} |
| 48 |
fi |
| 49 |
@@ -75,7 +83,7 @@ post_build() { |
| 50 |
|
| 51 |
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null |
| 52 |
"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED} |
| 53 |
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do |
| 54 |
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do |
| 55 |
if [ -f $file ]; then |
| 56 |
"${cmd[@]}" $file* ${DEST_HARDENED} |
| 57 |
fi |
Archives