Author: fs
Date: Wed Dec 19 13:33:23 2007
New Revision: 9981
Log:
rename gfs-source into redhat-cluster-source
add gnbd kernel module to redhat-cluster-source
Added:
dists/trunk/redhat-cluster/redhat-cluster/debian/modass.redhat-cluster-source
- copied, changed from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/02_fix_gnbd-kernel-makefile.dpatch
- copied, changed from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-modules-_KVERS_.postinst
- copied unchanged from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.README.Debian
- copied, changed from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
- copied, changed from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
Removed:
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
Modified:
dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
dists/trunk/redhat-cluster/redhat-cluster/debian/control
dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
dists/trunk/redhat-cluster/redhat-cluster/debian/rules
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO Wed Dec 19
13:33:23 2007
@@ -1,6 +1,5 @@
Open packaging issues
--------------------
-- add gnbd-source package containing the gnbd kernel module (#401073, #426769)
- make initscripts lsb-compliant
- redo description of gfs-source? (#380002)
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog Wed Dec 19
13:33:23 2007
@@ -21,5 +21,8 @@
- Call dh_strip during install. Closes: #437899
* Add handling for missing cluster.conf. Closes: #420229, #381434, #367370
* Enable XEN support on amd64 too.
+ * Add gnbd kernel module source to redhat-cluster-source.
+ Closes: #401073, #426769
- -- Frederik Schüler <[EMAIL PROTECTED]> Wed, 19 Dec 2007 13:17:28 +0100
+
+ -- Frederik Schüler <[EMAIL PROTECTED]> Wed, 19 Dec 2007 13:59:49 +0100
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 Wed Dec 19
13:33:23 2007
@@ -12,7 +12,7 @@
Priority: optional
Architecture: all
Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm
-Description: red hat cluster suite (meta package)
+Description: Red Hat cluster suite (meta package)
The only scope for this package is to install the full Red Hat Cluster Suite
in one shot. It is safe to remove it.
@@ -20,7 +20,7 @@
Architecture: any
Section: admin
Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, python, openais (>= 0.82-2), gfs-modules
+Depends: ${shlibs:Depends}, python, openais (>= 0.82-2), redhat-cluster-modules
Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev,
fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
Replaces: ccs, fence, fence-gnbd
Description: cluster manager
@@ -75,7 +75,7 @@
Package: gfs-tools
Architecture: any
-Depends: ${shlibs:Depends}, psmisc, gfs-modules, gfs2-tools
+Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules, gfs2-tools
Section: admin
Description: global file system tools
The Global File System allows a cluster of machines to concurrently access
@@ -92,7 +92,7 @@
Package: gfs2-tools
Architecture: any
-Depends: ${shlibs:Depends}, psmisc, gfs-modules
+Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules
Section: admin
Description: global file system 2 tools (EXPERIMENTAL)
The Global File System 2 allows a cluster of machines to concurrently access
@@ -108,7 +108,7 @@
Package: gnbd-client
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, gfs-modules
+Depends: ${shlibs:Depends}, redhat-cluster-modules
Recommends: fence-gnbd (= ${binary:Version})
Description: global network block device - client tools
GNBD allows to use block devices over the network. It is a modified
@@ -120,7 +120,7 @@
Package: gnbd-server
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, gfs-modules
+Depends: ${shlibs:Depends}, redhat-cluster-modules
Recommends: fence-gnbd (= ${binary:Version})
Description: global network block device - server tools
GNBD allows to use block devices over the network. It is a modified
@@ -137,9 +137,9 @@
Resource Group Manager provides high availability of critical server
applications in the event of planned or unplanned system downtime.
-Package: gfs-source
+Package: redhat-cluster-source
Architecture: any
Depends: bzip2
-Description: Global File System v1 - kernel module source
+Description: Red Hat cluster suite - kernel modules source
This package contains the source necessary for compiling the
- Global File System version 1 kernel modules against the linux tree.
+ Red Hat cluster suite kernel modules against the linux tree.
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in Wed Dec
19 13:33:23 2007
@@ -1,4 +1,4 @@
-Source: gfs
+Source: redhat-cluster
Section: admin
Priority: optional
Maintainer: Debian Kernel Team <[EMAIL PROTECTED]>
@@ -6,21 +6,21 @@
Standards-Version: 3.7.3.0
Build-Depends: debhelper (>> 5.0.0), linux-headers-_KVERS_
-Package: gfs-modules-_KVERS_
+Package: redhat-cluster-modules-_KVERS_
Section: admin
Priority: optional
Architecture: any
Recommends: kernel-image-_KVERS_, gfs-tools
-Provides: gfs-modules
+Provides: redhat-cluster-modules
Description: global file system kernel module
The Global File System 2 allows a cluster of machines to concurrently access
shared storage hardware like SANs or iSCSI and network block devices. GFS
can be deployed to build high available services without the single point
of failure a file server would be.
.
- This package contains the compiled gfs kernel module for _KVERS_
+ This package contains the compiled gfs and gnbd kernel modules for _KVERS_
.
If you compiled a custom kernel, you will most likely need to compile a
- custom version of this module as well. The gfs-source
+ custom version of this module as well. The redhat-cluster-source
package has been provided for this purpose.
Copied:
dists/trunk/redhat-cluster/redhat-cluster/debian/modass.redhat-cluster-source
(from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source)
==============================================================================
--- /dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
(original)
+++
dists/trunk/redhat-cluster/redhat-cluster/debian/modass.redhat-cluster-source
Wed Dec 19 13:33:23 2007
@@ -2,8 +2,8 @@
MA_DIR=${MA_DIR:-/usr/share/modass}
-TARBALL=/usr/src/gfs.tar.bz2
-BUILDDIR=${MODULE_LOC:-/usr/src/modules}/gfs
+TARBALL=/usr/src/redhat-cluster.tar.bz2
+BUILDDIR=${MODULE_LOC:-/usr/src/modules}/redhat-cluster
. $MA_DIR/packages/generic.sh
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Wed Dec
19 13:33:23 2007
@@ -1,2 +1,3 @@
00_fix_gfs2_quota.dpatch
01_fix_gfs-kernel-makefile.dpatch
+02_fix_gnbd-kernel-makefile.dpatch
Copied:
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/02_fix_gnbd-kernel-makefile.dpatch
(from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch)
==============================================================================
---
/dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
(original)
+++
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/02_fix_gnbd-kernel-makefile.dpatch
Wed Dec 19 13:33:23 2007
@@ -1,20 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_gfs-kernel-makefile.dpatch by Frederik Schüler <[EMAIL PROTECTED]>
+## 01_fix_gnbd-kernel-makefile.dpatch by Frederik Schüler <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove unneeded include from Makefile
@DPATCH@
---- redhat-cluster-2.20071022/gfs-kernel/src/gfs/Makefile.old 2007-12-07
22:58:12.000000000 +0100
-+++ redhat-cluster-2.20071022/gfs-kernel/src/gfs/Makefile 2007-12-07
22:58:20.000000000 +0100
+--- redhat-cluster-2.20071022/gnbd-kernel/src/Makefile.old 2007-12-07
22:58:12.000000000 +0100
++++ redhat-cluster-2.20071022/gnbd-kernel/src/Makefile 2007-12-07
22:58:20.000000000 +0100
@@ -11,10 +11,6 @@
###############################################################################
###############################################################################
-ifndef USING_KBUILD
--include ../../../make/defines.mk
+-include ../../make/defines.mk
-endif
-
- PWD := $(shell pwd)
+ PWD = $(shell pwd)
SYMVERFILE := ${KERNEL_BUILD}/Module.symvers
Added:
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile
==============================================================================
--- (empty file)
+++
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile
Wed Dec 19 13:33:23 2007
@@ -0,0 +1,5 @@
+#! /usr/bin/make -f
+
+USING_KBUILD=1
+
+obj-m = gfs/ gnbd/
Copied:
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.README.Debian
(from r9976,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian)
==============================================================================
--- /dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
(original)
+++
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.README.Debian
Wed Dec 19 13:33:23 2007
@@ -5,7 +5,7 @@
- Building with module-assistant
-$ m-a -t a-i gfs
+$ m-a -t a-i redhat-cluster
(for kernel source or headers in non-standard directory, add the option
-k /path/to/kernel/source with the correct path)
@@ -13,15 +13,15 @@
- Building with make-kpkg
$ cd /usr/src/
-$ ta jxvf gfs.tar.bz2
+$ ta xjvf redhat-cluster.tar.bz2
$ cd /usr/src/kernel-source-2.6.23-1-amd64
-$ make-kpkg --added-modules=gfs modules
+$ make-kpkg --added-modules=redhat-cluster modules
- Building without make-kpkg
$ cd /usr/src/
-$ tar jxvf gfs.tar.bz2
-$ cd modules/gfs
+$ tar jxvf redhat-cluster.tar.bz2
+$ cd modules/redhat-cluster
$ fakeroot debian/rules kdist_image
(no fakeroot needed if you run this as root)
Copied:
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
(from r9976, /dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules)
==============================================================================
--- /dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
(original)
+++
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
Wed Dec 19 13:33:23 2007
@@ -4,7 +4,7 @@
# export DH_VERBOSE=1
# module assistant stuff
-PACKAGE=gfs-modules
+PACKAGE=redhat-cluster-modules
MA_DIR ?= /usr/share/modass
-include $(MA_DIR)/include/generic.make
-include $(MA_DIR)/include/common-rules.make
@@ -21,7 +21,8 @@
# 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
+ install -m644 -b gfs/gfs.ko
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gfs.ko
+ install -m644 -b gnbd/gnbd.ko
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gnbd.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
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 Wed Dec 19
13:33:23 2007
@@ -60,31 +60,36 @@
dh_install --sourcedir=debian/tmp --list-missing
- # install gfs v1 kernel source
- mkdir -p debian/gfs-source/usr/src/modules/gfs/debian
+ # install gfs and gnbd kernel sources
+ mkdir -p
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian
# copy the source
- cp -a gfs-kernel/src/gfs/* debian/gfs-source/usr/src/modules/gfs/
+ mkdir -p debian/redhat-cluster-source/usr/src/modules/redhat-cluster/gfs
+ cp -a gfs-kernel/src/gfs/* \
+ debian/redhat-cluster-source/usr/src/modules/redhat-cluster/gfs/
+
+ mkdir -p
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/gnbd
+ cp -a gnbd-kernel/src/* \
+
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/gnbd/
# prepare the debian dir
cd debian ; \
- 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/" > \
- debian/gfs-source/usr/src/modules/gfs/debian/changelog
+ cp compat copyright redhat-cluster-modules-_KVERS_.postinst changelog \
+ control.modules.in
redhat-cluster-source/usr/src/modules/redhat-cluster/debian
+ cp debian/redhat-cluster-source.README.Debian \
+
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/README.Debian
+ cp debian/redhat-cluster-source.rules \
+
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/rules
+ cp debian/redhat-cluster-source.Makefile \
+
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/Makefile
# tar it up
- cd debian/gfs-source/usr/src/ ; tar cjf gfs.tar.bz2 modules/gfs/
- rm -rf debian/gfs-source/usr/src/modules
+ cd debian/redhat-cluster-source/usr/src/ ; \
+ tar cjf redhat-cluster.tar.bz2 modules/redhat-cluster/
+ rm -rf debian/redhat-cluster-source/usr/src/modules
- install -D -m 755 debian/modass.gfs-source \
- debian/gfs-source/usr/share/modass/overrides/gfs-source
+ install -D -m 755 debian/modass.redhat-cluster-source \
+
debian/redhat-cluster-source/usr/share/modass/overrides/redhat-cluster-source
dh_installdirs
dh_link
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
