diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-09-03 23:53:57 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-09-04 00:12:56 -0400 |
| commit | 716ff03b6c41de633f3bbe21b3ee607aa63f02cf (patch) | |
| tree | ecbcedb009c27012fe25b7d47be051f660891361 | |
| parent | 9b4125798014d834d687862df10b9f42e6bf8118 (diff) | |
| download | e2fsprogs-716ff03b6c41de633f3bbe21b3ee607aa63f02cf.tar.gz | |
debian: clean up conditional fuse2fs pacakge build rules
There's no point conditionalizing fuse2fs in the control file, since
we control whether or not fuse2fs is built in the rules file, and the
control file is going to be the same when built on all of the debian
build servers.
Also key off of DEB_HOST_ARCH_OS to determine whether or not we are
building for the Hurd, and define it so the right thing happens if
./debian/rules is run by hand on a Hurd system.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | debian/control.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/debian/control.in b/debian/control.in index a8ba5f52c..d851b3dcd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,7 +6,6 @@ Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any Standards-Version: 4.0.0 Homepage: http://e2fsprogs.sourceforge.net -ifdef(`FUSE2FS',`` Package: fuse2fs Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} @@ -15,7 +14,6 @@ Description: ext2 / ext3 / ext4 file system driver for FUSE fuse2fs is a FUSE file system client that supports reading and writing from devices or image files containing ext2, ext3, and ext4 file systems. -'')dnl ifdef(`E2FSCK_STATIC',`` Package: e2fsck-static diff --git a/debian/rules b/debian/rules index a2eac6d6e..81eafc315 100755 --- a/debian/rules +++ b/debian/rules @@ -22,11 +22,12 @@ DEB_HOST_OS ?= $(shell dpkg-architecture -qDEB_HOST_OS) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) # Allow distro-specific behaviour DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian) -ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) +ifeq ($(DEB_HOST_ARCH_OS), hurd) SKIP_FUSE2FS=yes endif @@ -180,12 +181,6 @@ else M4_ARGS+=-UUDEB_PKGS endif -ifeq ($(SKIP_FUSE2FS),) -M4_ARGS+=-DFUSE2FS -else -M4_ARGS+=-UFUSE2FS -endif - debian-files: debian/control mrproper: clean @@ -333,7 +328,7 @@ ifneq ($(BUILD_E2FSCK_STATIC),no) cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8 endif -ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) +ifeq ($(DEB_HOST_ARCH_OS), hurd) ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf endif |