fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-06 09:20:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/makerepo: accepts the RELEASE_BASE_COMMIT as environment variable (only detect as fallback)

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-04-23 10:47:30 +02:00
parent 2fbca34dbf
commit fd5365c4a9
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
contrib/fedora/utils/makerepo.sh
View file

@ -144,22 +144,32 @@ pushd "$DIRNAME"
git add -f -A .
git commit -m '*** add all'
ORIG_HEAD="`git rev-parse HEAD`"
if [[ "$BUILD_NETWORMANAGER" != "" ]]; then
# try to find the commit from which the original tarball originates
# and base the new branch on to of it.
RELEASE_BASE_COMMIT="$(sed -n 's/^NM_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)"
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
RELEASE_BASE_COMMIT="$(git rev-list -n1 "$RELEASE_BASE_COMMIT" 2>/dev/null)"
if [[ "x$RELEASE_BASE_COMMIT" == x ]]; then
# if RELEASE_BASE_COMMIT is not set, try detecting the BASE_COMMIT...
if [[ "$BUILD_NETWORMANAGER" != "" ]]; then
# try to find the commit from which the original tarball originates
# and base the new branch on to of it.
RELEASE_BASE_COMMIT="$(sed -n 's/^NM_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)"
fi
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
git checkout -B master "$RELEASE_BASE_COMMIT" || die "could not checkout master"
git rm --cached -r :/
git checkout "$ORIG_HEAD" -- :/
git clean -fdx :/
git commit -m '*** add all'
[[ x == "x$(git diff HEAD "$ORIG_HEAD")" ]] || die "error recreating initial tarball"
fi
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
if [[ "$RELEASE_BASE_COMMIT" == "-" ]]; then
# you can disable detection of the RELEASE_BASE_COMMIT by setting it to '-'
RELEASE_BASE_COMMIT=
else
# verify the base commit...
RELEASE_BASE_COMMIT="$(git rev-parse --verify -q "$RELEASE_BASE_COMMIT" 2>/dev/null)" || die "error detecting RELEASE_BASE_COMMIT=$RELEASE_BASE_COMMIT"
fi
fi
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
git checkout -B master "$RELEASE_BASE_COMMIT" || die "could not checkout master"
git rm --cached -r :/
git checkout "$ORIG_HEAD" -- :/
git clean -fdx :/
git commit -m '*** add all'
[[ x == "x$(git diff HEAD "$ORIG_HEAD")" ]] || die "error recreating initial tarball"
fi
cat ../makerepo.gitignore > .gitignore
git rm --cached -r .
git add --all .