mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-16 10:38:05 +00:00
debianpkg: update to Debian Policy version 4.2.1
This bundles up a few smaller changes prompted by walking through the upgrade checklist from 3.9.6 to 4.2.1. Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
parent
02334d76e7
commit
5d2f5756cf
@ -77,6 +77,16 @@ build FRR yourself with SNMP with
|
|||||||
Just distributing it in binary form, linked against OpenSSL, is forbidden.
|
Just distributing it in binary form, linked against OpenSSL, is forbidden.
|
||||||
|
|
||||||
|
|
||||||
|
* Debian Policy compliance notes
|
||||||
|
================================
|
||||||
|
|
||||||
|
- 4.15 Reproducibility
|
||||||
|
FRR build is reproducible as outlined in version 4.2.1 of the Policy, but
|
||||||
|
won't be reproducible when the build directory is varied. This is because
|
||||||
|
configure parameters are burned into the executables which includes CFLAGS
|
||||||
|
like -fdebug-prefix-map=/build/directory/...
|
||||||
|
|
||||||
|
|
||||||
* Daemon selection:
|
* Daemon selection:
|
||||||
===================
|
===================
|
||||||
|
|
||||||
|
@ -1,3 +1,13 @@
|
|||||||
|
#
|
||||||
|
# TODO
|
||||||
|
#
|
||||||
|
|
||||||
|
- check that tests/{control,daemons} actually do something useful and sensible
|
||||||
|
- /usr/share/doc/frr-doc should be named just frr?
|
||||||
|
- debian/watch pgpsigurlmangle / signing-key
|
||||||
|
- multiarch for DSOs?
|
||||||
|
- frr try-restart
|
||||||
|
|
||||||
#
|
#
|
||||||
# To check if the patches still apply on new upstream versions:
|
# To check if the patches still apply on new upstream versions:
|
||||||
#
|
#
|
||||||
|
@ -3,7 +3,6 @@ Section: net
|
|||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Nobody <nobody@frrouting.org>
|
Maintainer: Nobody <nobody@frrouting.org>
|
||||||
Uploaders: Nobody <nobody@frrouting.org>
|
Uploaders: Nobody <nobody@frrouting.org>
|
||||||
XSBC-Original-Maintainer: <maintainers@frrouting.org>
|
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
autotools-dev,
|
autotools-dev,
|
||||||
bison,
|
bison,
|
||||||
@ -31,8 +30,10 @@ Build-Depends:
|
|||||||
python (>= 2.7) | python3,
|
python (>= 2.7) | python3,
|
||||||
python-sphinx | python3-sphinx,
|
python-sphinx | python3-sphinx,
|
||||||
texinfo (>= 4.7)
|
texinfo (>= 4.7)
|
||||||
Standards-Version: 3.9.6
|
Standards-Version: 4.2.1
|
||||||
Homepage: http://www.frrouting.org/
|
Homepage: http://www.frrouting.org/
|
||||||
|
Vcs-Browser: https://github.com/FRRouting/frr/
|
||||||
|
Vcs-Git: https://github.com/FRRouting/frr.git
|
||||||
|
|
||||||
Package: frr
|
Package: frr
|
||||||
Architecture: any
|
Architecture: any
|
||||||
@ -43,6 +44,7 @@ Depends:
|
|||||||
logrotate (>= 3.2-11)
|
logrotate (>= 3.2-11)
|
||||||
Pre-Depends: adduser
|
Pre-Depends: adduser
|
||||||
Recommends: frr-pythontools
|
Recommends: frr-pythontools
|
||||||
|
Suggests: frr-doc
|
||||||
Conflicts: zebra, zebra-pj, quagga
|
Conflicts: zebra, zebra-pj, quagga
|
||||||
Replaces: zebra, zebra-pj
|
Replaces: zebra, zebra-pj
|
||||||
Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon forked from Quagga
|
Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon forked from Quagga
|
||||||
@ -83,7 +85,7 @@ Architecture: any
|
|||||||
Depends:
|
Depends:
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
frr (= ${binary:Version})
|
frr (= ${binary:Version})
|
||||||
Priority: extra
|
Priority: optional
|
||||||
Section: debug
|
Section: debug
|
||||||
Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (debug symbols)
|
Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (debug symbols)
|
||||||
This package provides debugging symbols for all binary packages built
|
This package provides debugging symbols for all binary packages built
|
||||||
|
@ -20,7 +20,7 @@ if ! getent passwd frr >/dev/null; then
|
|||||||
adduser \
|
adduser \
|
||||||
--system \
|
--system \
|
||||||
--ingroup frr \
|
--ingroup frr \
|
||||||
--home /var/run/frr/ \
|
--home /nonexistent \
|
||||||
--gecos "Frr routing suite" \
|
--gecos "Frr routing suite" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
frr >/dev/null
|
frr >/dev/null
|
||||||
|
@ -34,9 +34,7 @@ GENERATE_PDF ?= 0
|
|||||||
#
|
#
|
||||||
####################################
|
####################################
|
||||||
|
|
||||||
export DH_VERBOSE=1
|
|
||||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||||
export DH_OPTIONS=-v
|
|
||||||
|
|
||||||
ifeq ($(WANT_OSPFAPI), 1)
|
ifeq ($(WANT_OSPFAPI), 1)
|
||||||
USE_OSPFAPI=--enable-ospfapi=yes
|
USE_OSPFAPI=--enable-ospfapi=yes
|
||||||
@ -79,15 +77,29 @@ endif
|
|||||||
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||||
DEBIAN_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
DEBIAN_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef DEBIAN_JOBS
|
ifdef DEBIAN_JOBS
|
||||||
MAKEFLAGS += -j$(DEBIAN_JOBS)
|
MAKEFLAGS += -j$(DEBIAN_JOBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
|
||||||
|
MAKE_SILENT="V=0"
|
||||||
|
export DH_VERBOSE=0
|
||||||
|
else
|
||||||
|
MAKE_SILENT="V=1"
|
||||||
|
export DH_VERBOSE=1
|
||||||
|
export DH_OPTIONS=-v
|
||||||
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# build profiles
|
# build profiles
|
||||||
#
|
#
|
||||||
|
|
||||||
|
ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
|
||||||
|
USE_DOC=--enable-doc
|
||||||
|
else
|
||||||
|
USE_DOC=--disable-doc
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(filter pkg.frr.rtrlib,$(DEB_BUILD_PROFILES)),)
|
ifeq ($(filter pkg.frr.rtrlib,$(DEB_BUILD_PROFILES)),)
|
||||||
USE_RPKI=--disable-rpki
|
USE_RPKI=--disable-rpki
|
||||||
else
|
else
|
||||||
@ -118,6 +130,8 @@ override_dh_auto_configure:
|
|||||||
--localstatedir=/var/run/frr \
|
--localstatedir=/var/run/frr \
|
||||||
--sbindir=/usr/lib/frr \
|
--sbindir=/usr/lib/frr \
|
||||||
--sysconfdir=/etc/frr \
|
--sysconfdir=/etc/frr \
|
||||||
|
--with-vtysh-pager=/usr/bin/pager \
|
||||||
|
$(USE_DOC) \
|
||||||
$(USE_SNMP) \
|
$(USE_SNMP) \
|
||||||
$(USE_OSPFAPI) \
|
$(USE_OSPFAPI) \
|
||||||
$(USE_MULTIPATH) \
|
$(USE_MULTIPATH) \
|
||||||
@ -158,6 +172,9 @@ endif
|
|||||||
rm debian/tmp/usr/lib/frr/modules/*.la
|
rm debian/tmp/usr/lib/frr/modules/*.la
|
||||||
rm debian/tmp/usr/lib/frr/libyang_plugins/*.la
|
rm debian/tmp/usr/lib/frr/libyang_plugins/*.la
|
||||||
|
|
||||||
|
override_dh_auto_build:
|
||||||
|
dh_auto_build -- $(MAKE_SILENT)
|
||||||
|
|
||||||
override_dh_auto_clean:
|
override_dh_auto_clean:
|
||||||
# we generally do NOT want a full distclean since that wipes both
|
# we generally do NOT want a full distclean since that wipes both
|
||||||
# debianpkg/changelog and config.version
|
# debianpkg/changelog and config.version
|
||||||
|
Loading…
Reference in New Issue
Block a user