Merge remote-tracking branch 'gears/sisyphus' into sisyphus

Conflicts:
	propagator.spec
This commit is contained in:
Anton V. Boyarshinov 2012-11-09 15:53:54 +04:00
commit c31cb588f3
2 changed files with 12 additions and 0 deletions

View File

@ -198,6 +198,12 @@ done
[ -n "$KERNEL" ] || KERNEL="$uname_r" [ -n "$KERNEL" ] || KERNEL="$uname_r"
[ -d "/lib/modules/$KERNEL" ] || Fatal "Directory /lib/modules/$KERNEL does not exists." [ -d "/lib/modules/$KERNEL" ] || Fatal "Directory /lib/modules/$KERNEL does not exists."
# modprobe from kmod-9+ *requires* modules.dep.bin (ALT #27640)
if [ ! -f /lib/modules/$KERNEL/modules.dep.bin ]; then
depmod -a -F "/boot/System.map-$KERNEL" "$KERNEL" ||
Fatal "Failed to create modules dependencies (full)."
fi
#--------------------------------------------------------------- #---------------------------------------------------------------
FIRMWARE_DIRS="$FIRMWARE_DIRS /lib/firmware/$KERNEL" FIRMWARE_DIRS="$FIRMWARE_DIRS /lib/firmware/$KERNEL"
MODULES= MODULES=

View File

@ -43,6 +43,12 @@ make \
* Tue Oct 02 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20121002-alt1 * Tue Oct 02 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20121002-alt1
- no more initfs - no more initfs
* Mon Oct 15 2012 Michael Shigorin <mike@altlinux.org> 20101130-alt20
- kmod-10 still does, remade the workaround as a longer term one
* Mon Aug 13 2012 Michael Shigorin <mike@altlinux.org> 20101130-alt19
- modprobe suddenly wants modules.dep.bin to exist
* Fri Aug 10 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20101130-alt18 * Fri Aug 10 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20101130-alt18
- modprobe --list changed to find - modprobe --list changed to find