Skip to content

Commit cd100e0

Browse files
committed
contrib/rootfs-builder: update Gentoo URLs
Since December 2017, Gentoo has a "systemd" profile and the old URLs don't work anymore. See: https://www.gentoo.org/support/news-items/2017-12-26-experimental-amd64-17-1-profiles.html Signed-off-by: Alban Crequy <[email protected]>
1 parent 3532c53 commit cd100e0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

contrib/rootfs-builder/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ rootfs-%.tar.gz: rootfs/%/bin/echo
66
tar -czf $@ -C rootfs/$* .
77

88
.PRECIOUS: rootfs/%/bin/busybox
9-
rootfs/%/bin/busybox: downloads/stage3-%-current.tar.bz2 rootfs-files
9+
rootfs/%/bin/busybox: downloads/stage3-%-systemd-current.tar.bz2 rootfs-files
1010
gpg --verify $<.DIGESTS.asc
1111
(cd downloads && \
12-
grep -A1 '^# SHA512 HASH' stage3-$*-current.tar.bz2.DIGESTS.asc | \
12+
grep -A1 '^# SHA512 HASH' stage3-$*-systemd-current.tar.bz2.DIGESTS.asc | \
1313
grep -v '^--' | \
1414
sha512sum -c)
1515
sudo rm -rf rootfs/$*
1616
sudo mkdir -p rootfs/$*
17-
sudo tar -xvf downloads/stage3-$*-current.tar.bz2 -C rootfs/$* \
17+
sudo tar -xvf downloads/stage3-$*-systemd-current.tar.bz2 -C rootfs/$* \
1818
--no-recursion --wildcards $$(< rootfs-files)
1919
sudo touch $@
2020

@@ -24,7 +24,7 @@ rootfs/%/bin/echo: rootfs/%/bin/busybox
2424
test -L "rootfs/$*/bin/$${COMMAND}" || ln -rs $< "rootfs/$*/bin/$${COMMAND}" || exit; \
2525
done'
2626

27-
downloads/stage3-%-current.tar.bz2: get-stage3.sh
27+
downloads/stage3-%-systemd-current.tar.bz2: get-stage3.sh
2828
STAGE3_ARCH=$* ./$<
2929
touch downloads/stage3-$*-*.tar.bz2
3030

contrib/rootfs-builder/get-stage3.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ fi
3939

4040
BASE_ARCH_URL="${BASE_ARCH_URL:-${MIRROR}releases/${BASE_ARCH}/autobuilds/}"
4141
LATEST=$(wget -O - "${BASE_ARCH_URL}latest-stage3.txt")
42-
DATE=$(echo "${LATEST}" | sed -n "s|/stage3-${STAGE3_ARCH}-[0-9]*[.]tar[.]bz2.*||p")
43-
ARCH_URL="${ARCH_URL:-${BASE_ARCH_URL}${DATE}/}"
44-
STAGE3="${STAGE3:-stage3-${STAGE3_ARCH}-${DATE}.tar.bz2}"
42+
DATE=$(echo "${LATEST}" | sed -n "s|/.*stage3-${STAGE3_ARCH}-systemd-[0-9]*[.]tar[.]bz2.*||p" | tail -1)
43+
ARCH_URL="${ARCH_URL:-${BASE_ARCH_URL}${DATE}/systemd/}"
44+
STAGE3="${STAGE3:-stage3-${STAGE3_ARCH}-systemd-${DATE}.tar.bz2}"
4545
STAGE3_CONTENTS="${STAGE3_CONTENTS:-${STAGE3}.CONTENTS}"
4646
STAGE3_DIGESTS="${STAGE3_DIGESTS:-${STAGE3}.DIGESTS.asc}"
4747

0 commit comments

Comments
 (0)