From: "Brian Dolbec" <dolsen@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ Date: Wed, 29 Nov 2017 17:20:45 +0000 (UTC) [thread overview] Message-ID: <1511313381.2d574bfa8e5f385f495b3b3e7f4df882bb6751c4.dolsen@gentoo> (raw) commit: 2d574bfa8e5f385f495b3b3e7f4df882bb6751c4 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Sat Mar 11 00:39:12 2017 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Wed Nov 22 01:16:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d574bfa Improve the order of USE definition, make sure to remove USE after building portage, add the contents of BOOTSTRAP_USE to USE and clean USE and CATALYST_USE after building pacakges. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> targets/stage1/stage1-chroot.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index f2438660..1b0aa08b 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -25,7 +25,7 @@ clst_root_path=/ setup_pkgmgr "build" # We need to ensure the base stage3 has USE="bindist" # if BINDIST is set to avoid issues with openssl / openssh -[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BINDIST}\"" >> ${clst_make_conf} +[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} # Update stage3 if [ -n "${clst_update_seed}" ]; then @@ -48,7 +48,7 @@ else fi # Clear USE -[ -e ${clst_make_conf} ] && sed -i -e "USE=\"s/${BINDIST}//" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf} make_destpath /tmp/stage1root @@ -61,7 +61,8 @@ sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} # Now, we install our packages if [ -e ${clst_make_conf} ]; then echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf} - echo "USE=\"\${CATALYST_USE} ${USE} \${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + echo "USE=\"\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + for useexpand in ${clst_HOSTUSEEXPAND}; do x="clst_${useexpand}" echo "${useexpand}=\"${!x}\"" \ @@ -77,3 +78,7 @@ for useexpand in ${clst_HOSTUSEEXPAND}; do sed -i "/${useexpand}=\"${!x}\"/d" \ ${clst_make_conf} done + +# Clear USE +[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}
WARNING: multiple messages have this Message-ID (diff)
From: "Brian Dolbec" <dolsen@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/ Date: Wed, 22 Nov 2017 15:52:44 +0000 (UTC) [thread overview] Message-ID: <1511313381.2d574bfa8e5f385f495b3b3e7f4df882bb6751c4.dolsen@gentoo> (raw) Message-ID: <20171122155244.umuXUhZ8Y_q31PjGvEo0LP4kR6eNxsFMj2pSb8o9cVU@z> (raw) commit: 2d574bfa8e5f385f495b3b3e7f4df882bb6751c4 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Sat Mar 11 00:39:12 2017 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Wed Nov 22 01:16:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d574bfa Improve the order of USE definition, make sure to remove USE after building portage, add the contents of BOOTSTRAP_USE to USE and clean USE and CATALYST_USE after building pacakges. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> targets/stage1/stage1-chroot.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index f2438660..1b0aa08b 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -25,7 +25,7 @@ clst_root_path=/ setup_pkgmgr "build" # We need to ensure the base stage3 has USE="bindist" # if BINDIST is set to avoid issues with openssl / openssh -[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BINDIST}\"" >> ${clst_make_conf} +[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} # Update stage3 if [ -n "${clst_update_seed}" ]; then @@ -48,7 +48,7 @@ else fi # Clear USE -[ -e ${clst_make_conf} ] && sed -i -e "USE=\"s/${BINDIST}//" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf} make_destpath /tmp/stage1root @@ -61,7 +61,8 @@ sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} # Now, we install our packages if [ -e ${clst_make_conf} ]; then echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf} - echo "USE=\"\${CATALYST_USE} ${USE} \${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + echo "USE=\"\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + for useexpand in ${clst_HOSTUSEEXPAND}; do x="clst_${useexpand}" echo "${useexpand}=\"${!x}\"" \ @@ -77,3 +78,7 @@ for useexpand in ${clst_HOSTUSEEXPAND}; do sed -i "/${useexpand}=\"${!x}\"/d" \ ${clst_make_conf} done + +# Clear USE +[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}
next reply other threads:[~2017-11-29 17:20 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-29 17:20 Brian Dolbec [this message] 2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/ Brian Dolbec -- strict thread matches above, loose matches on Subject: below -- 2022-10-13 16:17 [gentoo-commits] proj/catalyst:master " Matt Turner 2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner 2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner 2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner 2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner 2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2020-12-27 23:15 Matt Turner 2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner 2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner 2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner 2020-12-16 16:00 Matt Turner 2020-05-16 6:43 Matt Turner 2020-04-10 21:04 Matt Turner 2020-04-10 21:04 Matt Turner 2020-04-08 0:25 Matt Turner 2020-04-08 0:25 Matt Turner 2016-09-15 0:57 Richard Farina 2016-09-15 0:57 Richard Farina 2016-09-14 22:12 [gentoo-commits] proj/catalyst:fix_stage1 " Richard Farina 2016-09-15 0:57 ` [gentoo-commits] proj/catalyst:master " Richard Farina 2015-09-08 2:58 Richard Farina 2015-09-03 1:51 Richard Farina 2015-08-30 19:28 Jorge Manuel B. S. Vicetto 2015-08-30 4:32 Jorge Manuel B. S. Vicetto 2015-08-30 3:51 Jorge Manuel B. S. Vicetto 2015-08-30 3:14 Jorge Manuel B. S. Vicetto 2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2015-05-24 0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec 2014-09-02 5:54 [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2014-09-11 3:26 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec 2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec 2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec 2013-01-31 4:00 Richard Farina 2013-01-25 2:46 Matt Turner 2012-12-07 1:49 Jorge Manuel B. S. Vicetto 2012-11-21 5:20 Matt Turner 2012-10-23 17:18 Richard Farina 2012-10-22 1:20 Richard Farina 2012-09-03 3:09 Jorge Manuel B. S. Vicetto 2012-08-31 1:57 Jorge Manuel B. S. Vicetto 2012-08-29 3:18 Jorge Manuel B. S. Vicetto 2012-08-23 5:55 Jorge Manuel B. S. Vicetto 2012-08-23 5:55 Jorge Manuel B. S. Vicetto 2011-11-19 19:43 Jorge Manuel B. S. Vicetto 2011-11-16 4:05 Jorge Manuel B. S. Vicetto
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1511313381.2d574bfa8e5f385f495b3b3e7f4df882bb6751c4.dolsen@gentoo \ --to=dolsen@gentoo.org \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox