Skip to content

Commit eea2bc9

Browse files
committed
contrib/rootfs-builder: Support timestamps in stage3 dates
I'm not sure when the change happened (sometime since ff5e578, contrib/rootfs-builder: Support multiple architectures, 2017-09-20, #479), but Gentoo is now using timestamps for some amd64 stages: $ curl http://distfiles.gentoo.org/releases/amd64/autobuilds/latest-stage3.txt # Latest as of Fri, 09 Mar 2018 15:00:02 +0000 # ts=1520607602 20180308T214502Z/stage3-amd64-20180308T214502Z.tar.xz 188851072 20180308T214502Z/hardened/stage3-amd64-hardened-20180308T214502Z.tar.xz 174759140 20180308T214502Z/hardened/stage3-amd64-hardened+nomultilib-20180308T214502Z.tar.xz 167639136 20180301T214503Z/hardened/stage3-amd64-hardened-selinux-20180301T214503Z.tar.xz 187319664 20180308T214502Z/stage3-amd64-nomultilib-20180308T214502Z.tar.xz 181866296 20180303/systemd/stage3-amd64-systemd-20180303.tar.bz2 281873162 20180225/uclibc/stage3-amd64-uclibc-hardened-20180225.tar.bz2 57147392 20180225/uclibc/stage3-amd64-uclibc-vanilla-20180225.tar.bz2 144490332 ... Signed-off-by: W. Trevor King <[email protected]>
1 parent 141f9ea commit eea2bc9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/rootfs-builder/get-stage3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ then
3838
then
3939
die "could not calculate STAGE3_ARCH from ${STAGE3}"
4040
fi
41-
DATE=$(echo "${STAGE3}" | sed -n "s/stage3-${STAGE3_ARCH}-\([0-9]*\)[.]tar[.].*/\1/p")
41+
DATE=$(echo "${STAGE3}" | sed -n "s/stage3-${STAGE3_ARCH}-\([0-9TZ]*\)[.]tar[.].*/\1/p")
4242
if test -z "${DATE}"
4343
then
4444
die "could not calculate DATE from ${STAGE3}"
@@ -72,7 +72,7 @@ then
7272
LATEST=$(wget -O - "${BASE_ARCH_URL}latest-stage3.txt")
7373
if test -z "${DATE}"
7474
then
75-
DATE=$(echo "${LATEST}" | sed -n "s|/stage3-${STAGE3_ARCH}-[0-9]*[.]tar.*||p")
75+
DATE=$(echo "${LATEST}" | sed -n "s|/stage3-${STAGE3_ARCH}-[0-9TZ]*[.]tar.*||p")
7676
if test -z "${DATE}"
7777
then
7878
die "could not calculate DATE from ${BASE_ARCH_URL}latest-stage3.txt"

0 commit comments

Comments
 (0)