summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Bidar2020-06-16 11:49:25 +0200
committerBjörn Bidar2020-06-17 22:28:28 +0200
commit959dd4ede7caec561bc1241e15dae3b8720b45cf (patch)
tree5d2e5835e41fae27dc0ed95c24b0c7c08c56f60e
parente98508c9b2584c56126fe9bd260215de277b788f (diff)
downloadaur-959dd4ede7caec561bc1241e15dae3b8720b45cf.tar.gz
Upkg
- New upstream release - Use the same naming scheme that the vanilla arch kernel does - Update BMQ scheudler
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD26
2 files changed, 24 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6ed0d1de11..e380356d432 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun May 31 11:48:20 UTC 2020
+# Wed Jun 17 20:28:12 UTC 2020
pkgbase = linux-pf
pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS).
- pkgver = 5.6.8
+ pkgver = 5.7.2.pf2
pkgrel = 1
url = https://gitlab.com/post-factum/pf-kernel/wikis/README
arch = i686
@@ -16,22 +16,22 @@ pkgbase = linux-pf
makedepends = kmod
makedepends = elfutils
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
source = config.x86_64
source = config.i686
source = pf_defconfig
source = linux.preset
- source = https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf8.diff
- source = https://gitlab.com/alfredchen/bmq/-/raw/master/5.6/bmq_v5.6-r4.patch
+ source = https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf2.diff
+ source = https://gitlab.com/alfredchen/bmq/-/raw/master/5.7/bmq_v5.7-r1.patch
source = 90-linux.hook
source = 60-linux.hook
- sha256sums = e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622
+ sha256sums = de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0
sha256sums = e78bfa9f5a1065d93396a37d59043bd79805f4681df27ef44dcddea8de092818
sha256sums = 35b1eea04b02c8072568bce49468eb8487e1217a0f5a3cd979cff9af569ab2ef
sha256sums = 59008ddd377115e3ecba7dd33fa04be709cbfe1ef104a7d462b5ed01e04a04b7
sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
- sha256sums = 8fe1e28fabfe46683bd70372e2b1c7b6aeabd68d996c9db4e456f8b52a5e7b43
- sha256sums = 1b95d36635c7dc48ce45a33d6b1f4eb6d34f51600901395d28fd22f28daee8e9
+ sha256sums = 2c3a80e1a0e5c90e05d8f03d8c11853f47f7d3e61afb324095e883691a5f74ec
+ sha256sums = 9cf60ec74848ef807fc97e1c0f4bccca73ec65763a2adefa6758a4f7c0f243a7
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -51,7 +51,7 @@ pkgname = linux-pf
optdepends = uksmd: Userspace KSM helper daemon
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.
provides = linux-tomoyo
- provides = linux-pf=5.6.8
+ provides = linux-pf=5.7.2.pf2
conflicts = linux-pf
replaces = kernel26-pf
@@ -61,7 +61,7 @@ pkgname = linux-pf-headers
pkgname = linux-pf-preset-default
pkgdesc = Linux-pf default preset
install = linux.install
- depends = linux-pf=5.6.8
- provides = linux-pf-preset=5.6.8
+ depends = linux-pf=5.7.2.pf2
+ provides = linux-pf-preset=5.7.2.pf2
backup = etc/mkinitcpio.d/linux-pf.preset
diff --git a/PKGBUILD b/PKGBUILD
index ffe31f3cffa..3566ba8b6f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -56,17 +56,18 @@ _BATCH_MODE=n # enable batch mode
##
_major=5
-_minor=6
+_minor=7
#_patchlevel=0
#_subversion=1
_basekernel=${_major}.${_minor}
_srcname=linux-${_basekernel}
pkgbase=linux-pf
-_pfrel=8
-_kernelname=-pf
+_unpatched_sublevel=2
+_pfrel=2
+_kernelname=pf
_pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
_pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
-_bmppatchname=bmq_v5.6-r4.patch
+_bmppatchname=bmq_v5.7-r1.patch
_CPUSUFFIXES_KBUILD=(
CORE2 K7 K8 K10 BARCELONA BOBCAT BULLDOZER PILEDRIVER PSC
ATOM PENTIUMII PENTIUMIII PENTIUMM PENTIUM4 NEHALEM SANDYBRIDGE
@@ -74,7 +75,7 @@ _CPUSUFFIXES_KBUILD=(
pkgname=('linux-pf')
pkgdesc="Linux kernel and modules with the pf-kernel patch (uksm, PDS)."
pkgname=('linux-pf' 'linux-pf-headers' 'linux-pf-preset-default')
-pkgver=${_basekernel}.${_pfrel}
+pkgver=${_basekernel}.${_unpatched_sublevel}.${_kernelname}${_pfrel}
pkgrel=1
arch=('i686' 'x86_64')
url="https://gitlab.com/post-factum/pf-kernel/wikis/README"
@@ -127,10 +128,9 @@ prepare() {
cat "${startdir}/config.i686" >| .config
fi
- sed -ri "s|SUBLEVEL = 0|SUBLEVEL = $_pfrel|" Makefile
+ # Restore unpatched sublevel the current -pf is based on
+ sed -ri "s|SUBLEVEL = 0|SUBLEVEL = $_unpatched_sublevel|" Makefile
- # Set EXTRAVERSION to -pf
- sed -ri "s|^(EXTRAVERSION =).*|\1|" Makefile
_arch=$CARCH
@@ -302,7 +302,7 @@ build() {
# Strip config of uneeded localversion
if [ "${_kernelname}" != "" ]; then
- sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+ sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-${_kernelname}\"|g" ./.config
sed -i "s/CONFIG_LOCALVERSION_AUTO=.*/CONFIG_LOCALVERSION_AUTO=n/" ./.config
fi
@@ -460,7 +460,7 @@ _package() {
# make room for external modules
- local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}"
+ local _extramodules="extramodules-${_basekernel}-${_kernelname:-ARCH}"
ln -s "../${_extramodules}" \
"${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
@@ -656,13 +656,13 @@ eval "package_linux-pf${LCPU+-$LCPU}() {
}"
-sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
+sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0'
'e78bfa9f5a1065d93396a37d59043bd79805f4681df27ef44dcddea8de092818'
'35b1eea04b02c8072568bce49468eb8487e1217a0f5a3cd979cff9af569ab2ef'
'59008ddd377115e3ecba7dd33fa04be709cbfe1ef104a7d462b5ed01e04a04b7'
'82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
- '8fe1e28fabfe46683bd70372e2b1c7b6aeabd68d996c9db4e456f8b52a5e7b43'
- '1b95d36635c7dc48ce45a33d6b1f4eb6d34f51600901395d28fd22f28daee8e9'
+ '2c3a80e1a0e5c90e05d8f03d8c11853f47f7d3e61afb324095e883691a5f74ec'
+ '9cf60ec74848ef807fc97e1c0f4bccca73ec65763a2adefa6758a4f7c0f243a7'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21')
# vim:set ts=2 sw=2 tw=0 et: