Re: [gentoo-catalyst] rewrite-on-master branch

[Brian Dolbec]

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.
> >
> > I've rebased the origin/3.0 branch onto master. There are 81 patches in it.
> >
> > All of the differences between origin/3.0 and rewrite-on-master seem
> > to be mistakes in the 3.0 branch.
> >
> > I'm not advocating pushing this to master yet. The series needs review
> > and some clean up.
> >
>
> 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.
>

>
> diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.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=no setup_myemergeopts
>  else
>  	echo "Skipping seed stage update..."
>  fi
>
>
> This one I want to check out more why it is different, but I suspect
> it is a difference in what Jorge committed to master which was a little different
> 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}" == "yes" ]; then
  29                 if [ -n "${clst_update_seed_command}" ]; then
  30                         echo "--- Updating seed stage with USER defined update_seed_command"
  31                         clst_root_path=/ run_merge "${clst_update_seed_command}"
  32                 else
  33                         echo "--- Updating seed stage with DEFAULT update_seed_command"
  34                         update_cmd="--update --deep --complete-graph --rebuild-if-new-ver gcc"
  35                         clst_root_path=/ run_merge ${update_cmd}
  36                 fi
  37 
  38                 # reset the emerge options for the target
  39                 clst_update_seed=no setup_myemergeopts
  40         elif [ "${clst_update_seed}" != "no" ]; then
  41                 echo "Invalid setting for update_seed: ${clst_update_seed}"
  42                 exit 1
  43         fi
  44 
  45         # reset emerge options for the target
  46         clst_update_seed=no setup_myemergeopts
  47 else
  48         echo "Skipping seed stage update..."
  49 fi


>
> 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="${bootstrap_opts} -f"
>  		export clst_myemergeopts="${clst_myemergeopts} -f"
> +	# if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
>  	elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
>  	then
>  		# if you add --usepkg, then also add --binpkg-respect-use=y
>
> 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.