summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-04-20 16:46:56 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-04-20 16:49:27 -0400
commit1caa16e27879815eec1dca303787346727f5f95d (patch)
tree1a880c7a4801f13bde09e8a3f651f145d767ce7c
parentb16a74b08a1a534313f742cba1dbc6ff62b95e43 (diff)
downloadkernel-1caa16e27879815eec1dca303787346727f5f95d.tar.gz
kernel-1caa16e27879815eec1dca303787346727f5f95d.tar.xz
kernel-1caa16e27879815eec1dca303787346727f5f95d.zip
Move the dlm module to modules-extra and do additional cleanup (rhbz 811547)
-rw-r--r--kernel.spec19
-rw-r--r--mod-extra.list7
2 files changed, 18 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 7a37cb862..55824621e 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
@@ -1771,11 +1771,21 @@ BuildKernel() {
for mod in `echo $depends | sed -e 's/,/ /g'`
do
match=`grep "^$mod.ko" mod-extra.list` ||:
- if [ -n "$match" ]
+ if [ -z "$match" ]
then
continue
else
- echo $mod.ko >> req.list
+ # check if the module we're looking at is in mod-extra too. if so
+ # we don't need to mark the dep as required
+ mod2=`basename $dep`
+ match2=`grep "^$mod2" mod-extra.list` ||:
+ if [ -n "$match2" ]
+ then
+ continue
+ #echo $mod2 >> notreq.list
+ else
+ echo $mod.ko >> req.list
+ fi
fi
done
done
@@ -2313,6 +2323,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Apr 20 2012 Josh Boyer <jwboyer@redhat.com>
+- Move the dlm module to modules-extra and do additional cleanup (rhbz 811547)
+
* Fri Apr 20 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc3.git4.1
- Linux v3.4-rc3-89-gc6f5c93
diff --git a/mod-extra.list b/mod-extra.list
index e6c84963e..7176a736e 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -32,7 +32,6 @@ l2tp_eth.ko
l2tp_ip.ko
l2tp_netlink.ko
l2tp_ppp.ko
-llc.ko
ipx.ko
appletalk.ko
ipddp.ko
@@ -90,6 +89,8 @@ mptbase.ko
mptctl.ko
mptfc.ko
i2400m.ko
+i2400m-usb.ko
+i2400m-sdio.ko
hisax.ko
hysdn.ko
isdn.ko
@@ -142,9 +143,6 @@ umc.ko
uwb.ko
whci.ko
hwa-rc.ko
-uio.ko
-uio_aec.ko
-uio_pci_generic.ko
gfs2.ko
ocfs2.ko
ocfs2_dlm.ko
@@ -173,7 +171,6 @@ ksdazzle-sir.ko
ma600-sir.ko
mcp2120-sir.ko
toim3232-sir.ko
-pps_core.ko
tpm_atmel.ko
tpm_infineon.ko
tpm_nsc.ko