diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | debian/changelog-auto.in | 7 | ||||
| -rw-r--r-- | doc/developer/packaging-debian.rst | 9 | ||||
| -rwxr-xr-x | tools/tarsource.sh | 11 |
5 files changed, 21 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index da48308bf7..974d13ce88 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ /aclocal.m4 /libtool /libtool.orig +/debian/changelog-auto /Makefile /Makefile.in diff --git a/configure.ac b/configure.ac index f4af2366fe..b98105322a 100755 --- a/configure.ac +++ b/configure.ac @@ -2484,6 +2484,7 @@ AC_CONFIG_FILES([Makefile],[ AC_CONFIG_FILES([ config.version + debian/changelog-auto redhat/frr.spec alpine/APKBUILD snapcraft/snapcraft.yaml diff --git a/debian/changelog-auto.in b/debian/changelog-auto.in new file mode 100644 index 0000000000..86783eee31 --- /dev/null +++ b/debian/changelog-auto.in @@ -0,0 +1,7 @@ +frr (@VERSION@-0) UNRELEASED; urgency=medium + + * autoconf changelog entry -- for git autobuilds only. + remove and replace when creating releases! + (tools/tarsource.sh will handle this) + + -- FRRouting-Dev <dev@lists.frrouting.org> @DATE@ diff --git a/doc/developer/packaging-debian.rst b/doc/developer/packaging-debian.rst index e643cf19d4..b57286d5a1 100644 --- a/doc/developer/packaging-debian.rst +++ b/doc/developer/packaging-debian.rst @@ -35,11 +35,14 @@ buster.) Alternatively, you can manually install build dependencies for your platform as outlined in :ref:`building`. -4. Install `git-buildpackage` package: +4. Run ``tools/tarsource.sh -V``: .. code-block:: shell - sudo apt-get install git-buildpackage + ./tools/tarsource.sh -V + + This script sets up the ``debian/changelog-auto`` file with proper version + information. 5. (optional) Append a distribution identifier if needed (see below under :ref:`multi-dist`.) @@ -48,7 +51,7 @@ buster.) .. code-block:: shell - gbp-buildpackage --git-builder=debuild $options + dpkg-buildpackage $options Where `$options` may contain any or all of the following items: diff --git a/tools/tarsource.sh b/tools/tarsource.sh index b548fb8ac8..645982eced 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 |