I would like to re-establish a private branch that I had under CVS (private-myoung-dom0-branch) which I used to build pvops enabled kernels so that the more adventurous could use a Fedora based Domain-0 kernel with xen.
Are there any policies I should follow? I asked this on the devel list and Roland McGrath suggested naming convention of user/<username>/whatever-you-want for rawhide forks and fN/user/... for release branch forks.
If I follow this pattern I would choose the name f12/user/myoung/xendom0 (I am following f12 at the moment because currently most of the xen development is on based on the 2.6.32 kernel).
Are there any other opinions before I create this branch?
Michael Young
On Thu, Aug 05, 2010 at 05:59:52PM +0100, M A Young wrote:
Are there any policies I should follow? I asked this on the devel list and Roland McGrath suggested naming convention of user/<username>/whatever-you-want for rawhide forks and fN/user/... for release branch forks.
If I follow this pattern I would choose the name f12/user/myoung/xendom0 (I am following f12 at the moment because currently most of the xen development is on based on the 2.6.32 kernel).
Are there any other opinions before I create this branch?
Sounds good to me. Keeping everything in a per-release/per-user namespace avoids any nasty clashes later.
Go for it.
--Kyle
You only really need to use a branch in the canonical repository if you are going to do non-scratch koji builds. Otherwise you could just make your own forked repository, which git supports nicely. (You can put it on your fedorapeople site, for example.) OTOH, sharing it centrally is a fine way to make it easy for people to find your branches.
The convention you mentioned is one I suggested, so obviously I think it's fine. IMHO it would be better if Fedora were to establish a standard convention for branch names in package repos, whatever the exact naming chosen might be. But who knows how long til that gets decided.
If Dave and/or Kyle think {fN/,}user/<yourname>/* is a good idea too, then go for it.
Thanks, Roland
On Thu, 5 Aug 2010, Roland McGrath wrote:
You only really need to use a branch in the canonical repository if you are going to do non-scratch koji builds. Otherwise you could just make your own forked repository, which git supports nicely. (You can put it on your fedorapeople site, for example.) OTOH, sharing it centrally is a fine way to make it easy for people to find your branches.
I think I might try a separate repo on fedorapeople, and see if I can get it to work (there are limitations such as filespace that might cause problems). I do intend to follow the suggested naming convention though in case it makes sense to switch back to the canonical repository for some reason.
Michael Young
I think I might try a separate repo on fedorapeople, and see if I can get it to work (there are limitations such as filespace that might cause problems). I do intend to follow the suggested naming convention though in case it makes sense to switch back to the canonical repository for some reason.
You can certainly make a "thin" repository that only works if you have .git/info/alternates pointing at a clone of the pkgs.fedoraproject.org kernel repo. I think it might even work to put the URL git://pkgs.fedoraproject.org/kernel in the alternates file, but I'm not at all sure about that.
Thanks, Roland
On Thu, 5 Aug 2010, Roland McGrath wrote:
If Dave and/or Kyle think {fN/,}user/<yourname>/* is a good idea too, then go for it.
Unless I am doing something wrong you can't have both an f12 branch and an f12/user/myoung/xendom0 branch. The problem I am seeing is that there is a file .git/refs/heads/f12 for the f12 branch but for f12/user/myoung/xendom0 it wants to create the path .git/refs/heads/f12/user/myoung/ to contain the xendom0 file so f12 has to be both a file and a directory.
Michael Young
Unless I am doing something wrong you can't have both an f12 branch and an f12/user/myoung/xendom0 branch. The problem I am seeing is that there is a file .git/refs/heads/f12 for the f12 branch but for f12/user/myoung/xendom0 it wants to create the path .git/refs/heads/f12/user/myoung/ to contain the xendom0 file so f12 has to be both a file and a directory.
That's why it's called f12/master.
On Thu, 5 Aug 2010, Roland McGrath wrote:
Unless I am doing something wrong you can't have both an f12 branch and an f12/user/myoung/xendom0 branch. The problem I am seeing is that there is a file .git/refs/heads/f12 for the f12 branch but for f12/user/myoung/xendom0 it wants to create the path .git/refs/heads/f12/user/myoung/ to contain the xendom0 file so f12 has to be both a file and a directory.
That's why it's called f12/master.
But unfortunately that isn't what fedpkg calls the branch it creates locally, which means that your naming scheme could cause problems to fedpkg users.
Michael Young
But unfortunately that isn't what fedpkg calls the branch it creates locally, which means that your naming scheme could cause problems to fedpkg users.
$ fedpkg clone -b f12 kernel $ cd kernel $ git branch * f12/master $ rpm -qf /usr/bin/fedpkg fedora-packager-0.5.1.0-1.fc13.noarch
On Thu, 5 Aug 2010 16:16:23 -0700 (PDT) Roland McGrath roland@redhat.com wrote:
But unfortunately that isn't what fedpkg calls the branch it creates locally, which means that your naming scheme could cause problems to fedpkg users.
$ fedpkg clone -b f12 kernel $ cd kernel $ git branch
- f12/master
$ rpm -qf /usr/bin/fedpkg fedora-packager-0.5.1.0-1.fc13.noarch
$ f12 $ git branch * f12 f13 f14 master
$ f12 $ rpm -qf /usr/bin/fedpkg fedora-packager-0.5.0.1-3.fc12.noarch
On Fri, 6 Aug 2010, Chuck Ebbert wrote:
On Thu, 5 Aug 2010 16:16:23 -0700 (PDT) Roland McGrath roland@redhat.com wrote:
But unfortunately that isn't what fedpkg calls the branch it creates locally, which means that your naming scheme could cause problems to fedpkg users.
$ fedpkg clone -b f12 kernel $ cd kernel $ git branch
- f12/master
$ rpm -qf /usr/bin/fedpkg fedora-packager-0.5.1.0-1.fc13.noarch
$ f12 $ git branch
- f12
f13 f14 master
$ f12 $ rpm -qf /usr/bin/fedpkg fedora-packager-0.5.0.1-3.fc12.noarch
and fedpkg clone kernel cd kernel fedpkg switch-branch f12 git branch * f12 master rpm -q fedora-packager fedora-packager-0.5.1.0-1.fc13.noarch
Michael Young
Well, fedpkg has been a moving target and will stay one for a while. I don't really see a reason to use fedpkg as a git front-end. It is less confusing just to use the git commands.
On Thu, 5 Aug 2010, Roland McGrath wrote:
You only really need to use a branch in the canonical repository if you are going to do non-scratch koji builds. Otherwise you could just make your own forked repository, which git supports nicely. (You can put it on your fedorapeople site, for example.) OTOH, sharing it centrally is a fine way to make it easy for people to find your branches.
Okay, I now have a fedorapeople git repository. How do I get koji to do a scratch build from it?
Michael Young
Okay, I now have a fedorapeople git repository. How do I get koji to do a scratch build from it?
You don't, AFAIK. You do a scratch build by uploading an srpm, as before. If you want to do koji builds directly from git, I think that is the reason you'd need to put branches in the Fedora repository.
On Fri, 6 Aug 2010, Roland McGrath wrote:
Okay, I now have a fedorapeople git repository. How do I get koji to do a scratch build from it?
You don't, AFAIK. You do a scratch build by uploading an srpm, as before. If you want to do koji builds directly from git, I think that is the reason you'd need to put branches in the Fedora repository.
In which case I will create a branch in the Fedora repository.
Michael Young
kernel@lists.fedoraproject.org
-
Chuck Ebbert -
Kyle McMartin -
M A Young -
Roland McGrath