Browse Source

TT#124273 Use execute_after/before_ instead of override_ for dh command

This avoids duplicating the call we want to hook into.

Change-Id: If166c690709ee633e4928f9574b7d9e141509c01
pull/1498/head
Guillem Jover 4 years ago
parent
commit
2f158114ab
5 changed files with 23 additions and 7 deletions
  1. +3
    -7
      debian/rules
  2. +5
    -0
      pkg/deb/backports/bullseye
  3. +5
    -0
      pkg/deb/backports/buster
  4. +5
    -0
      pkg/deb/backports/focal
  5. +5
    -0
      pkg/deb/backports/stretch

+ 3
- 7
debian/rules View File

@ -30,7 +30,7 @@ endif
%:
dh $@
override_dh_auto_install-indep:
execute_before_dh_auto_install-indep:
# Create the directories to install the source into
dh_installdirs -p$(pdkms) usr/src/$(sname)-$(sversion)
@ -44,13 +44,9 @@ override_dh_auto_install-indep:
markdown README.md | gzip -9 > debian/README.html.gz
gzip -9 < README.md > debian/README.md.gz
dh_auto_install
override_dh_install:
dh_install
execute_after_dh_install:
dh_installdirs -pngcp-rtpengine-iptables $(XTABLES_DIR)
install -m 0644 iptables-extension/libxt_RTPENGINE.so debian/ngcp-rtpengine-iptables/$(XTABLES_DIR)
override_dh_installsystemd:
dh_installsystemd
execute_after_dh_installsystemd:
dh_installsystemd -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount

+ 5
- 0
pkg/deb/backports/bullseye View File

@ -13,6 +13,11 @@ cp -r debian ${DIST}
# Update for bullseye debhelper
sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
# Replace execute_* hooks with old-style overrides
sed -i -e 's/^execute_after_dh_install:/override_dh_install:\n\tdh_install/' ${DIST}/rules
sed -i -e 's/^execute_after_dh_installsystemd:/override_dh_installsystemd:\n\tdh_installsystemd/' ${DIST}/rules
sed -i -e 's/^execute_before_dh_auto_install-indep:/override_dh_auto_install-indep:/' ${DIST}/rules
sed -i -e '/^\tgzip -9 < README.md/a\\n\tdh_auto_install' ${DIST}/rules
# Add dwz override
cat >> ${DIST}/rules <<'EOF'


+ 5
- 0
pkg/deb/backports/buster View File

@ -16,6 +16,11 @@ sed -i -e '/libbcg729-dev/d' ${DIST}/control
# Update for buster debhelper
sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
# Replace execute_* hooks with old-style overrides
sed -i -e 's/^execute_after_dh_install:/override_dh_install:\n\tdh_install/' ${DIST}/rules
sed -i -e 's/^execute_after_dh_installsystemd:/override_dh_installsystemd:\n\tdh_installsystemd/' ${DIST}/rules
sed -i -e 's/^execute_before_dh_auto_install-indep:/override_dh_auto_install-indep:/' ${DIST}/rules
sed -i -e '/^\tgzip -9 < README.md/a\\n\tdh_auto_install' ${DIST}/rules
# Add dwz override
cat >> ${DIST}/rules <<'EOF'


+ 5
- 0
pkg/deb/backports/focal View File

@ -16,6 +16,11 @@ sed -i -e '/libbcg729-dev/d' ${DIST}/control
# Update for focal debhelper
sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
# Replace execute_* hooks with old-style overrides
sed -i -e 's/^execute_after_dh_install:/override_dh_install:\n\tdh_install/' ${DIST}/rules
sed -i -e 's/^execute_after_dh_installsystemd:/override_dh_installsystemd:\n\tdh_installsystemd/' ${DIST}/rules
sed -i -e 's/^execute_before_dh_auto_install-indep:/override_dh_auto_install-indep:/' ${DIST}/rules
sed -i -e '/^\tgzip -9 < README.md/a\\n\tdh_auto_install' ${DIST}/rules
# Add dwz override
cat >> ${DIST}/rules <<'EOF'


+ 5
- 0
pkg/deb/backports/stretch View File

@ -19,6 +19,11 @@ echo 10 > ${DIST}/compat
sed -i -e 's/debhelper-compat.*/debhelper (>= 10),/' ${DIST}/control
# Compat level for dkms module package
sed -i -e '/cp debian.control/ i \ cp debian/compat debian/\$(psource)/usr/src/modules/\$(sname)/debian/' ${DIST}/rules
# Replace execute_* hooks with old-style overrides
sed -i -e 's/^execute_after_dh_install:/override_dh_install:\n\tdh_install/' ${DIST}/rules
sed -i -e 's/^execute_after_dh_installsystemd:/override_dh_installsystemd:\n\tdh_installsystemd/' ${DIST}/rules
sed -i -e 's/^execute_before_dh_auto_install-indep:/override_dh_auto_install-indep:/' ${DIST}/rules
sed -i -e '/^\tgzip -9 < README.md/a\\n\tdh_auto_install' ${DIST}/rules
# Remove bottom make rules
sed -i -e '/^override_dh_installsystemd/,/^\n/d' ${DIST}/rules
# ... and replace with:


Loading…
Cancel
Save