[Pkg-iscsi-maintainers] [open-iscsi] 01/18: Fix build to install udeb stuff only on supported architectures

Ritesh Raj Sarraf rrs at alioth.debian.org
Tue Nov 5 16:22:09 UTC 2013


This is an automated email from the git hooks/post-receive script.

rrs pushed a commit to branch master
in repository open-iscsi.

commit 0be921da8d8d0e055cd6445d1fc1bbc1795d341e
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Wed Jun 27 21:37:16 2012 +0530

    Fix build to install udeb stuff only on supported architectures
---
 debian/rules |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/rules b/debian/rules
index 1da946a..d3bd5b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ export DH_OPTIONS
 # get-orig-source target
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
+DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+SUPPORTED_ARCH_UDEB = amd64 i386 ia64 mips mipsel powerpc
+
 get-orig-source:
 	[ ! -f $(ORIG_FILE).gz ] || rm -f $(ORIG_FILE).gz
 	uscan --force-download --rename --repack --download-version=$(DEB_UPSTREAM_VERSION) --destdir=.
@@ -85,6 +88,7 @@ install-arch:
 	install -m 600 etc/iscsid.conf $(CURDIR)/debian/open-iscsi/etc/iscsi
 	install -m 644 debian/open-iscsi.default $(CURDIR)/debian/open-iscsi/etc/default/open-iscsi
 
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(SUPPORTED_ARCH_UDEB)))
 	# udeb stuff
 	install -m 755 usr/iscsiadm $(CURDIR)/debian/open-iscsi-udeb/bin
 	install -m 755 utils/iscsi-iname $(CURDIR)/debian/open-iscsi-udeb/sbin
@@ -94,6 +98,7 @@ install-arch:
 	install -m 644 etc/iscsid.conf $(CURDIR)/debian/open-iscsi-udeb/etc/iscsi
 	install -m 644 debian/open-iscsi-udeb.start $(CURDIR)/debian/open-iscsi-udeb/sbin/iscsi-start
 	install -m 755 debian/open-iscsi-udeb.finish-install $(CURDIR)/debian/open-iscsi-udeb/usr/lib/finish-install.d/10open-iscsi
+endif
 
 	# initramfs stuff
 	install -m 755 debian/extra/initramfs.hook \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-iscsi/open-iscsi.git



More information about the Pkg-iscsi-maintainers mailing list