fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 14:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/makerepo.sh: record last dirty files to create .gitignore file on next build

Browse source
This commit is contained in:
Thomas Haller 2015-08-07 13:43:30 +02:00 • committed by Lubomir Rintel
parent c13bfa00e7
commit 0752bd18bd
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,10 +200,13 @@ detect_build_type 'libibverbs-[0-9]*' libibverbs.spec
CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)" CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
if [[ "x$CURRENT_BRANCH" != x && -f "./.git/makerepo.gitignore-$CURRENT_BRANCH" ]]; then if [[ "x$CURRENT_BRANCH" != x && -f "./.git/makerepo.gitignore-$CURRENT_BRANCH" ]]; then
/bin/cp "./.git/makerepo.gitignore-$CURRENT_BRANCH" ./makerepo.gitignore MAKEREPO_GIT_IGNORE_MY="makerepo.gitignore-$CURRENT_BRANCH"
elif [[ -f ./.git/makerepo.gitignore ]]; then elif [[ -f ./.git/makerepo.gitignore ]]; then
/bin/cp "./.git/makerepo.gitignore" ./makerepo.gitignore MAKEREPO_GIT_IGNORE_MY=makerepo.gitignore
else
MAKEREPO_GIT_IGNORE_MY=""
fi fi
MAKEREPO_GIT_IGNORE_LAST="makerepo.gitignore.last-$CURRENT_BRANCH"
get_local_mirror() { get_local_mirror() {
local URL="$1" local URL="$1"
@ -375,7 +378,12 @@ EOF
[[ x == "x$(git diff HEAD "$ORIG_HEAD")" ]] || die "error recreating initial tarball" [[ x == "x$(git diff HEAD "$ORIG_HEAD")" ]] || die "error recreating initial tarball"
fi fi
( (
cat ../makerepo.gitignore 2>/dev/null; if [[ -n "$MAKEREPO_GIT_IGNORE_MY" ]]; then
cat "../.git/$MAKEREPO_GIT_IGNORE_MY"
fi
if [[ -f "../.git/$MAKEREPO_GIT_IGNORE_LAST" ]]; then
cat "../.git/$MAKEREPO_GIT_IGNORE_LAST"
fi
sed -n 's/^%patch\([0-9]\+\) \+.*-b \+\([^ ]\+\).*$/*\2/p' ../"$SPEC"; sed -n 's/^%patch\([0-9]\+\) \+.*-b \+\([^ ]\+\).*$/*\2/p' ../"$SPEC";
echo '*.[0-9][0-9][0-9][0-9][-.]*.orig' echo '*.[0-9][0-9][0-9][0-9][-.]*.orig'
) | LANG=C sort | LANG=C uniq > .gitignore ) | LANG=C sort | LANG=C uniq > .gitignore
@ -482,6 +490,9 @@ if [[ $LOCAL != 0 ]]; then
mv ./.makerepo.git/ "$DIRNAME/.git" mv ./.makerepo.git/ "$DIRNAME/.git"
pushd "$DIRNAME" pushd "$DIRNAME"
git checkout -- .gitignore git checkout -- .gitignore
# write git-ignore file...
git status --porcelain | sed 's/^...//' >> "../.git/$MAKEREPO_GIT_IGNORE_LAST"
popd popd
fi fi