Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: scripts/
Date: Sun, 31 Oct 2021 17:46:00
Message-Id: 1635702335.9e885d861f558574335a25a1d34f84c8722616f2.dilfridge@gentoo
1 commit: 9e885d861f558574335a25a1d34f84c8722616f2
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 31 17:38:54 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 31 17:45:35 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9e885d86
7
8 Do not advertise a "current stage3" or a "current iso" in general
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 scripts/copy_buildsync.sh | 29 ++++-------------------------
13 1 file changed, 4 insertions(+), 25 deletions(-)
14
15 diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
16 index 886d3819..9f56f44a 100755
17 --- a/scripts/copy_buildsync.sh
18 +++ b/scripts/copy_buildsync.sh
19 @@ -152,34 +152,13 @@ process_arch() {
20 if [ -n "${iso_list}" ]; then
21 echo -e "${header}" >"${OUT_ISO}"
22 # Some arches produce more than one type of iso.
23 - # Only apply the current-iso link logic to them.
24 - # TODO: Should make this dynamic based on the iso list.
25 - case ${ARCH} in
26 - amd64|x86)
27 - rm -f current-iso
28 - ;;
29 - *)
30 - echo -e "${iso_list}" |awk '{print $3}' | grep "$latest_iso_date" >>${OUT_ISO}
31 - ln -sfT "$latest_iso_date" current-iso
32 - ;;
33 - esac
34 + # So let's not advertise a current one via a symlink in general.
35 + rm -f current-iso
36 fi
37 if [ -n "${stage3_list}" ]; then
38 echo -e "${header}" >"${OUT_STAGE3}"
39 -
40 - # In the new variant preserve code there is a better way to do this
41 - #echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3}
42 -
43 - # The "latest stage3" concept works for only a few arches -- ones that
44 - # do not have more than one stage3 target per arch (i.e. multilib, etc...).
45 - case ${ARCH} in
46 - amd64|arm|hppa|ppc|s390|sh|x86)
47 - rm -f current-stage3
48 - ;;
49 - *)
50 - ln -sfT "$latest_stage3_date" current-stage3
51 - ;;
52 - esac
53 + # Dito for stage3
54 + rm -f current-stage3
55 fi
56
57 # New variant preserve code