Move the dlm module to modules-extra and do additional cleanup (rhbz 811547)
This commit is contained in:
parent
2ddaf28593
commit
d80df3443e
15
kernel.spec
15
kernel.spec
|
@ -54,7 +54,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 6
|
||||
%global baserelease 7
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -1871,7 +1871,17 @@ BuildKernel() {
|
|||
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
|
||||
|
@ -2420,6 +2430,7 @@ fi
|
|||
# '-'
|
||||
%changelog
|
||||
* Fri Apr 20 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- Move the dlm module to modules-extra and do additional cleanup (rhbz 811547)
|
||||
- CVE-2012-2123 fcaps: clear the same personality flags as suid when fcaps
|
||||
are used (rhbz 814523 806722)
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ dccp_ipv4.ko
|
|||
dccp_ipv6.ko
|
||||
dccp.ko
|
||||
dccp_probe.ko
|
||||
dlm.ko
|
||||
sctp.ko
|
||||
sctp_probe.ko
|
||||
rds.ko
|
||||
|
@ -31,7 +32,6 @@ l2tp_eth.ko
|
|||
l2tp_ip.ko
|
||||
l2tp_netlink.ko
|
||||
l2tp_ppp.ko
|
||||
llc.ko
|
||||
ipx.ko
|
||||
appletalk.ko
|
||||
ipddp.ko
|
||||
|
@ -89,6 +89,8 @@ mptbase.ko
|
|||
mptctl.ko
|
||||
mptfc.ko
|
||||
i2400m.ko
|
||||
i2400m-usb.ko
|
||||
i2400m-sdio.ko
|
||||
hisax.ko
|
||||
hysdn.ko
|
||||
isdn.ko
|
||||
|
@ -141,13 +143,14 @@ 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
|
||||
ocfs2_dlmfs.ko
|
||||
ocfs2_nodemanager.ko
|
||||
ocfs2_stackglue.ko
|
||||
ocfs2_stack_o2cb.ko
|
||||
ocfs2_stack_user.ko
|
||||
cuse.ko
|
||||
affs.ko
|
||||
befs.ko
|
||||
|
@ -168,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
|
||||
|
|
Loading…
Reference in New Issue