aboutsummaryrefslogtreecommitdiffstats
path: root/config/deb.am
diff options
context:
space:
mode:
authorEtienne Dechamps <[email protected]>2012-07-17 11:23:09 +0200
committerBrian Behlendorf <[email protected]>2012-07-26 13:39:37 -0700
commitb2c5198b1996c9053c1bae38755f76125c8cb169 (patch)
tree3bda567a01452cdf8cd810e990516cede8acf955 /config/deb.am
parent739a1a82e0f366923e8d9bc8f9ad4b1c680a780b (diff)
Don't build packages that haven't been selected.
Currently, when configure --with-config is used, selective compilation is only effective for the simple "make" case. Package builders (e.g. make rpm) still build everything (utils and modules). This patch fixes that. Signed-off-by: Prakash Surya <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #851
Diffstat (limited to 'config/deb.am')
-rw-r--r--config/deb.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/deb.am b/config/deb.am
index 18b56547b..36204b41c 100644
--- a/config/deb.am
+++ b/config/deb.am
@@ -15,6 +15,7 @@ deb-local:
fi)
deb-modules: deb-local rpm-modules
+if CONFIG_KERNEL
name=${PACKAGE}-modules; \
version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
@@ -23,8 +24,10 @@ deb-modules: deb-local rpm-modules
pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \
$(RM) $$pkg1 $$pkg2
+endif
deb-utils: deb-local rpm-utils
+if CONFIG_USER
name=${PACKAGE}; \
version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
@@ -34,5 +37,6 @@ deb-utils: deb-local rpm-utils
pkg4=$${name}-dracut-$${version}.$${arch}.rpm; \
fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2 $$pkg3 $$pkg4; \
$(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4
+endif
deb: deb-modules deb-utils