On Tue, Dec 01, 2020 at 10:27:58AM -0500, Bastien Nocera wrote: > > - git checkout linus/master > > - git merge -m "Merge branch 'os-build'" os-build > > - # Fedora carries a patch to alter this setting, so we need to change the > > configuration to build a vanilla tree. > > - # If you're targeting RHEL and have brew/rhpkg installed, use "make > > DIST=.elrdy dist-srpm" instead > > + git checkout upstream/os-build > > Should that be: > git fetch upstream > git rebase upstream/os-build > > So that the fork's os-build branch is updated and rebased from the upstream repo's > os-build branch? Otherwise you end up being on a detached branch. I failed to address the rest of your comments. I will update the docs to deal with this but you won't need to rebase, you can fast-forward merge. I will also set up the 'master' branch to address your other concern. Sorry about that. This time I am running through a clean clone to verify the steps. > > > make dist-srpm > > > > You can now build the SRPM however you like: > > @@ -70,6 +63,7 @@ You can now build the SRPM however you like: > > mock redhat/rpm/SRPMS/kernel*src.rpm > > # Build the SRPM in Fedora's Koji > > koji build --scratch rawhide redhat/rpm/SRPMS/kernel*src.rpm > > + koji build --scratch eln redhat/rpm/SRPMS/kernel*src.rpm > > > > Want to add a patch? Just git-cherry-pick it or apply it with git-am and > > re-run ``make dist-srpm``. Change configurations in ``redhat/configs/`` > > diff --git a/redhat/docs/repository-layout.rst > > b/redhat/docs/repository-layout.rst > > index 5f6dcb08a1bd..851a2c5d715b 100644 > > --- a/redhat/docs/repository-layout.rst > > +++ b/redhat/docs/repository-layout.rst > > @@ -63,13 +63,6 @@ along with the configuration and build scripts. They can > > be checked out > > and built into RPMs. The ``master`` branch points to the latest version > > of these branches. > > > > -rhpatches > > -~~~~~~~~~ > > - > > -This branch is no longer used. Previously, it held the Red Hat patches > > -for the kernel as a quilt series and remains for historical reasons. > > -Patch history up to v5.4 is available in this branch. > > - > > Tags > > ---- > > > > diff --git a/redhat/docs/submitting-contributions.rst > > b/redhat/docs/submitting-contributions.rst > > index 07b25852ec66..65895a9ce49b 100644 > > --- a/redhat/docs/submitting-contributions.rst > > +++ b/redhat/docs/submitting-contributions.rst > > @@ -39,8 +39,8 @@ Patches > > Quick start: > > > > 1. ``git fetch upstream`` > > -2. ``git checkout upstream/os-build && git checkout -b my-build-change`` > > -3. Make a change to a file or files in ``redhat/``. > > +2. ``git checkout -b my-build-change upstream/os-build`` > > Same problem here with the branch name. This should be right. Basically all the work is done against upstream/os-build (which acts like a typical 'master' branch). So you should be able to git fetch upstream git checkout -b foo upstream/os-build #to base the branch on os-build <hack hack> git add <files> git commit -s ... I might be misunderstanding your comment? Cheers, Don _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
