This change updates grub to the 2.04 release. The new release changed how
grub is built, so the bootstrap and bootstrap.conf files have to be added
to the dist-git. Also, the gitignore file changed so it has to be updated.
Since the patches have been forward ported to 2.04, there's no need for a
logic to maintain a patch with the delta between the release and the grub
master branch. So the release-to-master.patch is dropped and no longer is
updated by the do-rebase script.
Also since gnulib isn't part of the grub repository anymore and cloned by
the boostrap tool, a gnulib tarball is included as other source file and
copied before calling the bootstrap tool. That way grub can be built even
in builders that only have access to the sources lookaside cache.
Resolves: rhbz#1727279
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
The patches generated by do-rebase depend on the user having core.abbrv=11
in their .gitconfig and also a diff.orderFile set.
These assumptions were removed for the git format-patch command by passing
all the configuration as options, but it was still present for git diff.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This adds --no-signature to do-rebase's diff format-patch invocation, so the
only things that change are the actual patch contents.
Signed-off-by: Peter Jones <pjones@redhat.com>
Currently the script always pull the patches from rhboot Github repo, but
for testing and developing purposes may be useful to use a different one.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
The script has set -u so calling do-rebase --help fails with the following:
$ ./do-rebase --help
./do-rebase: line 16: $1: unbound variable
Avoid this by setting a default value when doing the parameter expansion
for the positional parameter $1 passed to the usage() function.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
The do-rebase script generate patches with git-format-patch, but the pkg
expects some non-default git configurations for the diffs and stats.
So instead requiring developers to setup these config options, pass them
to git-format-patch in do-rebase to generate the proper patches.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
