Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 538618 - scripts/bootstrap.sh passes package atoms to emerge ---resume
Summary: scripts/bootstrap.sh passes package atoms to emerge ---resume
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-02-03 08:27 UTC by Joshua Kinard
Modified: 2015-02-04 10:08 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Catalyst run for MIPS stage2 showing --resume fail (catalyst-emerge-resume-fail-20150202.txt,6.52 KB, text/plain)
2015-02-03 08:27 UTC, Joshua Kinard
Details
Don't pass package atoms to emerge --resume (bootstrap_sh-resume.diff,1.11 KB, patch)
2015-02-03 11:17 UTC, Joshua Kinard
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Joshua Kinard gentoo-dev 2015-02-03 08:27:04 UTC
Created attachment 395436 [details]
Catalyst run for MIPS stage2 showing --resume fail

catalyst's stage2 target hasn't been updated yet to not pass package atoms to "emerge --resume", due to that emerge option somehow remembering where it left off:

This leads to an error message like this:
emerge: unexpected argument(s) for --resume: >=sys-kernel/linux-headers-3.18 sys-apps/texinfo gettext sys-devel/binutils sys-devel/gcc virtual/libc >=sys-apps/baselayout-2 zlib

Attached full log of failed run.  Worked around by just starting over from scratch, but it'd be nice to address this.
Comment 1 Joshua Kinard gentoo-dev 2015-02-03 11:12:02 UTC
Okay, this looks like it's not a problem specific to catalyst, but just outdated code in /usr/portage/scripts/bootstrap.sh.  I'll re-assign to base-system and seek comments on a fix that appears to work for me.
Comment 2 Joshua Kinard gentoo-dev 2015-02-03 11:17:38 UTC
Created attachment 395442 [details, diff]
Don't pass package atoms to emerge --resume

Discovered trying to resume a failed catalyst stage2 run, scripts/bootstrap.sh in the Portage tree is still using the old "emerge --resume" behavior of passing the list of packages to resume to emerge.  This is no longer valid and will cause a catalyst run to fail.

The attached patch moves the package atom list into the apparently-abandoned 'else' branch of a conditional so that $STRAP_EMERGE_OPTS will either contain "--resume" or the list of bootstrap packages, but not both.  Seems to work so far on a new stage2 catalyst run I am doing.
Comment 3 Jorge Manuel B. S. Vicetto (RETIRED) gentoo-dev 2015-02-03 14:22:22 UTC
Joshua,

the last changes to bootstrap.sh have been done by releng + portage. I don't think baselayout cares much about it and it certainly hasn't been involved recently.
So I suggest we reassign this back to release, but I'll let others comment.
Comment 4 Zac Medico gentoo-dev 2015-02-04 00:24:17 UTC
(In reply to Joshua Kinard from comment #2)
> Created attachment 395442 [details, diff] [details, diff]
> Don't pass package atoms to emerge --resume

Looks good to me. It appears to fix the broken case, without changing anything else. Please go ahead and commit it.
Comment 5 Joshua Kinard gentoo-dev 2015-02-04 10:08:29 UTC
Done.  Thanks for the eyeballs!