kmod update, linux.install adjusted for /usr/lib move

This commit is contained in:
abveritas 2012-11-15 16:36:28 +00:00
parent f324c831db
commit 7e5cd680c3
2 changed files with 10 additions and 23 deletions

View File

@ -1,13 +1,13 @@
# #
# Chakra Packages for Chakra, part of chakra-project.org # Chakra Packages for Chakra, part of chakra-project.org
# #
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=kmod pkgname=kmod
pkgver=10 pkgver=11
pkgrel=1 pkgrel=1
pkgdesc="Linux kernel module handling" pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64') arch=('x86_64')
url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
license=('GPL2') license=('GPL2')
depends=('glibc' 'zlib') depends=('glibc' 'zlib')
@ -17,8 +17,8 @@ conflicts=('module-init-tools')
replaces=('module-init-tools') replaces=('module-init-tools')
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
"depmod-search.conf") "depmod-search.conf")
md5sums=('e2a883c4df15a50f78a7a61d5b64089f' md5sums=('607e33b0144625c2e5221e5a7df49c7a'
'285fc738c220ff84419995fc8c6d6ca1') '9ae9acc68ca27134f55a0959073b8e53')
build() { build() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
@ -30,9 +30,9 @@ build() {
make make
} }
check() { #check() {
make -C "$pkgname-$pkgver" check # make -C "$pkgname-$pkgver" check
} #}
package() { package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install

View File

@ -10,7 +10,7 @@ export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
post_install () { post_install () {
# updating module dependencies # updating module dependencies
echo ">>> Updating module dependencies. Please wait ..." echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION} depmod -b /usr ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME} mkinitcpio -p linux${KERNEL_NAME}
@ -33,19 +33,6 @@ post_upgrade() {
hasgrub=$? hasgrub=$?
pacman -Q grub2-common &>/dev/null pacman -Q grub2-common &>/dev/null
hasgrub2=$? hasgrub2=$?
pacman -Q lilo &>/dev/null
haslilo=$?
# reminder notices
if [ $haslilo -eq 0 ]; then
echo ">>>"
if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
else
echo ">>> You appear to be using the LILO bootloader. You should run"
echo ">>> 'lilo' before rebooting."
fi
echo ">>>"
fi
if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
echo "WARNING: /boot appears to be a separate partition but is not mounted." echo "WARNING: /boot appears to be a separate partition but is not mounted."
@ -53,7 +40,7 @@ post_upgrade() {
# updating module dependencies # updating module dependencies
echo ">>> Updating module dependencies. Please wait ..." echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION} depmod -b /usr ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME} mkinitcpio -p linux${KERNEL_NAME}
} }