Sorry I've attached a wrong patch :-(
Bellow is the correct (I hope ;-) ) one

>>redhat-cluster-source package is missing a debian directory and a modass
>>entry, therefore cannot be successfully built with module-assistant
>>
>>
>> 
>>
>>    
>>
>The attached patch (against the debian subdirectory) fixes the problem.
>
>Geza
>  
>
--- rules.orig	2006-05-13 20:18:45.000000000 +0200
+++ rules	2006-05-12 21:51:21.000000000 +0200
@@ -58,10 +58,18 @@
 
 $(STAMPS_DIR)/setup-source: $(STAMPS_DIR)/source
 	@rm -rf $(BUILD_DIR)/build-source
-	mkdir -p $(BUILD_DIR)/build-source/modules
-	cp -al $(BUILD_DIR)/source/cman-kernel/src $(BUILD_DIR)/build-source/modules/cman
-	cp -al $(BUILD_DIR)/source/dlm-kernel/src $(BUILD_DIR)/build-source/modules/dlm
-	cp -al $(BUILD_DIR)/source/gfs-kernel/src $(BUILD_DIR)/build-source/modules/gfs
+	mkdir -p $(BUILD_DIR)/build-source/modules/redhat-cluster-source
+	cp -al $(BUILD_DIR)/source/cman-kernel $(BUILD_DIR)/build-source/modules/redhat-cluster-source/
+	cp -al $(BUILD_DIR)/source/dlm-kernel $(BUILD_DIR)/build-source/modules/redhat-cluster-source/
+	cp -al $(BUILD_DIR)/source/gfs-kernel $(BUILD_DIR)/build-source/modules/redhat-cluster-source/
+	cp -al $(BUILD_DIR)/source/gnbd-kernel $(BUILD_DIR)/build-source/modules/redhat-cluster-source/
+	mkdir -p $(BUILD_DIR)/build-source/modules/redhat-cluster-source/debian
+	cp -al $(BUILD_DIR)/../{changelog,compat,copyright} $(BUILD_DIR)/build-source/modules/redhat-cluster-source/debian/
+	cp -al $(BUILD_DIR)/../rules.source $(BUILD_DIR)/build-source/modules/redhat-cluster-source/debian/rules
+	cp -al $(BUILD_DIR)/../control.source $(BUILD_DIR)/build-source/modules/redhat-cluster-source/debian/control.modules.in
+	cp -al $(BUILD_DIR)/../redhat-cluster-source-_KVERS_-postinst.modules.in $(BUILD_DIR)/build-source/modules/redhat-cluster-source/debian/postinst.modules.in
+	ln -sf default.sh redhat-cluster-source
+	cp -al redhat-cluster-source $(BUILD_DIR)/build-source/
 	touch $@
 
 build: $(STAMPS_DIR)/build
@@ -139,3 +147,4 @@
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install


--- rules.source.orig	2006-05-13 21:16:32.000000000 +0200
+++ rules.source	2006-05-13 12:17:24.000000000 +0200
@@ -0,0 +1,57 @@
+#!/usr/bin/make -f
+
+# module-assistant stuff
+PACKAGE = redhat-cluster-modules
+MA_DIR ?= /usr/share/modass
+-include $(MA_DIR)/include/generic.make
+-include $(MA_DIR)/include/common-rules.make
+
+export RHMODS=cman-kernel dlm-kernel gfs-kernel gnbd-kernel
+
+export BDIR=$(shell pwd)
+
+configure:
+	mkdir -p includes
+	cd includes && ln -sf . cluster
+	cp cman-kernel/src/service.h includes/service.h
+	cp cman-kernel/src/cnxman.h includes/cnxman.h
+	cp cman-kernel/src/cnxman-socket.h includes/cnxman-socket.h
+	cp dlm-kernel/src/dlm.h includes/dlm.h
+	for i in $$RHMODS; do \
+	  cd $$i && ./configure --incdir=$(BDIR)/includes --kernel_src=$(KSRC) && cd ..; \
+	done
+
+kdist_clean: prep-deb-files
+	dh_clean
+	for i in $$RHMODS; do \
+	  cd $$i && ./configure --kernel_src=$(KSRC) && $(MAKE) clean && cd ..; \
+	done
+	rm -rf includes
+
+kdist_config: prep-deb-files
+
+binary-modules: configure kdist_config
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs lib/modules/$(KVERS)
+
+	# build and install the module
+	for i in $$RHMODS; do \
+	  cd $$i && $(MAKE) && $(MAKE) install DESTDIR=$(BDIR)/debian/redhat-cluster-modules-$(KVERS) && cd ..; \
+	done
+	rm -rf debian/redhat-cluster-modules-$(KVERS)/usr
+
+	dh_installdocs 
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -v$(VERSION)
+	dh_md5sums
+	dh_builddeb --destdir=$(DEB_DESTDIR)
+
+binary: binary-indep binary-modules
+.PHONY: build clean binary-indep binary-modules binary install



--- redhat-cluster-source.install.orig	2006-05-13 20:18:45.000000000 +0200
+++ redhat-cluster-source.install	2006-05-09 22:28:23.000000000 +0200
@@ -1 +1,2 @@
 build-source/redhat-cluster.tar.bz2 usr/src
+build-source/redhat-cluster-source usr/share/modass/packages

--- control.source.orig	2006-05-13 21:23:15.000000000 +0200
+++ control.source	2006-05-13 09:09:53.000000000 +0200
@@ -0,0 +1,16 @@
+Source: redhat-cluster
+Description: Redhat cluster suite - kernel module source
+ This package contains the source necessary for compiling the RHCS
+ kernel modules against the linux tree.
+
+Package: redhat-cluster-modules-_KVERS_
+Version: 1.02.00-4
+Architecture: any
+Section: misc
+Priority: optional
+Maintainer: Bastian Blank <[EMAIL PROTECTED]>
+Source: redhat-cluster
+Recommends: kernel-image-_KVERS_
+Description: Redhat cluster - kernel modules
+ This package contains the RHCS
+ kernel modules built against the _KVERS_ linux tree.

--- redhat-cluster-source-_KVERS_-postinst.modules.in.orig	2006-05-13 21:26:40.000000000 +0200
+++ redhat-cluster-source-_KVERS_-postinst.modules.in	2006-04-26 12:06:51.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "`uname -r`" = _KVERS_ ] ; then
+   depmod -a &
+fi
+
+#DEBHELPER#

Reply via email to