From 74afa5e6862e26f1dd4019fa497844cc2e4fe254 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 14 Dec 2018 16:08:25 +0100 Subject: 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 --- tools/tarsource.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/tarsource.sh') diff --git a/tools/tarsource.sh b/tools/tarsource.sh index a197244f8..673187079 100755 --- a/tools/tarsource.sh +++ b/tools/tarsource.sh @@ -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 -- cgit v1.2.3