Jump to content

Photo

How to change branch of kits from meta-repo

- - - - -

Best Answer Sandro , 27 July 2017 - 06:33 PM

At first

# install -d /var/git
# cd /var/git
# git clone https://github.com/funtoo/meta-repo.git
# cd meta-repo
# git submodule init
# git submodule update
# rm /usr/share/portage/config/repos.conf
# mv /etc/portage/repos.conf /etc/portage/repos.conf.bak
# ln -s /var/git/meta-repo/repos.conf /etc/portage/repos.conf
# chown -R portage:portage /var/git/meta-repo

 

Then I use to update this this "little" script in root dir.

ci74771ht ~ # cat Aggiorna  
eix-sync
cd /var/git/meta-repo
git pull
git submodule update
chown -R portage:portage /var/git/meta-repo
layman -S
cd -
emerge -DNu world --with-bdeps=y

Then

ci74771ht ~ # cd /var/git/meta-repo/kits/xorg-kit/ 
ci74771ht xorg-kit # git branch -a 
* (HEAD detached at 52fa72a) 
 1.17-prime
 master
 remotes/origin/1.17-prime 
 remotes/origin/HEAD -> origin/1.17-prime 
 remotes/origin/master 
ci74771ht xorg-kit # git checkout master 
La precedente posizione di HEAD era 52fa72a... updates
Si è passati al branch 'master'
Your branch is up-to-date with 'origin/master'.
ci74771ht xorg-kit # git branch -a       
 1.17-prime
* master 
 remotes/origin/1.17-prime 
 remotes/origin/HEAD -> origin/1.17-prime 
 remotes/origin/master
Go to the full post »


5 replies to this topic

#1
cafaia

cafaia

    Advanced Member

  • Members
  • PipPipPip
  • 38 posts

Hello everyone!

 

I would like to change the branch of "xorg-kit" from 1.17-prime to master permanently, because I did it but it did not work:

 

# cd /var/git/meta-repo/kits/xorg-kit
# git branch
* (HEAD detached at 52fa72a)
  1.17-prime
# git checkout 1.17-prime
Switched to branch '1.17-prime'
Your branch is up-to-date with 'origin/1.17-prime'.
# git branch 
* 1.17-prime
# git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
# git branch
  1.17-prime
* master
 
I wait for help.
Thanks to all!


#2
Oleg Vinichenko

Oleg Vinichenko

    Staff

  • Moderators
  • 412 posts

this output shows that you changed from 1.17-prime to master.

what you doing next that making xorg-kit dropping back to 1.17-prime?


www.funtoo.org

#3
cafaia

cafaia

    Advanced Member

  • Members
  • PipPipPip
  • 38 posts

Hello, Oleg!

 

With those commands I change from 1.17-prime to master, but after I do "ego sync" and "xorg-kit" returns to 1.17-prime. What should I do to change permanently?



#4
Sandro

Sandro

    Advanced Member

  • Members
  • PipPipPip
  • 369 posts
  • LocationSaronno, Via IV Novembre, 23 21047 Italy
✓  Best Answer

At first

# install -d /var/git
# cd /var/git
# git clone https://github.com/funtoo/meta-repo.git
# cd meta-repo
# git submodule init
# git submodule update
# rm /usr/share/portage/config/repos.conf
# mv /etc/portage/repos.conf /etc/portage/repos.conf.bak
# ln -s /var/git/meta-repo/repos.conf /etc/portage/repos.conf
# chown -R portage:portage /var/git/meta-repo

 

Then I use to update this this "little" script in root dir.

ci74771ht ~ # cat Aggiorna  
eix-sync
cd /var/git/meta-repo
git pull
git submodule update
chown -R portage:portage /var/git/meta-repo
layman -S
cd -
emerge -DNu world --with-bdeps=y

Then

ci74771ht ~ # cd /var/git/meta-repo/kits/xorg-kit/ 
ci74771ht xorg-kit # git branch -a 
* (HEAD detached at 52fa72a) 
 1.17-prime
 master
 remotes/origin/1.17-prime 
 remotes/origin/HEAD -> origin/1.17-prime 
 remotes/origin/master 
ci74771ht xorg-kit # git checkout master 
La precedente posizione di HEAD era 52fa72a... updates
Si è passati al branch 'master'
Your branch is up-to-date with 'origin/master'.
ci74771ht xorg-kit # git branch -a       
 1.17-prime
* master 
 remotes/origin/1.17-prime 
 remotes/origin/HEAD -> origin/1.17-prime 
 remotes/origin/master


#5
Oleg Vinichenko

Oleg Vinichenko

    Staff

  • Moderators
  • 412 posts

Hello, Oleg!

 

With those commands I change from 1.17-prime to master, but after I do "ego sync" and "xorg-kit" returns to 1.17-prime. What should I do to change permanently?

ego sync does not support this, if you changed branch manually, use git pull and git submodule update inside xorg-kit directory.


  • rsa4046 likes this
www.funtoo.org

#6
cafaia

cafaia

    Advanced Member

  • Members
  • PipPipPip
  • 38 posts

Hello, Oleg!

 

Thank you very much for the information!

I created a script with this:

 

#!/bin/sh
 
cd /var/git/meta-repo/
git pull
git submodule update
cd /var/git/meta-repo/kits/xorg-kit/
git checkout master
git pull
cd /root/
chown -R portage:portage /var/git/meta-repo
 
And now everything is going well!
Thanks so much for the help!

  • rsa4046 likes this



Reply to this topic



  


0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users