rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 07:44:52 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

do-rebase: move the upstream source

Browse source
This commit is contained in:
Peter Jones 2017-06-16 15:21:18 -04:00
parent 39d46ea780
commit 4aae85d216
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@ clog
kojilogs kojilogs
/grub-*/ /grub-*/
.build*.log .build*.log
.*.git/

47
do-rebase
View file

@ -1,9 +1,13 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -u
shopt -qu globstar shopt -qu globstar
shopt -qs expand_aliases
export LC_COLLATE=C export LC_COLLATE=C
export LC_ALL=C export LC_ALL=C
alias othergit="GIT_DIR=$PWD/.rhboot.git GIT_WORK_TREE=$PWD git"
usage() usage()
{ {
retcode=0 retcode=0
@ -24,6 +28,7 @@ releasever=""
amend="" amend=""
declare -a savedargs declare -a savedargs
savedargs=()
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case $1 in case $1 in
--help|-h|--usage|-?|-u) --help|-h|--usage|-?|-u)
@ -65,6 +70,10 @@ else
releasever=$(echo $dist | \ releasever=$(echo $dist | \
sed 's/^\.\([[:alpha:]]\+\)\([[:digit:]]\+\)$/\1-\2/') sed 's/^\.\([[:alpha:]]\+\)\([[:digit:]]\+\)$/\1-\2/')
;; ;;
rhel*)
releasever=${dist}
dist=.el${releasever##rhel-}
;;
esac esac
if [ -z "${releasever}" -o "${releasever}" = "${dist}" ]; then if [ -z "${releasever}" -o "${releasever}" = "${dist}" ]; then
echo "Could not figure out distro release version" 1>&2 echo "Could not figure out distro release version" 1>&2
@ -82,40 +91,42 @@ if [ $# -ge 1 ]; then
usage 1 usage 1
fi fi
if ! git remote show -n github >/dev/null 2>&1 ; then if [ ! -d $PWD/.rhboot.git ]; then
git remote add \ othergit init
github git@github.com:vathpela/grub2-fedora.git >/dev/null 2>&1 if ! othergit remote add \
echo "Could not add remote: github" 1>&2 rhboot git@github.com:rhboot/grub2.git \
>/dev/null 2>&1 ; then
echo "Could not add remote: rhboot" 1>&2
exit 1 exit 1
fi
elif othergit remote show -n rhboot | grep -q "URL: github$" ; then
if ! othergit remote add \
rhboot git@github.com:rhboot/grub2.git \
>/dev/null 2>&1 ; then
echo "Could not add remote: rhboot" 1>&2
exit 1
fi
fi fi
git fetch github othergit fetch rhboot
remote=$(git branch --list -r "github/${releasever}" 2>/dev/null) remote=$(othergit branch --list -r "rhboot/${releasever}" 2>/dev/null)
if [ "${remote}" != " github/${releasever}" ]; then if [ "${remote}" != " rhboot/${releasever}" ]; then
echo branch \"${releasever}\" does not appear to exist 1>&2 echo branch \"${releasever}\" does not appear to exist 1>&2
exit 1 exit 1
fi fi
unset LC_ALL unset LC_ALL
git rm -q 0*.patch git rm -q 0*.patch
(cat <<EOF
From: Peter Jones <pjones@redhat.com>
Date: Wed Jul 22 10:18:00 2015 -0400
Subject: Stop trying to "git format-patch" across a merge that confuses it
EOF > grub.patches
git diff --full-index --binary refs/tags/grub-2.02-beta3..refs/remotes/github/master patches=$(othergit format-patch refs/remotes/rhboot/master..refs/remotes/rhboot/${releasever})
) > grub-2.02-beta3-to-origin-master.patch
patches=$(git format-patch refs/remotes/github/master..refs/remotes/github/${releasever})
echo Patch0000: grub-2.02-beta3-to-origin-master.patch > grub.patches
for x in $patches ; do for x in $patches ; do
echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches
done done
if [ -z "$amend" ]; then if [ -z "$amend" ]; then
rpmdev-bumpspec -c "- Rebased to newer upstream for ${releasever}" grub2.spec rpmdev-bumpspec -c "- Rebased to newer upstream for ${releasever}" grub2.spec
fi fi
git add 0*.patch grub2.spec grub-2.02-beta3-to-origin-master.patch grub.patches git add 0*.patch grub2.spec grub.patches
if [ -z "$amend" ]; then if [ -z "$amend" ]; then
fedpkg commit -s -c $amend fedpkg commit -s -c $amend
else else