rpms/module-init-tools/devel depmod-fedora.conf, NONE, 1.1 modprobe-fedora-oss.conf, NONE, 1.1 modprobe-fedora.conf, NONE, 1.1 module-init-tools.spec, 1.83, 1.84 weak-modules, 1.16, 1.17 depmod.conf.dist, 1.1, NONE modprobe.conf.dist, 1.10, NONE
Jon Masters
jcm at fedoraproject.org
Thu Mar 19 18:51:13 UTC 2009
- Previous message (by thread): rpms/gpsd/F-9 .cvsignore, 1.7, 1.8 gpsd.spec, 1.20, 1.21 sources, 1.7, 1.8 python-pyexecdir-install-gpsd-2.37.patch, 1.1, NONE zero.patch, 1.1, NONE
- Next message (by thread): rpms/gpsd/F-10 .cvsignore, 1.7, 1.8 gpsd.spec, 1.20, 1.21 sources, 1.7, 1.8 python-pyexecdir-install-gpsd-2.37.patch, 1.1, NONE zero.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcm
Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13580
Modified Files:
module-init-tools.spec weak-modules
Added Files:
depmod-fedora.conf modprobe-fedora-oss.conf
modprobe-fedora.conf
Removed Files:
depmod.conf.dist modprobe.conf.dist
Log Message:
Lots of little niggling cleanups wanted in time for F11.
--- NEW FILE depmod-fedora.conf ---
#
# depmod.conf
#
# override default search ordering for kmod packaging
search updates extra built-in weak-updates
--- NEW FILE modprobe-fedora-oss.conf ---
# OSS Sound Support
# This has been disabled in F11 onwards because it can interfere with the
# PulseAudio sound service (a legacy OSS application can prevent PulseAudio
# applications from playing sound by preventing PulseAudio from (re-)opening
# the sound device). To re-enable support, uncomment the following line:
#
# install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss
--- NEW FILE modprobe-fedora.conf ---
# default modutils aliases
alias binfmt-204 binfmt_aout
alias binfmt-263 binfmt_aout
alias binfmt-264 binfmt_aout
alias binfmt-267 binfmt_aout
alias binfmt-387 binfmt_aout
alias block-major-1-* rd
alias block-major-3-* ide-probe-mod
alias block-major-8-* sd_mod
alias block-major-9-* md
alias block-major-11-* sr_mod
alias block-major-13-* xd
alias block-major-15-* cdu31a
alias block-major-16-* gscd
alias block-major-17-* optcd
alias block-major-18-* sjcd
alias block-major-20-* mcdx
alias block-major-22-* ide-probe-mod
alias block-major-23-* mcd
alias block-major-24-* sonycd535
alias block-major-25-* sbpcd
alias block-major-26-* sbpcd
alias block-major-27-* sbpcd
alias block-major-29-* aztcd
alias block-major-32-* cm206
alias block-major-33-* ide-probe-mod
alias block-major-34-* ide-probe-mod
alias block-major-37-* ide-tape
alias block-major-44-* ftl
alias block-major-46-* pcd
alias block-major-47-* pf
alias block-major-56-* ide-probe-mod
alias block-major-57-* ide-probe-mod
alias block-major-88-* ide-probe-mod
alias block-major-89-* ide-probe-mod
alias block-major-90-* ide-probe-mod
alias block-major-91-* ide-probe-mod
alias block-major-93-* nftl
alias block-major-113-* viocd
alias char-major-4-* serial
alias char-major-5-* serial
alias char-major-9-* st
alias char-major-10-2 msbusmouse
alias char-major-10-3 atixlmouse
alias char-major-10-135 rtc
alias char-major-10-139 openprom
alias char-major-10-157 applicom
alias char-major-10-175 agpgart
alias char-major-10-250 hci_vhci
alias char-major-13-* input
alias char-major-13-0 joydev
alias char-major-13-32 mousedev
alias char-major-19-* cyclades
alias char-major-20-* cyclades
alias char-major-22-* pcxx
alias char-major-23-* pcxx
alias char-major-27-* zftape
alias char-major-34-* scc
alias char-major-35-* tclmidi
alias char-major-36-* netlink
alias char-major-48-* riscom8
alias char-major-49-* riscom8
alias char-major-57-* esp
alias char-major-58-* esp
alias char-major-63-* kdebug
alias char-major-90-* mtdchar
alias char-major-96-* pt
alias char-major-97-* pg
alias char-major-107-* 3dfx
alias char-major-109-* lvm-mod
alias char-major-188-* usbserial
alias char-major-200-* vxspec
alias char-major-206-* osst
alias char-major-216-* rfcomm
alias dos msdos
alias dummy0 dummy
alias dummy1 dummy
alias iso9660 isofs
alias net-pf-1 unix
alias net-pf-2 ipv4
alias net-pf-17 af_packet
alias netalias-2 ip_alias
alias irlan0 irlan
alias irda-dongle-0 tekram
alias irda-dongle-1 esi
alias irda-dongle-2 actisys
alias irda-dongle-3 actisys
alias irda-dongle-4 girbil
alias irda-dongle-5 litelink
alias irda-dongle-6 airport
alias irda-dongle-7 old_belkin
alias plip0 plip
alias plip1 plip
alias tunl0 ipip
alias cipcb0 cipcb
alias cipcb1 cipcb
alias cipcb2 cipcb
alias cipcb3 cipcb
alias slip0 slip
alias slip1 slip
alias tty-ldisc-1 slip
alias tty-ldisc-3 ppp_async
alias tty-ldisc-11 irtty-sir
alias tty-ldisc-14 ppp_synctty
alias tty-ldisc-15 hci_uart
alias ppp-compress-18 ppp_mppe
install ppp-compress-21 /bin/true
alias ppp-compress-24 ppp_deflate
alias ppp-compress-26 ppp_deflate
alias parport_lowlevel parport_pc
alias usbdevfs usbcore
alias xfrm-type-2-50 esp4
alias xfrm-type-2-51 ah4
alias xfrm-type-2-108 ipcomp
alias xfrm-type-10-50 esp6
alias xfrm-type-10-51 ah6
alias xfrm-type-10-108 ipcomp6
alias cipher_null crypto_null
alias digest_null crypto_null
alias compress_null crypto_null
alias sha384 sha512
install binfmt-0000 /bin/true
install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; }
install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; }
install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; }
install char-major-10 /bin/true
install char-major-10-1 /bin/true
install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
install net-pf-19 /bin/true
install net-pf-3 /bin/true
install net-pf-6 /bin/true
install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp
install scsi_hostadapter /bin/true
install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc
remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc
remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd
alias usb-uhci uhci-hcd
alias usb-ohci ohci-hcd
alias uhci uhci-hcd
alias char-major-116-* snd
alias sound-service-*-0 snd-mixer-oss
alias sound-service-*-1 snd-seq-oss
alias sound-service-*-3 snd-pcm-oss
alias sound-service-*-8 snd-seq-oss
alias sound-service-*-12 snd-pcm-oss
install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]}
alias nfs4 nfs
alias rpc_pipefs sunrpc
alias rpc_svc_gss_pipefs sunrpc
install eth1394 /bin/true
install snd-emu10k1 /sbin/modprobe --ignore-install snd-emu10k1 && /sbin/modprobe snd-emu10k1-synth
alias gre0 ip_gre
alias char-major-89-* i2c-dev
Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- module-init-tools.spec 12 Mar 2009 17:59:54 -0000 1.83
+++ module-init-tools.spec 19 Mar 2009 18:50:42 -0000 1.84
@@ -2,21 +2,22 @@
Name: module-init-tools
Version: 3.7
%define PreRelease -pre9
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Kernel
Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2.sign
-Source2: modprobe.conf.dist
+Source2: modprobe-fedora.conf
Source3: weak-modules
-Source4: depmod.conf.dist
+Source4: depmod-fedora.conf
+Source5: modprobe-fedora-oss.conf
Exclusiveos: Linux
Prereq: /sbin/chkconfig sh-utils
Obsoletes: modutils-devel modutils
Provides: modutils = %{version}
BuildPrereq: zlib-devel docbook-utils
BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: zlib-static glibc-static
+BuildRequires: zlib-static
%description
The module-init-tools package includes various programs needed for automatic
@@ -28,17 +29,8 @@
%setup -q -n module-init-tools-%{version}%{PreRelease}
%build
-export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
-%configure --enable-zlib
-make insmod.static
-cp insmod.static insmod-static
-
-
export CC=gcc
export CFLAGS="$RPM_OPT_FLAGS -DCONFIG_NO_BACKWARDS_COMPAT=1"
-
-make distclean
-
%configure --enable-zlib
make
@@ -46,9 +38,6 @@
rm -rf $RPM_BUILD_ROOT
%makeinstall sbindir=$RPM_BUILD_ROOT/sbin
-install -m 755 generate-modprobe.conf \
- $RPM_BUILD_ROOT/sbin
-
install -m 644 modprobe.conf.5 \
$RPM_BUILD_ROOT/%{_mandir}/man5/modprobe.d.5
@@ -57,36 +46,22 @@
mkdir -p $RPM_BUILD_ROOT/etc
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf.dist
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/fedora.conf
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/modprobe.d/fedora-oss.conf
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/weak-modules
mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/depmod.d/depmod.conf.dist
-
-find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/depmod.d/fedora.conf
mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
-install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static
touch $RPM_BUILD_ROOT/etc/modprobe.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
-# get rid of the old installations on upgrade
-if [ -x /etc/rc.d/init.d/kerneld ] ; then
- /sbin/chkconfig --del kerneld
-fi
-if [ -f /etc/conf.modules -a ! -f /etc/modules.conf ] ; then
- mv -f /etc/conf.modules /etc/modules.conf
-fi
-if [ -f /etc/modules.conf -a ! -f /etc/modprobe.conf ] ; then
- echo "# Note: for use under 2.4, changes must also be made to modules.conf!" >/etc/modprobe.conf
- /sbin/generate-modprobe.conf --stdin < /etc/modules.conf >> /etc/modprobe.conf 2>/dev/null
- chmod 644 /etc/modprobe.conf
- echo "# Note: for use under 2.6, changes must also be made to modprobe.conf!" >> /etc/modules.conf
-fi
+# Removed 2.4 compatibility in post-F10 (in F11 onwards).
%files
%defattr(-,root,root)
@@ -97,6 +72,9 @@
%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf
%changelog
+* Thu Mar 19 2009 Jon Masters <jcm at redhat.com> - 3.7-6 (pre9)
+- Rebuild with fixes, remove 2.4 compat and static build, and disable OSS.
+
* Thu Mar 12 2009 Jon Masters <jcm at redhat.com> - 3.7-5 (pre9)
- Rebuild with latest upstream. Post-F11 will kill config files.
Index: weak-modules
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- weak-modules 2 Apr 2008 21:47:26 -0000 1.16
+++ weak-modules 19 Mar 2009 18:50:42 -0000 1.17
@@ -3,19 +3,12 @@
# weak-modules - determine which modules are kABI compatible with installed
# kernels and set up the symlinks in /lib/*/weak-updates.
#
+
# Changelog:
#
-# 2008/04/02 - Updated to latest version of weak-modules.
-#
# 2006/12/11 - Updated logic for determining the system's initrd location,
# to account for IA64 differences. (#215432)
-# First check for standard binutils tools
-if [ ! -x /usr/bin/nm ];
-then
- exit 0;
-fi
-
unset LANG LC_ALL LC_COLLATE
tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
@@ -29,6 +22,8 @@
initrd_prefix="/boot"
fi
+#!/bin/sh
+
# rpmsort: The sort in coreutils can't sort the RPM list how we want it so we
# instead transform the list into a form it will sort correctly, then sort.
rpmsort() {
@@ -285,7 +280,9 @@
--remove-modules
Remove compatibility symlinks from weak-updates/ directories
for a list of modules. The list of modules is read from
- standard input.
+ standard input. Optionally specify --delete-modules to
+ prevent weak-modules from attempting to locate any
+ compatible modules to replace those being removed.
--add-kernel
Add compatibility symlinks for all compatible modules to the
@@ -376,7 +373,10 @@
# remove_modules:
# Read in a list of modules from stdinput and process them for removal.
+# Parameter is noreplace to delete modules, otherwise link compat.
remove_modules() {
+ delete_modules=${1:-replace}
+
read_modules_list || exit 1
if [ ${#modules[@]} -gt 0 ]; then
@@ -400,19 +400,21 @@
[ -n "$verbose" ] && echo \
"Removing compatible module ${module##*/} from kernel $krel"
doit rm -f "$weak_module"
- for krel2 in "${krels[@]}"; do
- if [ $krel2 != $krel ]; then
- module="/lib/modules/$krel2/extra/${subpath#/}"
- [ -e "$module" ] || continue
- if module_is_compatible "$module" "$krel"; then
- [ -n "$verbose" ] && echo \
+ if [ "replace" == "$delete_modules" ]; then
+ for krel2 in "${krels[@]}"; do
+ if [ $krel2 != $krel ]; then
+ module="/lib/modules/$krel2/extra/${subpath#/}"
+ [ -e "$module" ] || continue
+ if module_is_compatible "$module" "$krel"; then
+ [ -n "$verbose" ] && echo \
"Adding compatible module ${module##*/} from kernel $krel2 instead"
- doit ln -s "$module" "$weak_module"
- module_has_changed $module $krel
- break
+ doit ln -s "$module" "$weak_module"
+ module_has_changed $module $krel
+ break
+ fi
fi
- fi
- done
+ done
+ fi
doit rmdir --parents --ignore-fail-on-non-empty \
"$(dirname "$weak_module")"
fi
@@ -458,7 +460,7 @@
options=`getopt -o h --long help,add-modules,remove-modules \
--long add-kernel,remove-kernel \
- --long dry-run,no-initrd,verbose -- "$@"`
+ --long dry-run,no-initrd,verbose,delete-modules -- "$@"`
[ $? -eq 0 ] || usage 1
@@ -487,6 +489,9 @@
--verbose)
verbose=1
;;
+ --delete-modules)
+ do_delete_modules=1
+ ;;
-h|--help)
usage 0
;;
@@ -502,7 +507,11 @@
add_modules
elif [ -n "$do_remove_modules" ]; then
- remove_modules
+ if [ -n "$do_delete_modules" ]; then
+ remove_modules "noreplace"
+ else
+ remove_modules
+ fi
elif [ -n "$do_add_kernel" ]; then
kernel=${1:-$(uname -r)}
--- depmod.conf.dist DELETED ---
--- modprobe.conf.dist DELETED ---
- Previous message (by thread): rpms/gpsd/F-9 .cvsignore, 1.7, 1.8 gpsd.spec, 1.20, 1.21 sources, 1.7, 1.8 python-pyexecdir-install-gpsd-2.37.patch, 1.1, NONE zero.patch, 1.1, NONE
- Next message (by thread): rpms/gpsd/F-10 .cvsignore, 1.7, 1.8 gpsd.spec, 1.20, 1.21 sources, 1.7, 1.8 python-pyexecdir-install-gpsd-2.37.patch, 1.1, NONE zero.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list