forked from Mirror/frr
debian: cleanly split off from dist tarball
The debian/ directory is distributed separately for tarballs in 3.0 (quilt) format. Including it in the dist tarball causes problems with automake when the separately distributed debian directory is unpacked on top of the dist tarball; the clean and correct thing to do here is to not include the debian/ directory in dist tarballs. Users have two choices for building FRR Debian packages: - build straight off git - build from a "frr.tar" + "frr-debian.tar" The tarsource.sh tool does the right thing when invoked with the -D ("Debian") option. Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
parent
081253fcd5
commit
74afa5e686
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -28,6 +28,7 @@
|
|||
/aclocal.m4
|
||||
/libtool
|
||||
/libtool.orig
|
||||
/changelog-auto
|
||||
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
|
|
|
@ -124,7 +124,6 @@ include watchfrr/subdir.am
|
|||
include qpb/subdir.am
|
||||
include fpm/subdir.am
|
||||
include tools/subdir.am
|
||||
include debian/subdir.am
|
||||
include solaris/subdir.am
|
||||
|
||||
include bgpd/subdir.am
|
||||
|
@ -170,6 +169,8 @@ EXTRA_DIST += \
|
|||
m4/README.txt \
|
||||
m4/libtool-whole-archive.patch \
|
||||
config.version \
|
||||
changelog-auto \
|
||||
changelog-auto.in \
|
||||
\
|
||||
python/clidef.py \
|
||||
python/clippy/__init__.py \
|
||||
|
|
|
@ -2196,9 +2196,9 @@ AC_CONFIG_FILES([Makefile],[sed -e 's/^#AUTODERP# //' -i Makefile])
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
config.version
|
||||
changelog-auto
|
||||
redhat/frr.spec
|
||||
solaris/Makefile
|
||||
debian/changelog-auto
|
||||
alpine/APKBUILD
|
||||
snapcraft/snapcraft.yaml
|
||||
lib/version.h
|
||||
|
|
1
debian/.gitignore
vendored
1
debian/.gitignore
vendored
|
@ -1 +0,0 @@
|
|||
/changelog-auto
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -1 +1 @@
|
|||
changelog-auto
|
||||
../changelog-auto
|
45
debian/subdir.am
vendored
45
debian/subdir.am
vendored
|
@ -1,45 +0,0 @@
|
|||
#
|
||||
# debian
|
||||
#
|
||||
|
||||
EXTRA_DIST += \
|
||||
debian/README.Debian \
|
||||
debian/README.Maintainer \
|
||||
debian/changelog \
|
||||
debian/changelog-auto \
|
||||
debian/compat \
|
||||
debian/control \
|
||||
debian/copyright \
|
||||
debian/rules \
|
||||
debian/source/format \
|
||||
debian/source/lintian-overrides \
|
||||
debian/tests/control \
|
||||
debian/tests/daemons \
|
||||
debian/watchfrr.rc \
|
||||
debian/watch \
|
||||
\
|
||||
debian/frr-dbg.lintian-overrides \
|
||||
debian/frr-doc.doc-base \
|
||||
debian/frr-doc.info \
|
||||
debian/frr-doc.install \
|
||||
debian/frr-doc.lintian-overrides \
|
||||
debian/frr-pythontools.install \
|
||||
debian/frr-pythontools.lintian-overrides \
|
||||
debian/frr-rpki-rtrlib.install \
|
||||
debian/frr-rpki-rtrlib.lintian-overrides \
|
||||
debian/frr-snmp.install \
|
||||
debian/frr-snmp.lintian-overrides \
|
||||
debian/frr.conf \
|
||||
debian/frr.dirs \
|
||||
debian/frr.docs \
|
||||
debian/frr.install \
|
||||
debian/frr.lintian-overrides \
|
||||
debian/frr.logrotate \
|
||||
debian/frr.manpages \
|
||||
debian/frr.pam \
|
||||
debian/frr.postinst \
|
||||
debian/frr.postrm \
|
||||
debian/frr.preinst \
|
||||
debian/frr.prerm \
|
||||
debian/not-installed \
|
||||
# end
|
|
@ -233,8 +233,8 @@ gitts="$gitts"
|
|||
taropt="$taropt"
|
||||
EOF
|
||||
sed -e "s%@VERSION@%$pkgver$extraver%" \
|
||||
< debian/changelog-auto.in \
|
||||
> debian/changelog-auto
|
||||
< changelog-auto.in \
|
||||
> changelog-auto
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue