X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=eeb32e07994136c0f637a32d4ab95d5713f0e8f2;hb=307d877e51240e1d50c0fc42b190f1247f387f85;hp=902d4ab004c3bc0cf2505e859ecf317342cbdd9e;hpb=88252d0612e55ed21f36345006a7a39cda9886fb;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index 902d4ab..eeb32e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ KVER?=$(LINUXRELEASE)
 KVERS?=$(KVER)
 KSRC?=$(LINUX_OBJ)
 KSRC_TREE?=$(LINUX)
-IB_OPTIONS?=""
+EXTRA_OPTIONS?=$(IB_OPTIONS)
 
 # Packages provided for both client and server builds
 IOKIT_PKG=lustre-iokit
@@ -81,10 +81,14 @@ SOURCE_PKG=lustre-source
 ifneq (,$(findstring server,$(DEB_BUILD_PROFILES)))
 	UTILS_PKG=lustre-server-utils
 	MODS_PKG=lustre-server-modules
+	RESOURCE_PKG=lustre-resource-agents
+	RESOURCE_TARGET=binary-$(RESOURCE_PKG)
 	DKMS_PKG=
 else
 	UTILS_PKG=lustre-client-utils
 	MODS_PKG=lustre-client-modules
+	RESOURCE_TARGET=
+	RESOURCE_PKG=
 	DKMS_PKG=lustre-client-modules-dkms
 endif
 
@@ -202,7 +206,8 @@ build-stamp: patch-stamp configure-stamp
 # binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) \
 # binary-$(MODS_PKG) binary-kern-mods
 binary-arch: binary-$(UTILS_PKG) binary-$(DEV_PKG) \
-	     binary-$(IOKIT_PKG) binary-$(TESTS_PKG)
+	     binary-$(IOKIT_PKG) binary-$(TESTS_PKG) \
+	     $(RESOURCE_TARGET)
 
 binary-indep: binary-$(SOURCE_PKG) $(DKMS_TARGET)
 
@@ -232,6 +237,24 @@ binary-$(UTILS_PKG): build-stamp
 	dh_md5sums -p $(UTILS_PKG)
 	dh_builddeb -p $(UTILS_PKG)
 
+binary-$(RESOURCE_PKG): build-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs -p $(RESOURCE_PKG)
+	dh_installdocs -p  $(RESOURCE_PKG)
+	dh_installman -p $(RESOURCE_PKG)
+	dh_install -p $(RESOURCE_PKG)
+	dh_makeshlibs -p $(RESOURCE_PKG)
+	dh_installexamples -p $(RESOURCE_PKG)
+	dh_installchangelogs -p $(RESOURCE_PKG) lustre/ChangeLog
+	dh_compress -p $(RESOURCE_PKG)
+	dh_strip -p $(RESOURCE_PKG)
+	dh_installdeb -p $(RESOURCE_PKG)
+	dh_fixperms -p $(RESOURCE_PKG)
+	dh_gencontrol -p $(RESOURCE_PKG)
+	dh_md5sums -p $(RESOURCE_PKG)
+	dh_builddeb -p $(RESOURCE_PKG)
+
 binary-$(IOKIT_PKG): build-stamp
 	dh_testdir
 	dh_testroot
@@ -437,7 +460,7 @@ kdist_config: prep-deb-files patch-stamp
 		--enable-quota \
 		--with-kmp-moddir=updates \
 		$${EXTRAFLAGS} \
-		$(IB_OPTIONS)
+		$(EXTRA_OPTIONS)
 
 
 kdist_configure: kdist_config