summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO11
-rw-r--r--99-linux-pf.hook11
-rw-r--r--PKGBUILD14
-rw-r--r--config2
-rw-r--r--config.x86_644
5 files changed, 30 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16c7b9b1d990..4f2a9861577d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Nov 12 14:29:31 UTC 2016
+# Fri Nov 18 22:35:53 UTC 2016
pkgbase = linux-pf
pkgdesc = Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS included), TuxOnIce, BFQ], uksm and aufs3
pkgver = 4.8.7
- pkgrel = 1
+ pkgrel = 2
url = http://pf.natalenko.name/
arch = i686
arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = linux-pf
makedepends = xz
makedepends = bc
makedepends = kmod
+ makedepends = elfutils
options = !strip
source = ftp://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz
source = config
@@ -23,14 +24,16 @@ pkgbase = linux-pf
source = http://pf.natalenko.name/sources/4.8/patch-4.8-pf7.xz
source = git+https://github.com/sfjro/aufs4-standalone#branch=aufs4.8
source = uksm-4.8.patch::http://kerneldedup.org/download/uksm/0.1.2.5/uksm-0.1.2.5-for-v4.8.patch
+ source = 99-linux-pf.hook
sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
- sha256sums = ce79aa721ea22a6368fbfa7769a3dbbb16d2c0e081bcbde693f7ea98a63519a6
- sha256sums = a44b0f6396fa50e73653ccb8cf66db037770087f075154f5a72fd605f09eaa9c
+ sha256sums = 3f1dd3cca72f2a2d5ba3a22cf10c21dc8221fa7109c689fcb4d2e76601109139
+ sha256sums = e6c3945cdb40d98099433ba508fc87075a4aad541d5001d20565a29ef9d3597f
sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
sha256sums = 83c67ff48689bb083e44b9cee1c5b67226bf887589081548e81d93a71a6dcf70
sha256sums = SKIP
sha256sums = 4473dbed2a84f4e81cc1e11ae5f8f72d076fa210d45e956d1967f96b6aa87a6d
+ sha256sums = df07e00e8581fe282a5b92be9ee9bb37910eae3d2cc43eeb41df736b9f531f02
pkgname = linux-pf
pkgdesc = Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS included), TuxOnIce, BFQ] and aufs3
diff --git a/99-linux-pf.hook b/99-linux-pf.hook
new file mode 100644
index 000000000000..fe2eec1e8fe7
--- /dev/null
+++ b/99-linux-pf.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-linux-pf
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating Arch Linux-pf initramfs image
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p linux-pf
diff --git a/PKGBUILD b/PKGBUILD
index 13585a4df1c8..992802e18ca8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,12 +72,12 @@ _BATCH_MODE=n
pkgname=('linux-pf')
true && pkgname=('linux-pf' 'linux-pf-headers' 'linux-pf-preset-default')
pkgver=${_basekernel}.${_pfrel}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://pf.natalenko.name/"
license=('GPL2')
options=('!strip')
-makedepends=('git' 'xmlto' 'docbook-xsl' 'xz' 'bc' 'kmod')
+makedepends=('git' 'xmlto' 'docbook-xsl' 'xz' 'bc' 'kmod' 'elfutils')
source=("ftp://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekernel}.tar.xz"
'config' 'config.x86_64' # the main kernel config files
'linux.preset' # standard config files for mkinitcpio ramdisk
@@ -85,6 +85,7 @@ source=("ftp://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekernel}
"${_pfpatchhome}${_pfpatchname}.xz" # the -pf patchset
"git+$_aufs3#branch=aufs$_major.$_minor"
"uksm-$_major.$_minor.patch"::"http://kerneldedup.org/download/uksm/0.1.2.5/uksm-0.1.2.5-for-v$_major.$_minor.patch"
+ "99-linux-pf.hook"
)
# 'cx23885_move_CI_AC_registration_to_a_separate_function.patch'
@@ -689,6 +690,8 @@ package_linux-pf-preset-default()
# install fallback mkinitcpio.conf file and preset file for kernel
install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+ install -D -m644 "${srcdir}/99-linux-pf.hook" "${pkgdir}/usr/share/libalpm/hooks/99-linux-pf.hook"
+
# set correct depmod command for install
#sed \
# -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
@@ -706,10 +709,11 @@ pkgdesc="Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS in
# makepkg -g >>PKGBUILD
sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
- 'ce79aa721ea22a6368fbfa7769a3dbbb16d2c0e081bcbde693f7ea98a63519a6'
- 'a44b0f6396fa50e73653ccb8cf66db037770087f075154f5a72fd605f09eaa9c'
+ '3f1dd3cca72f2a2d5ba3a22cf10c21dc8221fa7109c689fcb4d2e76601109139'
+ 'e6c3945cdb40d98099433ba508fc87075a4aad541d5001d20565a29ef9d3597f'
'82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'83c67ff48689bb083e44b9cee1c5b67226bf887589081548e81d93a71a6dcf70'
'SKIP'
- '4473dbed2a84f4e81cc1e11ae5f8f72d076fa210d45e956d1967f96b6aa87a6d')
+ '4473dbed2a84f4e81cc1e11ae5f8f72d076fa210d45e956d1967f96b6aa87a6d'
+ 'df07e00e8581fe282a5b92be9ee9bb37910eae3d2cc43eeb41df736b9f531f02')
diff --git a/config b/config
index 17f3bffc4068..50eef72cde80 100644
--- a/config
+++ b/config
@@ -584,7 +584,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 1fcafeff4d9c..bb9431650ab2 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -592,8 +592,8 @@ CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_KEXEC_JUMP=y
CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RELOCATABLE=
+CONFIG_RANDOMIZE_BASE=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set