From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 048271381F3 for ; Sat, 20 Jul 2013 14:32:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F6DE084C; Sat, 20 Jul 2013 14:32:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00575E084C for ; Sat, 20 Jul 2013 14:32:20 +0000 (UTC) Received: from [192.168.1.210] (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 0FCD433E5FC for ; Sat, 20 Jul 2013 14:32:20 +0000 (UTC) Message-ID: <1374330721.10868.39.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-catalyst] rewrite-on-master branch From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Sat, 20 Jul 2013 07:32:01 -0700 In-Reply-To: <1374313144.10868.24.camel@big_daddy.dol-sen.ca> References: <1374313144.10868.24.camel@big_daddy.dol-sen.ca> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-QDLfe4a4UkUGly1Z6ItL" X-Mailer: Evolution 3.6.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: 4598d4fd-6082-4ae3-afb4-758980114fd2 X-Archives-Hash: 1c0a42f6b620a052683d9f6bc984dd04 --=-QDLfe4a4UkUGly1Z6ItL Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2013-07-20 at 02:39 -0700, Brian Dolbec wrote: > On Fri, 2013-07-19 at 21:52 -0700, Matt Turner wrote: > > I'm not okay with redoing the rename the branches trick. Let's use git > > how it's supposed to be used. > >=20 > > I've rebased the origin/3.0 branch onto master. There are 81 patches in= it. > >=20 > > All of the differences between origin/3.0 and rewrite-on-master seem > > to be mistakes in the 3.0 branch. > >=20 > > I'm not advocating pushing this to master yet. The series needs review > > and some clean up. > >=20 >=20 > No, there is no 3.0 mistakes in the diff, a few minor differences and > the bindist and unpack_command commits that weren't in my 3.0 rewrite. >=20 >=20 > diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chro= ot.sh > index a5d6a01..4ddb636 100755 > --- a/targets/stage1/stage1-chroot.sh > +++ b/targets/stage1/stage1-chroot.sh > @@ -41,6 +41,9 @@ if [ -n "${clst_update_seed}" ]; then > echo "Invalid setting for update_seed: ${clst_update_seed}" > exit 1 > fi > + > + # reset emerge options for the target > + clst_update_seed=3Dno setup_myemergeopts > else > echo "Skipping seed stage update..." > fi >=20 >=20 > This one I want to check out more why it is different, but I suspect=20 > it is a difference in what Jorge committed to master which was a little d= ifferent > than I had in 3.0. I later rebased those changes a few times once we got= the bugs > worked out. OK, this one is a rebase error from your cherrypicking. Below is the code chunk from your rebase. I had correctly moved the code in question into the "if" where it should be. That code was still in the original location, so is now a duplicate of the code in the correct location. The mistake was/is present in current master. The 3.0 version is the correct one. # Update stage3 27 if [ -n "${clst_update_seed}" ]; then 28 if [ "${clst_update_seed}" =3D=3D "yes" ]; then 29 if [ -n "${clst_update_seed_command}" ]; then 30 echo "--- Updating seed stage with USER define= d update_seed_command" 31 clst_root_path=3D/ run_merge "${clst_update_se= ed_command}" 32 else 33 echo "--- Updating seed stage with DEFAULT upd= ate_seed_command" 34 update_cmd=3D"--update --deep --complete-graph= --rebuild-if-new-ver gcc" 35 clst_root_path=3D/ run_merge ${update_cmd} 36 fi 37=20 38 # reset the emerge options for the target 39 clst_update_seed=3Dno setup_myemergeopts 40 elif [ "${clst_update_seed}" !=3D "no" ]; then 41 echo "Invalid setting for update_seed: ${clst_update_s= eed}" 42 exit 1 43 fi 44=20 45 # reset emerge options for the target 46 clst_update_seed=3Dno setup_myemergeopts 47 else 48 echo "Skipping seed stage update..." 49 fi >=20 > diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot= -functions.sh > index 39bb1cd..6271dc4 100755 > --- a/targets/support/chroot-functions.sh > +++ b/targets/support/chroot-functions.sh > @@ -133,6 +133,7 @@ setup_myemergeopts(){ > then > export bootstrap_opts=3D"${bootstrap_opts} -f" > export clst_myemergeopts=3D"${clst_myemergeopts} -f" > + # if we have PKGCACHE, and either update_seed is empty or 'no', make an= d use binpkgs > elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst= _update_seed}" =3D "no" ] > then > # if you add --usepkg, then also add --binpkg-respect-use=3Dy >=20 > The difference in jmbvicetto's commit to master, as opposed to mine in 3.= 0, it's just a comment. I was wrong, it was the difference in dwfreed's commit for master that was different than his fix that I applied to 3.0 before it was applied to master. --=-QDLfe4a4UkUGly1Z6ItL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQF8BAABCgBmBQJR6p9hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL6+kH/2iwEfsJ8fBrXTLMUcWzR1Lr KRqU/NlNaFxlhOYGdgMH2q80xz5DSl5TewVbtKHETu5e5Gdedas7UUnC0qxFNKEW LYCsZ8vXl36vlyDl+p68q+YxyJJ2mTbmBwoI1F5BiXhmavkyxUDzUCF2B55AK0V0 yr5I051AQhfPlNRYcRTHPcgD4qvak5VeEoSpn3QtHfhHwf9ZM348nII+y8pJXtN2 /OO/xm1HRagC+gN+/dNyBIgyD2rrYh0fPA6nRsEofZSs2/4atRWFamiTF40GGDrg 54VzNdHqYhnDtXpdCLV3J5CvqlV6fr8hhB0a8vXKffqyPp57VMhkLHmQVX2Mvzo= =VUoq -----END PGP SIGNATURE----- --=-QDLfe4a4UkUGly1Z6ItL--