[solved] eix-sync / git pull - conflicts

emc · Last edited by emc on Sun Oct 04, 2015 10:49 am; edited 1 time in total

I have problem with sync, I did:

emc · Posted: Sat Oct 03, 2015 8:14 pm Post subject:

ct85711 · Veteran Joined: 27 Sep 2005 Posts: 1791

Just wondering, but did you try to transition from rsync to git syncing? The key part of how git works is that it monitors all files it knows of; so trying to transition an existing tree from rsync to git fails, because git doesn't know of any of the existing tree before hand. Now, there is 3 ways (that I can think of) to fix this

The easiest way (not necessarily the best, but easiest and works every time) is remove the entire tree and resync. This allows git to remake the tree, and with nothing already there it won't have any conflicts (I'd recommend only removing the contents of /usr/portage and it's subdirectories while keeping the base portage directory still there.

The otherway, is from the /usr/portage as root run

emc · Posted: Sun Oct 04, 2015 9:40 am Post subject:

emc · Posted: Sun Oct 04, 2015 10:49 am Post subject:

papu · Posted: Wed Nov 18, 2015 2:27 pm Post subject:

i had a git pull error and sync problems, doing git reset --hard fix all this

:wink:

_________________
"~amd64" --cpu 7700 non-x --DDR5 2x16GB 6000MHz --gpu RX 470

steveL · Posted: Wed Nov 18, 2015 4:56 pm Post subject:

emc · Posted: Wed Nov 18, 2015 5:29 pm Post subject:

steveL · Posted: Wed Nov 18, 2015 6:09 pm Post subject:

lul; okay, you win ;) but it's worth pointing out for anyone else when you suggest that command.

People have a habit of copy-pasting, especially if it's in a code-block, ime.

gerard27 · Posted: Wed Nov 18, 2015 7:59 pm Post subject:

Funny place for distdir /var/portage/distdir.
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

alinefr · Posted: Wed Nov 18, 2015 8:23 pm Post subject:

Is there any advantage of using github mirror over gentoo.org server for portage git sync? Avoiding overload in gentoo.org servers?

I could not find any docs regarding git for portage, except https://wiki.gentoo.org/wiki/Project:Portage/Sync

At the moment my portage/repos.conf/gentoo.conf looks like this:

khayyam · Posted: Wed Nov 18, 2015 9:24 pm Post subject:

Roman_Gruber · Posted: Wed Dec 16, 2015 4:40 am Post subject:

Hi, I do not know where to ask so:

How can I tell how old my portage tree is now? In the old days with rsync there was a line wiht timestamp of tree ....

I was forced to change to git as i realized that my portage won't update anymore. Some weird error.
So I removed the portage tree by hand, and changed hte file below. It seems my box works now

ct85711 · Veteran Joined: 27 Sep 2005 Posts: 1791

I've noticed the same on the dependency resolution using git. Though, the time doesn't change much even if I had the metadata/cache regenerated (besides that command taking several minutes to complete).

charles17 · Advocate Joined: 02 Mar 2008 Posts: 3664

Roman_Gruber · Posted: Wed Dec 16, 2015 3:19 pm Post subject:

I just wanted to say that rsync was broken. (basically removed /usr/portage; the distfiles are on a second disc; tried emerge-webrsync, but ended up in editing that resolv.conf to somethign which the wiki suggested at that point of that day)

The git stuff which i posted seems to work now. (just the lines are mixed up in a different order and as you pointed out now, the git link seems a bit different)

So is "https://github.com/gentoo-mirror/gentoo.git" this the new suggestion?

I did not read for quite a while the forums so I have no glue what the latest suggestion for git is. Thanks

we should tell the portage package coder, that he may add a timestamp thing to that git thing too, something human readable, so we can see, okay the tree was synced on this date according to ntp, or is up to date as of the git timestamp or something like that ... just something human readable.

--

thanks for your input

Roman_Gruber · Posted: Wed Dec 16, 2015 3:35 pm Post subject:

Thanks for the input, but sadly no timestamp. I changed it accordingly.

charles17 · Advocate Joined: 02 Mar 2008 Posts: 3664

Roman_Gruber · Posted: Wed Dec 16, 2015 3:47 pm Post subject:

ct85711 · Veteran Joined: 27 Sep 2005 Posts: 1791

Roman_Gruber · Posted: Wed Dec 16, 2015 4:38 pm Post subject:

Hi, may I just ask.

This egencache only speeds up dependency resolution right? So when i want to emerge something i have to wait less for the final output when i use the -av flag (ask and verbose flags)?

ct85711 · Veteran Joined: 27 Sep 2005 Posts: 1791

Honestly, I am no expert on how portage works, and even worse on git (I still consider myself a noob on git).

From my understanding, when we used the old rysnc, it downloaded a copy of the cache (among others, like news, dtd, glsa, etc) for us, so we never needed to worry about it. However, the devs decided on git, to not include the cache and stuff when we sync (hence why it's in the ignore file). To make up for it, the egencache rebuilds the cache that would have been downloaded when we used rysnc (it's not an new tool, we've had it for a long time, just ignored as it wasn't necessary most times). As far as if it actually will speed up the dependency resolution, I can't say for sure. What I do know, for me I got tired of wasting nearly 10-20 minutes waiting for it to finish (often looks like it froze most times), just to wait for dependency resolution to finish (maybe a little faster). You are welcome to run some time tests, and see if it actually helps or not. Otherwise I'd love to see a dev or someone more knowledgeable to clearify some of this.

Roman_Gruber · Posted: Wed Dec 16, 2015 10:55 pm Post subject:

yes exactly we need some input, to fix those "cosmetical" issues.

I have my stuff on a cheapy ssd but still it takes ages.

steveL · Posted: Wed Dec 16, 2015 11:53 pm Post subject:

ct85711 · Veteran Joined: 27 Sep 2005 Posts: 1791

I was going by what the wiki that I linked to earlier said about the cache, on where rsync transferred the cache, though it did mention cvs and git does not do that. Of course the wiki may very well be wrong, and needs to be updated.