docker
/
ci-image-git-buildpackage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

standardize whitespace in scripts

This commit is contained in:
Hans-Christoph Steiner 2019-07-03 15:46:22 +02:00
parent f13b5521f9
commit fcfd93f7cd
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay/usr/bin/gitlab-ci-aptly
View File

@ -34,7 +34,7 @@ $aptly publish repo --skip-signing --distribution autobuilt --architectures all,
rm -rf public rm -rf public
cp -a ~/.aptly/public public cp -a ~/.aptly/public public
# ease debugging since directory indices are disabled # ease debugging since directory indices are disabled
cd public cd public
printf "<html><head><title>apt source for %s</title></head><body><h1>" $CI_PROJECT_PATH > index.html printf "<html><head><title>apt source for %s</title></head><body><h1>" $CI_PROJECT_PATH > index.html
date >> index.html date >> index.html

42
overlay/usr/bin/gitlab-ci-git-buildpackage
View File

@ -28,29 +28,29 @@ dpkg-checkbuilddeps
debversion=$(dpkg-parsechangelog -S Version) debversion=$(dpkg-parsechangelog -S Version)
buildpackage_options= buildpackage_options=
if [[ $debversion = *-* ]]; then if [[ $debversion = *-* ]]; then
echo "ensure pristine-tar branch exists and is current" echo "ensure pristine-tar branch exists and is current"
git clean -fdx git clean -fdx
git reset --hard git reset --hard
git fetch --all git fetch --all
if git checkout -B pristine-tar origin/pristine-tar; then if git checkout -B pristine-tar origin/pristine-tar; then
tar_version=`dpkg -s tar | grep '^Version:'` tar_version=`dpkg -s tar | grep '^Version:'`
if [[ $tar_version == "Version: 1.30"* ]]; then if [[ $tar_version == "Version: 1.30"* ]]; then
echo "WARNING: tar v1.30 breaks pristine-tar when working with commits created by older versions of tar https://bugs.debian.org/901952, downgrading to tar 1.29b-1.1" echo "WARNING: tar v1.30 breaks pristine-tar when working with commits created by older versions of tar https://bugs.debian.org/901952, downgrading to tar 1.29b-1.1"
printf 'Package: tar\nPin: version 1.30+dfsg-2\nPin-Priority: -1\n' \ printf 'Package: tar\nPin: version 1.30+dfsg-2\nPin-Priority: -1\n' \
> /etc/apt/preferences.d/ban-broken-tar.pref > /etc/apt/preferences.d/ban-broken-tar.pref
$apt_get install --no-install-recommends wget $apt_get install --no-install-recommends wget
wget -q http://deb.debian.org/debian/pool/main/t/tar/tar_1.29b-1.1_amd64.deb wget -q http://deb.debian.org/debian/pool/main/t/tar/tar_1.29b-1.1_amd64.deb
dpkg -i tar_1.29b-1.1_amd64.deb dpkg -i tar_1.29b-1.1_amd64.deb
rm -f tar_1.29b-1.1_amd64.deb rm -f tar_1.29b-1.1_amd64.deb
fi
buildpackage_options=--git-pristine-tar
else
echo "no pristine-tar branch, trying uscan";
apt_get_auto_install gnupg2 libwww-perl;
uscan --verbose --download-current-version --force-download --rename;
fi fi
buildpackage_options=--git-pristine-tar
else
echo "no pristine-tar branch, trying uscan";
apt_get_auto_install gnupg2 libwww-perl;
uscan --verbose --download-current-version --force-download --rename;
fi
else else
echo "building native package version $debversion" echo "building native package version $debversion"
fi fi
echo "make $CI_COMMIT_REF_NAME branch current for gbp" echo "make $CI_COMMIT_REF_NAME branch current for gbp"
git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"