diff options
author | Theodore Ts'o <tytso@mit.edu> | 2021-02-09 15:56:12 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2021-02-09 15:56:12 -0500 |
commit | b637c57d122f1694275fcd8974e68f7784b5c832 (patch) | |
tree | 44512f13209011c38619f5102997701e744b37a1 | |
parent | 8c9e2921ecb4f259cd86231c1e5008f72ca6b18a (diff) | |
download | e2fsprogs-b637c57d122f1694275fcd8974e68f7784b5c832.tar.gz |
debian: add build profiles noudeb and pkg.e2fsprogs.no-static
Addresses-Debian-Bug: #966686
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 87bee9d46..76a69a186 100644 --- a/debian/control +++ b/debian/control @@ -33,6 +33,7 @@ Description: save the output of a command in a log file of the output will also be written to standard output. Package: e2fsck-static +Build-Profiles: <!pkg.e2fsprogs.no-static> Priority: optional Depends: ${misc:Depends} Recommends: sash | bash-static | zsh-static | busybox-static @@ -123,6 +124,7 @@ Description: command-line interface parsing library - headers and static librari This package contains the development environment for the ss library. Package: e2fsprogs-udeb +Build-Profiles: <!noudeb> Package-Type: udeb Section: debian-installer Priority: optional diff --git a/debian/rules b/debian/rules index 5fbee8a86..e36bcaaaf 100755 --- a/debian/rules +++ b/debian/rules @@ -68,7 +68,9 @@ override_dh_auto_configure: override_dh_auto_build: $(MAKE) -C ${stdbuilddir} V=1 all +ifeq (,$(filter pkg.e2fsprogs.no-static,$(DEB_BUILD_PROFILES))) $(MAKE) -C ${stdbuilddir}/e2fsck V=1 e2fsck.static +endif if ! test -d debian/orig-gmo ; then \ mkdir debian/orig-gmo ; \ mv po/*.gmo po/*.po debian/orig-gmo ; \ @@ -96,9 +98,11 @@ override_dh_auto_install: # static libs and .h files $(MAKE) -C ${stdbuilddir} V=1 install-libs DESTDIR=${tmpdir} LDCONFIG=true +ifeq (,$(filter pkg.e2fsprogs.no-static,$(DEB_BUILD_PROFILES))) # statically-linked fsck ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin (cd debian/tmp/usr/share/man/man8 ; cp e2fsck.8 e2fsck.static.8) +endif ifeq ($(DEB_HOST_ARCH_OS), hurd) ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf @@ -110,10 +114,12 @@ override_dh_install: dh_install dh_missing --fail-missing +ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES))) override_dh_lintian: dh_lintian $(INSTALL) -D -p -m644 debian/e2fsprogs-udeb.lintian-overrides \ debian/e2fsprogs-udeb/usr/share/lintian/overrides/e2fsprogs-udeb +endif override_dh_installinfo: # HTML docs @@ -151,13 +157,15 @@ override_dh_makeshlibs: patch debian/$$i.symbols < debian/$$i.tmp-patch; \ /bin/rm debian/$$i.tmp-patch; \ done - dh_makeshlibs --add-udeb=e2fsprogs-udeb + dh_makeshlibs $(if $(filter noudeb,$(DEB_BUILD_PROFILES)),,--add-udeb=e2fsprogs-udeb) override_dh_shlibdeps: dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \ -- -Ldebian/e2fsprogs.shlibs.local +ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES))) dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \ -- -Ldebian/e2fsprogs-udeb.shlibs.local +endif ifeq ($(SKIP_FUSE2FS),) dh_shlibdeps -pfuse2fs -l${stdbuilddir}/lib \ -- -Ldebian/e2fsprogs.shlibs.local |