mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-15 06:43:16 +00:00
debian: Remove the changelog-auto automation in favor of dch
Signed-off-by: Ondřej Surý <ondrej@sury.org>
This commit is contained in:
parent
63c0c8ed89
commit
cace1d9bf1
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,7 +28,6 @@
|
||||
/aclocal.m4
|
||||
/libtool
|
||||
/libtool.orig
|
||||
/debian/changelog-auto
|
||||
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
|
@ -2484,7 +2484,6 @@ AC_CONFIG_FILES([Makefile],[
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
config.version
|
||||
debian/changelog-auto
|
||||
redhat/frr.spec
|
||||
alpine/APKBUILD
|
||||
snapcraft/snapcraft.yaml
|
||||
|
7
debian/changelog-auto.in
vendored
7
debian/changelog-auto.in
vendored
@ -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@
|
@ -35,14 +35,11 @@ buster.)
|
||||
Alternatively, you can manually install build dependencies for your
|
||||
platform as outlined in :ref:`building`.
|
||||
|
||||
4. Run ``tools/tarsource.sh -V``:
|
||||
4. Install `git-buildpackage` package:
|
||||
|
||||
.. code-block:: shell
|
||||
|
||||
./tools/tarsource.sh -V
|
||||
|
||||
This script sets up the ``debian/changelog-auto`` file with proper version
|
||||
information.
|
||||
sudo apt-get install git-buildpackage
|
||||
|
||||
5. (optional) Append a distribution identifier if needed (see below under
|
||||
:ref:`multi-dist`.)
|
||||
@ -51,7 +48,7 @@ buster.)
|
||||
|
||||
.. code-block:: shell
|
||||
|
||||
dpkg-buildpackage $options
|
||||
gbp-buildpackage --git-builder=debuild $options
|
||||
|
||||
Where `$options` may contain any or all of the following items:
|
||||
|
||||
|
@ -271,17 +271,16 @@ lsfiles="frr-${PACKAGE_VERSION}.tar.$zip"
|
||||
|
||||
if $debian; then
|
||||
if ! $adjchangelog; then
|
||||
GIT_DATE=$(git log --format=format:%ad -1 --date=rfc)
|
||||
sed -e "s/@DATE@/$GIT_DATE/" \
|
||||
< debian/changelog-auto \
|
||||
> "$tmpdir/debian/changelog"
|
||||
dch --force-bad-version \
|
||||
--force-distribution \
|
||||
--preserve \
|
||||
--newversion "$DEBVER" \
|
||||
"autoconf changelog entry -- for git autobuilds only."
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user