Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages
Date: Sat, 16 May 2020 06:53:37
Message-Id: 20200516065317.2678080-7-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix by Matt Turner
1 This removes a hack introduced in 2006 to work around a bug in portage
2 where it wouldn't fetch distfiles if a binary package existed for the
3 package. Presumably that's been fixed in the intervening 14 years. See
4 commit 4e00f1338637 (We now only set the options for pkgcache if we are
5 not using fetchonly.)
6
7 Also remove the useless "i++ // increment i"-style comment.
8
9 Signed-off-by: Matt Turner <mattst88@g.o>
10 ---
11 targets/support/chroot-functions.sh | 5 +++--
12 1 file changed, 3 insertions(+), 2 deletions(-)
13
14 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
15 index 488041fe..d40279ae 100755
16 --- a/targets/support/chroot-functions.sh
17 +++ b/targets/support/chroot-functions.sh
18 @@ -152,8 +152,9 @@ setup_emerge_opts() {
19 then
20 emerge_opts+=(--fetchonly)
21 bootstrap_opts+=(-f)
22 - # if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
23 - elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
24 + fi
25 +
26 + if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
27 then
28 emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse)
29 bootstrap_opts+=(-r)
30 --
31 2.26.2