Update to 4.8.10_gnu-1

5 files changed, 62 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a0f96138729..0aab07eea398 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sat Nov 19 02:13:07 UTC 2016
+# Sat Nov 26 14:40:48 UTC 2016
 pkgbase = linux-libre-xen
-	pkgver = 4.8.8_gnu
+	pkgver = 4.8.10_gnu
 	pkgrel = 1
 	url = http://linux-libre.fsfla.org/
 	arch = i686
@@ -16,8 +16,8 @@ pkgbase = linux-libre-xen
 	options = !strip
 	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8-gnu/linux-libre-4.8-gnu.tar.xz
 	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8-gnu/linux-libre-4.8-gnu.tar.xz.sign
-	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8.8-gnu/patch-4.8-gnu-4.8.8-gnu.xz
-	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8.8-gnu/patch-4.8-gnu-4.8.8-gnu.xz.sign
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8.10-gnu/patch-4.8-gnu-4.8.10-gnu.xz
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.8.10-gnu/patch-4.8-gnu-4.8.10-gnu.xz.sign
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm
@@ -26,12 +26,13 @@ pkgbase = linux-libre-xen
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig
 	source = config.i686
 	source = config.armv7h
+	source = 99-linux.hook
 	source = linux.preset
 	source = change-default-console-loglevel.patch
 	source = 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
 	source = 0002-fix-Atmel-maXTouch-touchscreen-support.patch
-	source = https://repo.parabola.nu/other/rcn-libre/patches/4.8.8/rcn-libre-4.8.8-armv7-x4.patch
-	source = https://repo.parabola.nu/other/rcn-libre/patches/4.8.8/rcn-libre-4.8.8-armv7-x4.patch.sig
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.8.10/rcn-libre-4.8.10-armv7-x4.patch
+	source = https://repo.parabola.nu/other/rcn-libre/patches/4.8.10/rcn-libre-4.8.10-armv7-x4.patch.sig
 	source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
 	source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
 	source = 0003-SMILE-Plug-device-tree-file.patch
@@ -47,7 +48,7 @@ pkgbase = linux-libre-xen
 	source = 0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch
 	sha256sums = d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a
 	sha256sums = SKIP
-	sha256sums = e181d8175cbcda285b9c8864887907a89405517f00c12b0367c9717e2804a6a0
+	sha256sums = 1582cc01f7c10fdb24a15d884e6d3c24331f54dcbe6dcae0e5ca8b58955dce0c
 	sha256sums = SKIP
 	sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
 	sha256sums = SKIP
@@ -57,11 +58,12 @@ pkgbase = linux-libre-xen
 	sha256sums = SKIP
 	sha256sums = ffc0fb9c1c7549a56f6e24c2fe26fd11eb4f1d0b9d551bbab52295693ef51ef3
 	sha256sums = ebe6b762ae1abadca576b942da26c7a593a1716b4bfbd5d4de84904834f693ed
-	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
+	sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
+	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3
 	sha256sums = 351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25
-	sha256sums = b0c2eb167174fea7dc1e2a760cb10e787ca911160c6e30480cc87657716b71f0
+	sha256sums = 7bc2f17f96bc885b76cc2158c5e1d18989292792f6ca06f0610bcb5e572b3e7d
 	sha256sums = SKIP
 	sha256sums = 858eac5f4aadb7a4157a36b31d101d75d841a9c58199e580201d8305356044e3
 	sha256sums = eee25f5fa6e6b0fb3d5ab913521af67adf788b8613cad1b6d38711261f70646f
@@ -85,20 +87,20 @@ pkgname = linux-libre-xen
 	depends = linux-libre-firmware
 	depends = kmod
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-xen=4.8.8
+	provides = linux-xen=4.8.10
 	conflicts = 
 	replaces = 
 	depends_i686 = mkinitcpio>=0.7
 
 pkgname = linux-libre-xen-headers
 	pkgdesc = Header files and scripts for building modules for Linux-libre-xen kernel
-	provides = linux-xen-headers=4.8.8
+	provides = linux-xen-headers=4.8.10
 	conflicts = 
 	replaces = 
 
 pkgname = linux-libre-xen-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre-xen kernel
-	provides = linux-xen-docs=4.8.8
+	provides = linux-xen-docs=4.8.10
 	conflicts = 
 	replaces = 
 
diff --git a/99-linux.hook b/99-linux.hook
new file mode 100644
index 000000000000..9851151995bc
--- /dev/null
+++ b/99-linux.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-%PKGBASE%
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating %PKGBASE% initcpios
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p %PKGBASE%
diff --git a/PKGBUILD b/PKGBUILD
index a4f16db65cf7..c21ab2497954 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgbase=linux-libre-xen
 _pkgbasever=4.8-gnu
-_pkgver=4.8.8-gnu
+_pkgver=4.8.10-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -39,6 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig"
         # the main kernel config files
         'config.i686' 'config.armv7h'
+        # pacman hook for initramfs regeneration
+        '99-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
@@ -62,7 +64,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch')
 sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
             'SKIP'
-            'e181d8175cbcda285b9c8864887907a89405517f00c12b0367c9717e2804a6a0'
+            '1582cc01f7c10fdb24a15d884e6d3c24331f54dcbe6dcae0e5ca8b58955dce0c'
             'SKIP'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             'SKIP'
@@ -72,11 +74,12 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
             'SKIP'
             'ffc0fb9c1c7549a56f6e24c2fe26fd11eb4f1d0b9d551bbab52295693ef51ef3'
             'ebe6b762ae1abadca576b942da26c7a593a1716b4bfbd5d4de84904834f693ed'
-            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+            '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
+            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3'
             '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25'
-            'b0c2eb167174fea7dc1e2a760cb10e787ca911160c6e30480cc87657716b71f0'
+            '7bc2f17f96bc885b76cc2158c5e1d18989292792f6ca06f0610bcb5e572b3e7d'
             'SKIP'
             '858eac5f4aadb7a4157a36b31d101d75d841a9c58199e580201d8305356044e3'
             'eee25f5fa6e6b0fb3d5ab913521af67adf788b8613cad1b6d38711261f70646f'
@@ -221,22 +224,18 @@ _package() {
   fi
 
   # set correct depmod command for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \
+    "${startdir}/${install}" > "${startdir}/${install}.pkg"
   true && install=${install}.pkg
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${install}"
 
   if [ "${CARCH}" = "i686" ]; then
     # install mkinitcpio preset file for kernel
-    install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-    sed \
-      -e "1s|'linux.*'|'${pkgbase}'|" \
-      -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
-      -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
-      -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-      -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+    sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
+      install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+    # install pacman hook for initramfs regeneration
+    sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+      install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
   fi
 
   # remove build and source links
diff --git a/linux.install b/linux.install
index 70e177ef29f8..97a2a81331c5 100644
--- a/linux.install
+++ b/linux.install
@@ -1,37 +1,33 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=
-
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  depmod %KERNVER%
+  if [ "$(uname -m)" = "armv7l" ]; then
+    echo ">>> WARNING: Using this kernel requires an updated U-Boot!"
+  fi
 }
 
 post_upgrade() {
-  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."
-  fi
-
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-  mkinitcpio -p linux-libre${KERNEL_NAME}
+  depmod %KERNVER%
+  if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; 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."
+    fi
 
-  if [ $(vercmp $2 3.13) -lt 0 ]; then
-    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
-    echo ">>>          In order to use your keyboard during early init, you MUST"
-    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+    if [ $(vercmp $2 3.13) -lt 0 ]; then
+      echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+      echo ">>>          In order to use your keyboard during early init, you MUST"
+      echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+    fi
   fi
 }
 
+if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-%PKGBASE%.img
+  rm -f boot/initramfs-%PKGBASE%-fallback.img
 }
+fi
diff --git a/linux.preset b/linux.preset
index b06292d104ef..66709a8c1537 100644
--- a/linux.preset
+++ b/linux.preset
@@ -1,14 +1,14 @@
-# mkinitcpio preset file for the 'linux' package
+# mkinitcpio preset file for the '%PKGBASE%' package
 
 ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux"
+ALL_kver="/boot/vmlinuz-%PKGBASE%"
 
 PRESETS=('default' 'fallback')
 
 #default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux.img"
+default_image="/boot/initramfs-%PKGBASE%.img"
 #default_options=""
 
 #fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback.img" 
+fallback_image="/boot/initramfs-%PKGBASE%-fallback.img"
 fallback_options="-S autodetect"