proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 16:54:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian: Remove the changelog-auto automation in favor of dch

Browse Source 
Signed-off-by: Ondřej Surý <ondrej@sury.org>
This commit is contained in:
Ondřej Surý 2020-09-27 11:46:31 +02:00
parent 63c0c8ed89
commit cace1d9bf1
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,7 +28,6 @@
/aclocal.m4 /aclocal.m4
/libtool /libtool
/libtool.orig /libtool.orig
/debian/changelog-auto
/Makefile /Makefile
/Makefile.in /Makefile.in

1
configure.ac
View File

@ -2484,7 +2484,6 @@ AC_CONFIG_FILES([Makefile],[
AC_CONFIG_FILES([ AC_CONFIG_FILES([
config.version config.version
debian/changelog-auto
redhat/frr.spec redhat/frr.spec
alpine/APKBUILD alpine/APKBUILD
snapcraft/snapcraft.yaml snapcraft/snapcraft.yaml

7
debian/changelog-auto.in vendored
View File

@ -1,7 +0,0 @@
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@

9
doc/developer/packaging-debian.rst
View File

@ -35,14 +35,11 @@ buster.)
Alternatively, you can manually install build dependencies for your Alternatively, you can manually install build dependencies for your
platform as outlined in :ref:`building`. platform as outlined in :ref:`building`.
4. Run ``tools/tarsource.sh -V``: 4. Install `git-buildpackage` package:
.. code-block:: shell .. code-block:: shell
./tools/tarsource.sh -V sudo apt-get install git-buildpackage
This script sets up the ``debian/changelog-auto`` file with proper version
information.
5. (optional) Append a distribution identifier if needed (see below under 5. (optional) Append a distribution identifier if needed (see below under
:ref:`multi-dist`.) :ref:`multi-dist`.)
@ -51,7 +48,7 @@ buster.)
.. code-block:: shell .. code-block:: shell
dpkg-buildpackage $options gbp-buildpackage --git-builder=debuild $options
Where `$options` may contain any or all of the following items: Where `$options` may contain any or all of the following items:

11
tools/tarsource.sh
View File

@ -271,17 +271,16 @@ lsfiles="frr-${PACKAGE_VERSION}.tar.$zip"
if $debian; then if $debian; then
if ! $adjchangelog; then if ! $adjchangelog; then
GIT_DATE=$(git log --format=format:%ad -1 --date=rfc) dch --force-bad-version \
sed -e "s/@DATE@/$GIT_DATE/" \ --force-distribution \
< debian/changelog-auto \ --preserve \
> "$tmpdir/debian/changelog" --newversion "$DEBVER" \
"autoconf changelog entry -- for git autobuilds only."
fi fi
cat debian/changelog >> "$tmpdir/debian/changelog" cat debian/changelog >> "$tmpdir/debian/changelog"
DEBVER="`dpkg-parsechangelog -l\"$tmpdir/debian/changelog\" -SVersion`" DEBVER="`dpkg-parsechangelog -l\"$tmpdir/debian/changelog\" -SVersion`"
eval $debsrc | tar -cho $taropt \ eval $debsrc | tar -cho $taropt \
--exclude debian/changelog \
--exclude debian/subdir.am \
-T - -f ../frr_${DEBVER}.debian.tar -T - -f ../frr_${DEBVER}.debian.tar
# add specially prepared files from above # add specially prepared files from above
tar -uf ../frr_${DEBVER}.debian.tar $taropt -C "$tmpdir" debian/changelog tar -uf ../frr_${DEBVER}.debian.tar $taropt -C "$tmpdir" debian/changelog