diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 99-linux.hook | 11 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | config.x86_64 | 11 | ||||
| -rw-r--r-- | linux.install | 18 | ||||
| -rw-r--r-- | linux.preset | 8 |
7 files changed, 53 insertions, 48 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Fri Nov 18 23:06:20 UTC 2016 +# Sun Nov 20 17:51:09 UTC 2016 pkgbase = linux-vfio - pkgver = 4.8.8 + pkgver = 4.8.9 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -16,21 +16,23 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.8.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.8.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.9.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.9.sign source = config source = config.x86_64 + source = 99-linux.hook source = linux.preset source = change-default-console-loglevel.patch source = 0001-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch source = 0001-i915-Add-module-option-to-support-VGA-arbiter-on-HD-.patch sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a sha256sums = SKIP - sha256sums = 588b6537cb660c2f7d483aca13f7509a5fc86c60df32c167d40e81d6c7ab4f9c + sha256sums = 9f3c1924080a16ac2b8f054aa9d0490bc0ee4c6159e2fd10e5f6732b2e9604f6 sha256sums = SKIP - sha256sums = fdb743ebd87f2a6dc3e654774cf2b57c58fc5bc8d0ab2c3b0d6b89277d2b2116 - sha256sums = 7e9e1c443aeba1c9b028493de13f0b170d99bedf876d1fbe2748b77c6fb24549 - sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c + sha256sums = 01dd9e64e4d5c2188fcbb5a48375c987b16f28f383fb42559a34e1a2c5a8ef2a + sha256sums = 4111ac3a567c2fccd56368c36dad29753c0df4eae721b4a475bae20dae76855a + sha256sums = 8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5 + sha256sums = 99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = d36c589e3866535a9ac92911be64795967a05a6d300cc8b70abb79ea24b7b393 sha256sums = 97c6eaff4dfd2059835351afa9466b43569f3eb45f6c57094f57a3f3fad7ec85 diff --git a/99-linux.hook b/99-linux.hook new file mode 100644 index 000000000000..04c78d792e2d --- /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% initcpio +When = PostTransaction +Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -3,7 +3,7 @@ pkgbase=linux-vfio _srcname=linux-4.8 -pkgver=4.8.8 +pkgver=4.8.9 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -16,6 +16,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" # the main kernel config files 'config' 'config.x86_64' + # pacman hook for initramfs regeneration + '99-linux.hook' # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' @@ -23,11 +25,12 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" '0001-i915-Add-module-option-to-support-VGA-arbiter-on-HD-.patch') sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a' 'SKIP' - '588b6537cb660c2f7d483aca13f7509a5fc86c60df32c167d40e81d6c7ab4f9c' + '9f3c1924080a16ac2b8f054aa9d0490bc0ee4c6159e2fd10e5f6732b2e9604f6' 'SKIP' - 'fdb743ebd87f2a6dc3e654774cf2b57c58fc5bc8d0ab2c3b0d6b89277d2b2116' - '7e9e1c443aeba1c9b028493de13f0b170d99bedf876d1fbe2748b77c6fb24549' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '01dd9e64e4d5c2188fcbb5a48375c987b16f28f383fb42559a34e1a2c5a8ef2a' + '4111ac3a567c2fccd56368c36dad29753c0df4eae721b4a475bae20dae76855a' + '8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5' + '99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' 'd36c589e3866535a9ac92911be64795967a05a6d300cc8b70abb79ea24b7b393' '97c6eaff4dfd2059835351afa9466b43569f3eb45f6c57094f57a3f3fad7ec85') @@ -122,21 +125,17 @@ _package() { cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # 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}" # 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" # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} @@ -562,7 +562,7 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y diff --git a/config.x86_64 b/config.x86_64 index 096b996b777f..0ab086cc0f19 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.8.0-1 Kernel Configuration +# Linux/x86 4.8.9-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -585,8 +585,11 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_RANDOMIZE_MEMORY=y +CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set @@ -7025,6 +7028,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y +CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set @@ -7603,7 +7607,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_KEYS=y CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y @@ -7646,7 +7649,7 @@ CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=m CONFIG_CRYPTO_AKCIPHER2=y diff --git a/linux.install b/linux.install index dd2fa5c7aac5..046277584140 100644 --- a/linux.install +++ b/linux.install @@ -1,15 +1,7 @@ -# 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${KERNEL_NAME} + depmod %KERNVER% } post_upgrade() { @@ -19,9 +11,7 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux${KERNEL_NAME} + depmod %KERNVER% if [ $(vercmp $2 3.13) -lt 0 ]; then echo ">>> WARNING: AT keyboard support is no longer built into the kernel." @@ -32,6 +22,6 @@ post_upgrade() { post_remove() { # also remove the compat symlinks - rm -f boot/initramfs-linux${KERNEL_NAME}.img - rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img + rm -f boot/initramfs-%PKGBASE%.img + rm -f boot/initramfs-%PKGBASE%-fallback.img } diff --git a/linux.preset b/linux.preset index b06292d104ef..54a729abec3f 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" |