Author: fs
Date: Sat Dec 8 15:53:53 2007
New Revision: 9926
Log:
split module-assistant stuf into separate rules file
Added:
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
(contents, props changed)
Modified:
dists/trunk/redhat-cluster/redhat-cluster/debian/control
dists/trunk/redhat-cluster/redhat-cluster/debian/rules
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control Sat Dec 8
15:53:53 2007
@@ -139,7 +139,7 @@
Package: gfs-source
Architecture: any
-Depends: bzip2 dpatch
+Depends: bzip2
Description: Global File System v1 - kernel module source
This package contains the source necessary for compiling the
Global File System version 1 kernel modules against the linux tree.
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules Sat Dec
8 15:53:53 2007
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# module assistant stuff
+PACKAGE=gfs-modules
+MA_DIR ?= /usr/share/modass
+-include $(MA_DIR)/include/generic.make
+-include $(MA_DIR)/include/common-rules.make
+
+kdist_clean: prep-deb-files
+ dh_clean
+ $(MAKE) -C $(KSRC) M=$(CURDIR) clean
+
+kdist_config: prep-deb-files
+binary-modules: kdist_config
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ # build the module
+ make -C $(KSRC) M=$(CURDIR)/ modules USING_KBUILD=1
+ mkdir -p $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/
+ install -m644 -b gfs.ko
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gfs.ko
+ # this is broken, dunno why:
+ # #make -C $(KSRC) M=$(CURDIR)/ modules_install
INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/
+ dh_installdocs
+ dh_installchangelogs
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_installmodules
+ dh_gencontrol -- -v$(VERSION)
+ dh_md5sums
+ dh_builddeb --destdir=$(DEB_DESTDIR)
+
+.PHONY: binary-modules kdist kdist_config kdist_image kdist_clean
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules Sat Dec 8
15:53:53 2007
@@ -20,7 +20,7 @@
configure: patch configure-stamp
configure-stamp:
dh_testdir
-
+
./configure --kernel_src=$(BUILDROOT) \
--kernel_build=$(BUILDROOT) \
--sbindir=/usr/sbin \
@@ -30,10 +30,10 @@
--libexecdir=/usr/lib/openais \
--release_major=$(SOMAJOR) \
--release_minor=$(SOMINOR)
-
+
# disable kernel modules
sed -i -e 's/-kernel.* \?=/& 1/g' make/defines.mk
-
+
touch $@
build: configure build-stamp
@@ -68,10 +68,12 @@
# prepare the debian dir
cd debian ; \
- cp compat copyright gfs-modules-_KVERS_.postinst changelog rules \
+ cp compat copyright gfs-modules-_KVERS_.postinst changelog \
control.modules.in gfs-source/usr/src/modules/gfs/debian
cp debian/gfs-source.README.Debian \
debian/gfs-source/usr/src/modules/gfs/debian/README.Debian
+ cp debian/gfs-source.rules \
+ debian/gfs-source/usr/src/modules/gfs/debian/rules
# hack to fix changelog in the module source package
cat debian/changelog | sed -e "s/^redhat-cluster/gfs/" > \
@@ -131,35 +133,3 @@
rm -rf *-stamp
rm -rf debian/patched
-# module assistant stuff
-PACKAGE=gfs-modules
-MA_DIR ?= /usr/share/modass
--include $(MA_DIR)/include/generic.make
--include $(MA_DIR)/include/common-rules.make
-
-kdist_clean: prep-deb-files
- dh_clean
- $(MAKE) -C $(KSRC) M=$(CURDIR) clean
-
-kdist_config: prep-deb-files
-binary-modules: kdist_config
- dh_testdir
- dh_testroot
- dh_clean -k
- # build the module
- make -C $(KSRC) M=$(CURDIR)/ modules USING_KBUILD=1
- mkdir -p $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/
- install -m644 -b gfs.ko
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gfs.ko
- # this is broken, dunno why:
- # #make -C $(KSRC) M=$(CURDIR)/ modules_install
INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/
- dh_installdocs
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_installmodules
- dh_gencontrol -- -v$(VERSION)
- dh_md5sums
- dh_builddeb --destdir=$(DEB_DESTDIR)
-
-.PHONY: binary-modules kdist kdist_config kdist_image kdist_clean
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
