From 27b20495a2a8d1899b9295cd1fabf6b81481c28f Mon Sep 17 00:00:00 2001 From: chenhaibo <495810242@qq.com> Date: Wed, 30 Aug 2023 17:36:16 +0800 Subject: [PATCH] update rules --- trunk/packaging/deb.sh | 21 ++++++++++++--------- trunk/packaging/deb/rules | 3 --- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/trunk/packaging/deb.sh b/trunk/packaging/deb.sh index 5a838466a68..5df2aaa3148 100755 --- a/trunk/packaging/deb.sh +++ b/trunk/packaging/deb.sh @@ -1,20 +1,23 @@ # We can only build Debian packages, if the Debian build tools are installed if [ \! -x /usr/bin/debuild ]; then - echo "Cannot find /usr/bin/debuild. Not building Debian packages." 1>&2 - exit 0 + echo "Cannot find /usr/bin/debuild. Not building Debian packages." 1>&2 + exit 0 +fi + +# Double-check we're in the packages directory, just under rootdir +if [ \! -x ./configure ]; then + echo "Must run $0 in the 'trunk' directory, under the root directory." 1>&2 + exit 0 fi trap 'rm -rf '`pwd`/debian'; exit $?' EXIT SIGHUP SIGINT SIGTERM rm -rf debian - -# Debian has very specific requirements about the naming of build -# directories, and tar archives. It also wants to write all generated -# packages to the parent of the source directory. We accommodate these -# requirements by building directly from the tar file. - -# This is one of those 'specific requirements': where the deb control files live +# Debian has very specific requirements about the naming of build directories cp -a "packaging/deb" "debian" # Now, we can call Debian's standard build tool debuild -uc -us -tc -b + +echo +echo "The Debian package build finished." diff --git a/trunk/packaging/deb/rules b/trunk/packaging/deb/rules index 28bee6e9a95..7b25cce6c9b 100755 --- a/trunk/packaging/deb/rules +++ b/trunk/packaging/deb/rules @@ -34,6 +34,3 @@ override_dh_auto_install: mkdir -p $(DEBIAN_TMP)/usr/share/man/man8 cp doc/man/srs-server.8 $(DEBIAN_TMP)/usr/share/man/man8/ -override_dh_auto_clean: -# make clean -