core/linux-kirkwood: /usr/lib changes, various fixes, added .install warning

core/linux-kirkwood/PKGBUILD

@@ -1,8 +1,7 @@
 # Maintainer: Mike Staszel <mikestaszel@plugapps.com>
 # Maintainer: Kevin Mihelich <kevin@plugapps.com>
 
-noautobuild=1
-plugrel=1
+buildarch=2
 
 pkgbase=linux
 pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
@@ -20,7 +19,7 @@ options=('!strip')
 source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
         'archlinuxarm.patch'
         'support.patch'
-	'aufs3-3.4.patch.xz'
+        'aufs3-3.4.patch.xz'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'change-default-console-loglevel.patch'
@@ -29,7 +28,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
 md5sums=('59a21893b7a410a83328d38e094cd386'
          'cb59c253388108d0a1d4ab33167847e1'
          'f5d3635da03cb45904bedd69b47133de'
-	 '852ba24ebd20ca85f8bbee03243ccf91'
+         '852ba24ebd20ca85f8bbee03243ccf91'
          '4cf4bf5db2acb94a5b73fb7e2047c369'
          'c4cec78edaae21d7faab6fc75b1101dd'
          '9d3c56a4b999c8bfbd4018089a62f662'
@@ -64,6 +63,9 @@ build() {
   # set extraversion to pkgrel
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+
   # get kernel version
   make prepare
 
@@ -96,13 +98,12 @@ build() {
 }
 
 package_linux-kirkwood() {
-  pkgdesc="The Linux Kernel and modules"
+  pkgdesc="The Linux Kernel and modules - Marvell Kirkwood"
   groups=('base')
   depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' 'aufs_friendly' 'cryptodev_friendly')
-  conflicts=('kernel26')
-  replaces=('kernel26')
+  provides=('kernel26' 'aufs_friendly' 'cryptodev_friendly' 'linux=${pkgver}')
+  conflicts=('linux')
   install=${pkgname}.install
 
   cd "${srcdir}/linux-${_basekernel}"
@@ -137,18 +138,26 @@ package_linux-kirkwood() {
   # install cryptodev module
   cd "${srcdir}/cryptodev-linux-${cryptover}"
   make -C "${srcdir}/linux-${_basekernel}" INSTALL_MOD_PATH="${pkgdir}" SUBDIRS=`pwd` modules_install
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "$pkgdir/lib" "$pkgdir/usr"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
 }
 
 package_linux-headers-kirkwood() {
-  pkgdesc="Header files and scripts for building modules for linux kernel"
-  provides=('kernel26-headers')
-  conflicts=('kernel26-headers')
-  replaces=('kernel26-headers')
+  pkgdesc="Header files and scripts for building modules for linux kernel - Marvell Kirkwood"
+  provides=('kernel26-headers' 'linux-headers=${pkgver}')
+  conflicts=('kernel26-headers' 'linux-headers')
 
-  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
 
   cd "${srcdir}/linux-${_basekernel}"
   install -D -m644 Makefile \

core/linux-kirkwood/linux-kirkwood.install

@@ -8,6 +8,12 @@ post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
+
+  echo "**********************************************************************"
+  echo "WARNING! This kernel requires a newer U-Boot than many devices such as"
+  echo "         the Dockstar and Pogoplug v2 originally came with. If you do"
+  echo "         not have an updated version, your system WILL NOT BOOT."
+  echo "**********************************************************************"
 }
 
 post_upgrade() {
@@ -21,4 +27,10 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
+
+  echo "**********************************************************************"
+  echo "WARNING! This kernel requires a newer U-Boot than many devices such as"
+  echo "         the Dockstar and Pogoplug v2 originally came with. If you do"
+  echo "         not have an updated version, your system WILL NOT BOOT."
+  echo "**********************************************************************"
 }