diff options
author | Quentin Young <qlyoung@nvidia.com> | 2020-11-19 23:12:40 +0100 |
---|---|---|
committer | Quentin Young <qlyoung@nvidia.com> | 2020-11-19 23:12:40 +0100 |
commit | fb0b3592ca9b67124170d298ee55ab053ca0e2a8 (patch) | |
tree | 2691c1a7382235b1ba235e0b150434c3e6fe9e00 /tools | |
parent | Revert "debian: Remove now obsolete tarsource.sh script" (diff) | |
download | frr-fb0b3592ca9b67124170d298ee55ab053ca0e2a8.tar.xz frr-fb0b3592ca9b67124170d298ee55ab053ca0e2a8.zip |
Revert "debian: Remove the changelog-auto automation in favor of dch"
This reverts commit cace1d9bf178d447599fe7caa5ccad9a89babe03.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/tarsource.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/tarsource.sh b/tools/tarsource.sh index b548fb8ac..645982ece 100755 --- a/tools/tarsource.sh +++ b/tools/tarsource.sh @@ -271,16 +271,17 @@ lsfiles="frr-${PACKAGE_VERSION}.tar.$zip" if $debian; then if ! $adjchangelog; then - dch --force-bad-version \ - --force-distribution \ - --preserve \ - --newversion "$DEBVER" \ - "autoconf changelog entry -- for git autobuilds only." + GIT_DATE=$(git log --format=format:%ad -1 --date=rfc) + sed -e "s/@DATE@/$GIT_DATE/" \ + < debian/changelog-auto \ + > "$tmpdir/debian/changelog" fi cat debian/changelog >> "$tmpdir/debian/changelog" DEBVER="`dpkg-parsechangelog -l\"$tmpdir/debian/changelog\" -SVersion`" eval $debsrc | tar -cho $taropt \ + --exclude debian/changelog \ + --exclude debian/subdir.am \ -T - -f ../frr_${DEBVER}.debian.tar # add specially prepared files from above tar -uf ../frr_${DEBVER}.debian.tar $taropt -C "$tmpdir" debian/changelog |