summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-04-17 16:26:16 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-04-17 16:27:30 -0400
commitbd9fffb7d6cb9ed2f2b4d4527db2b79a68c04047 (patch)
treeadb9944ce2c87585a0dec6767ef5cb550090579b
parent09440ff3b2b30b70400a790e0461fb4b08f2a134 (diff)
downloadkernel-bd9fffb7d6cb9ed2f2b4d4527db2b79a68c04047.tar.gz
kernel-bd9fffb7d6cb9ed2f2b4d4527db2b79a68c04047.tar.xz
kernel-bd9fffb7d6cb9ed2f2b4d4527db2b79a68c04047.zip
Move the dlm module to modules-extra (rhbz 811547)
-rw-r--r--kernel.spec7
-rw-r--r--mod-extra.list7
2 files changed, 11 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index de3113ec2..b45494666 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1767,7 +1767,7 @@ BuildKernel() {
for mod in `echo $depends | sed -e 's/,/ /g'`
do
match=`grep "^$mod.ko" mod-extra.list` ||:
- if [ -z "$match" ]
+ if [ -n "$match" ]
then
continue
else
@@ -2309,6 +2309,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Apr 17 2012 Josh Boyer <jwboyer@redhat.com>
+- Move the dlm module to modules-extra (rhbz 811547)
+
* Tue Apr 17 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc3.git1.1
- Linux v3.4-rc3-17-g4643b05
diff --git a/mod-extra.list b/mod-extra.list
index 2e35a12f7..e6c84963e 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -15,6 +15,7 @@ dccp_ipv4.ko
dccp_ipv6.ko
dccp.ko
dccp_probe.ko
+dlm.ko
sctp.ko
sctp_probe.ko
rds.ko
@@ -146,8 +147,12 @@ uio_aec.ko
uio_pci_generic.ko
gfs2.ko
ocfs2.ko
-ocfs2_stackglue.ko
ocfs2_dlm.ko
+ocfs2_dlmfs.ko
+ocfs2_nodemanager.ko
+ocfs2_stackglue.ko
+ocfs2_stack_o2cb.ko
+ocfs2_stack_user.ko
cuse.ko
affs.ko
befs.ko