diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-03-04 12:19:34 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-03-04 12:19:34 +0100 |
| commit | 34253327553afc71710e49e46c086f67319840c8 (patch) | |
| tree | 7421c16479887ea06aaf1a5f427f7c106d000a94 | |
| parent | 0744e7428fdcd4aae6d9db32522d4d449e815ee5 (diff) | |
| download | buildscripts-34253327553afc71710e49e46c086f67319840c8.tar.gz buildscripts-34253327553afc71710e49e46c086f67319840c8.tar.bz2 buildscripts-34253327553afc71710e49e46c086f67319840c8.zip | |
build scripts: fix creation of git changelog
| -rwxr-xr-x | bin/build-deb-package | 4 | ||||
| -rwxr-xr-x | bin/build-rpm-package | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/build-deb-package b/bin/build-deb-package index bc4482d..5dd121d 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -121,7 +121,6 @@ prepare_workspace() { GIT_OBJECT_ID=`git show-ref -s heads/master` cd "$PROJECT_DIR" - git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog # by default we build for all current debian versions if [ "x$ARGV2_CODENAME" != "x" ]; then @@ -245,6 +244,9 @@ build_packages() { OTHERMIRROR="deb http://packages.mate-desktop.org/repo/debian $l_CODENAME main" fi + # create git changelog immediately prior to building the package + git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog + [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { diff --git a/bin/build-rpm-package b/bin/build-rpm-package index d22c517..2892100 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -115,7 +115,6 @@ prepare_workspace() { GIT_OBJECT_ID=`git show-ref -s heads/master` cd "$PROJECT_DIR" - git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog if [ "x$ARGV2_CODENAME" != "x" ]; then if echo "$FEDORA_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then @@ -202,6 +201,9 @@ build_packages() { mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION + # create git changelog immediately prior to building the SRPM package + git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog + # create the SRPM package rpmbuild -D "%_topdir $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild" -bs $PROJECT.spec |