| View previous topic :: View next topic |
| Author |
Message |
roki942
Apprentice
Joined: 18 Apr 2005
Posts: 285
Location: Seattle
|
 Posted: Wed Apr 19, 2017 7:03 pm Post subject: [SOLVED](app-portage/update) - update -T fails |
 |
|
I thought I'd update the toolchain as whole as gcc 5.4 is now stable but update -T fails with | Quote: | Total: 27 packages (27 reinstalls), Size of downloads: 0 KiB
* 27 in total
[TC] sys-devel/gcc-5.4.0-r3 first built: Tue Apr 18 00:58:31 2017
* checking gcc-config 5.4.0
[TC] dev-libs/gmp-6.1.0
?
Invalid command suffix
!! update: ed failed -- /dev-libs/mpfr-3.1.3_p4/p .d w | ed -s /root/emerge/emergeList >> '/root/.update/tmp' |
Last edited by roki942 on Sun Jun 18, 2017 4:11 am; edited 2 times in total |
|
| Back to top |
|
 |
gerard27
Advocate
Joined: 04 Jan 2004
Posts: 2377
Location: Netherlands
|
| Posted: Wed Apr 19, 2017 7:39 pm Post subject: |
|
|
Are you confusing cfg-update or conf-update with emerge?
If you want to re-emerge the toolchain the correct command is:
Gerard.
_________________
To install Gentoo I use sysrescuecd.Based on Gentoo,has firefox to browse Gentoo docs and mc to browse (and edit) files.
The same disk can be used for 32 and 64 bit installs.
You can follow the Handbook verbatim.
http://www.sysresccd.org/Download |
|
| Back to top |
|
|
roki942
Apprentice
Joined: 18 Apr 2005
Posts: 285
Location: Seattle
|
| Posted: Wed Apr 19, 2017 8:11 pm Post subject: |
|
|
| gerard27 wrote: | Are you confusing cfg-update or conf-update with emerge?
If you want to re-emerge the toolchain the correct command is:
Gerard. |
Thank you for your replay.
The "update" I'm referring to is | Code: | app-portage/update
Latest version available: 9999
Latest version installed: 9999
Size of files: 0 KiB
Homepage: http://weaver.gentooexperimental.org/update.html
Description: A most excellent portage wrapper
License: CCPL-Attribution-ShareAlike-NonCommercial-3.0
|
I'll amend the title. |
|
| Back to top |
|
|
steveL
Watchman
Joined: 13 Sep 2006
Posts: 5153
Location: The Peanut Gallery
|
| Posted: Thu Apr 20, 2017 8:21 pm Post subject: |
|
|
Hey roki,
Urgh, sorry about this.
I've just been playing with it in new install, but don't have git yet, as I'm doing my toolchain (C++ upgrade, same as you) first.
I fixed that bug, but it's not quite ready to do the whole thing: I am about to work on it tonight.
Hmm let me reboot into the new install, and I'll just emerge git now.
I was thinking to rework it a bit more on a C++ upgrade, to do the ones in @system (linked to libstdc++) first.
Then we'd put >=sys-devel/gcc-5.2 in /etc/warning with a new key CXX or w/e to indicate this type of ABI upgrade.
That's going to take a bit longer.
Give me an hour or two to get git installed, and I'll push the semi-working version. (I'll tell you in here, when I've done it.)
Regards,
steveL |
|
| Back to top |
|
|
roki942
Apprentice
Joined: 18 Apr 2005
Posts: 285
Location: Seattle
|
| Posted: Thu Apr 20, 2017 8:58 pm Post subject: |
|
|
Thank you so much steveL!
Please don't rush on my account as my computers have noting to do with my income.
I've been using your pgm for some years now as it's so good at keeping my machines up to date.
So good in fact that I'm still a noob!  |
|
| Back to top |
|
|
steveL
Watchman
Joined: 13 Sep 2006
Posts: 5153
Location: The Peanut Gallery
|
| Posted: Fri Apr 21, 2017 1:05 am Post subject: |
|
|
Heh, thanks for your kind words, roki :-)
I'm afraid it's going to take a bit longer to review and commit all the changes.
My version is already 29 commits ahead of origin, so I can't just push a minor change; there's been a good deal of work on toolchain.
I'm going to take a break for food, and get this lot pushed by tomorrow; certainly in next 24 hours (if I crash out.)
Thanks for your patience,
steveL |
|
| Back to top |
|
|
Hu
Moderator
Joined: 06 Mar 2007
Posts: 21586
|
| Posted: Fri Apr 21, 2017 1:54 am Post subject: |
|
|
| If the minor change you need for this thread does not depend on your other work, you could temporarily branch from origin, write that minor change, push it, then switch back to the main branch that is far ahead of origin. |
|
| Back to top |
|
|
steveL
Watchman
Joined: 13 Sep 2006
Posts: 5153
Location: The Peanut Gallery
|
| Posted: Wed Jun 14, 2017 7:52 pm Post subject: |
|
|
Man, I am so sorry for the long delay in pushing a fix, roki. (Illness, real-life, time away to recover, no GUI.. blah-blah.)
I did what Hu said on Monday, just pushing the minor change, but the -T|--toolchain option is experimental, so I'm not sure how it will perform.
| Hu wrote: | | If the minor change you need for this thread does not depend on your other work, you could temporarily branch from origin, write that minor change, push it, then switch back to the main branch that is far ahead of origin. |
You're absolutely right, though I have a "!bugfix" in the bot in #friendly-coders (friendlyToaster), which involves: | Code: | # stage the fix, usually: git add -p update
git commit
# close the editor (files will change)
git stash
git rebase -i origin/master
# ^ move last commit to beginning
lol # git log one-line (see below)
# check log for (new) commit id, in the modified history
cid=XXX..
git push origin $cid:master
# shipped ^ so get back our WIP:
git stash pop |
This is a bit involved, but you need to rebase onto the new commit anyway, and this means you get it done upfront, then push the linear change. It took a while to work out how to push a specific commit (IRC is wonderfuel..;)
I'd be happy to see a simpler process though.
lol above is a bashrc alias from #git: | Code: | | alias lol='git log --oneline --graph --decorate --all' |
|
|
| Back to top |
|
|
Hu
Moderator
Joined: 06 Mar 2007
Posts: 21586
|
| Posted: Thu Jun 15, 2017 1:21 am Post subject: |
|
|
That is a reasonably acceptable workflow. I might do it a bit differently, but I cannot say that my way is necessarily better than what you showed. Two variations come to mind: | Code: | git commit -p -- [optional list of files]
# Use interactive mode to commit just the required changes
# Now stash everything else
git stash
# Move to a nameless branch based off origin
git checkout origin/master
# Cherry-pick the most recently departed commit, created as line 1
# above.
git cherry-pick @{-1}
git push origin HEAD:master
git checkout -
|
If you need to use rebase (and you might, if there are other commits you want to pull in as dependencies): | Code: | # Same git commit+stash as above
git commit -p -- [optional list of files]
git stash
git rebase -i origin/master
# Reorder commits as needed.
# Important: for the commit which (after reordering) will be the commit
# to push, change the rebase verb from `pick` to `edit`.
# Exit editor. Rebase will run.
# Rebase will drop you at the commit marked for edit (assuming no
# conflicts getting to that point).
# To be cautious, use git log to verify the new history:
git log --oneline origin/master..
# Looks good, now push it.
git push origin HEAD:master
git rebase --continue |
Both of these have the minor virtue that you never need to know or type the commit ID that will become the new public head.
I keep certain git aliases to simplify some of these operations: | $HOME/.gitconfig: | [alias]
ci = commit -v
cia = commit -v -a
co = checkout
cp = cherry-pick
dh = diff HEAD
rc = rebase --continue
ri = rebase --interactive
ru = remote update |
|
|
| Back to top |
|
|
steveL
Watchman
Joined: 13 Sep 2006
Posts: 5153
Location: The Peanut Gallery
|
| Posted: Thu Jun 15, 2017 7:07 pm Post subject: |
|
|
Interesting; especially changing the commit we want to push up til, to 'edit' so that the rebase stops there, and we can just push HEAD.
I'll try that instead of the 'lol' bit above, next time I need to do a bugfix (the whole point of which is to push a recent commit earlier, while keeping linear history to work-in-progress.) |
|
| Back to top |
|
|
roki942
Apprentice
Joined: 18 Apr 2005
Posts: 285
Location: Seattle
|
| Posted: Sun Jun 18, 2017 12:02 am Post subject: |
|
|
Thank you steveL, I tried update -T today and it worked great!  |
|
| Back to top |
|
|
steveL
Watchman
Joined: 13 Sep 2006
Posts: 5153
Location: The Peanut Gallery
|
| Posted: Tue Jun 20, 2017 1:59 pm Post subject: |
|
|
| Excellent, roki; thanks for letting me know :-) |
|
| Back to top |
|
|
|
Unsupported Software
