summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch2
-rw-r--r--0002-Arch-Linux-kernel-v4.18.16-arch1.patch6
-rw-r--r--PKGBUILD12
-rw-r--r--config18
5 files changed, 26 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9706750433c..992286a667c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Oct 20 10:52:19 UTC 2018
+# Sun Oct 28 11:29:30 UTC 2018
pkgbase = linux-ck
pkgver = 4.18.16
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -17,22 +17,22 @@ pkgbase = linux-ck
source = 60-linux.hook
source = 90-linux.hook
source = linux.preset
- source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
+ source = enable_additional_cpu_optimizations-20181028.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20181028.tar.gz
source = http://ck.kolivas.org/patches/4.0/4.18/4.18-ck1/patch-4.18-ck1.xz
source = Fix_MuQSS_full_dynticks_build.patch::https://github.com/ckolivas/linux/commit/abb4fd30fa127a0e8178b975343eb01713bc2b18.patch
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
source = 0002-Arch-Linux-kernel-v4.18.16-arch1.patch
sha256sums = beba14e2f07259a545baa1dce5afdaf9f470cdadc8b378ac269e7c8a289c52e6
sha256sums = SKIP
- sha256sums = 9f2454dae08fbd96059fe79ec05933d724cd2c9b383f5be092c7871ac1551649
+ sha256sums = e7cdbc0e95cf918c35fdb1075f73bcfacc3cde0fcc58f8b54a3a532a6d1b80da
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
- sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d
+ sha256sums = 1cc4d20e546fb6bf70c63202d6ec213c115048ebcb64f4d79a48eb1034bcf383
sha256sums = 0354083492adb3785dd31d2d4bf7dc805110aceffb369deed6cbded121f8a3d3
sha256sums = 6e1f3cc3eb9a1e30a69ef1999f9aa6ad7f2f9fe4af7ba5dabe25d4ff19ee6740
- sha256sums = 559d8c51d6e965179ca44b93cff101f31fafb49b0e8d7f9a7e97fc4b77a721f9
- sha256sums = 339ac8509f1533c47dde9b01aaa4a53ac1d50df0541ce4ab58bad9f5666621ca
+ sha256sums = 1f5fe837d5843e3016e86b10e165e8cb1691609cfdc5f5a0eb8c9cd29c2a0113
+ sha256sums = bdae9e024cb5997668c7287591feee56a115a1afea86e25b4eeb7f73be19ca5e
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.173
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 0c74fc21dc7..6816bd877d3 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,4 +1,4 @@
-From acf2f476d7be0ce0c6bbf2202d2a19163b7f27db Mon Sep 17 00:00:00 2001
+From 1bb02fd90bbdccff0de558ad302efd514e129bd6 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by
diff --git a/0002-Arch-Linux-kernel-v4.18.16-arch1.patch b/0002-Arch-Linux-kernel-v4.18.16-arch1.patch
index c39fcebdd9f..8a7e0c5703c 100644
--- a/0002-Arch-Linux-kernel-v4.18.16-arch1.patch
+++ b/0002-Arch-Linux-kernel-v4.18.16-arch1.patch
@@ -1,6 +1,6 @@
-From ac85e40261a431bbeaf1d3706c78334b3e1afff2 Mon Sep 17 00:00:00 2001
+From a8e159be08f2c7aeaeb727272058c9f3d4524f02 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 18 Oct 2018 10:19:30 +0200
+Date: Sat, 20 Oct 2018 23:56:57 +0200
Subject: [PATCH 2/2] Arch Linux kernel v4.18.16-arch1
---
@@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Arch Linux kernel v4.18.16-arch1
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 968eb96a0553..c5cb34af6490 100644
+index 034dd990b0ae..4b044647e7c0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
diff --git a/PKGBUILD b/PKGBUILD
index 6be6e05c85a..1be07cb005e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,7 +71,7 @@ _localmodcfg=
pkgbase=linux-ck
_srcver=4.18.16-arch1
pkgver=${_srcver%-*}
-pkgrel=1
+pkgrel=2
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -79,7 +79,7 @@ license=(GPL2)
makedepends=(kmod inetutils bc libelf)
options=('!strip')
_ckpatchname="patch-4.18-ck${_ckpatchversion}"
-_gcc_more_v='20180509'
+_gcc_more_v='20181028'
source=(
"https://www.kernel.org/pub/linux/kernel/v4.x/linux-$pkgver.tar".{xz,sign}
config # the main kernel config file
@@ -98,15 +98,15 @@ validpgpkeys=(
)
sha256sums=('beba14e2f07259a545baa1dce5afdaf9f470cdadc8b378ac269e7c8a289c52e6'
'SKIP'
- '9f2454dae08fbd96059fe79ec05933d724cd2c9b383f5be092c7871ac1551649'
+ 'e7cdbc0e95cf918c35fdb1075f73bcfacc3cde0fcc58f8b54a3a532a6d1b80da'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
- '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
+ '1cc4d20e546fb6bf70c63202d6ec213c115048ebcb64f4d79a48eb1034bcf383'
'0354083492adb3785dd31d2d4bf7dc805110aceffb369deed6cbded121f8a3d3'
'6e1f3cc3eb9a1e30a69ef1999f9aa6ad7f2f9fe4af7ba5dabe25d4ff19ee6740'
- '559d8c51d6e965179ca44b93cff101f31fafb49b0e8d7f9a7e97fc4b77a721f9'
- '339ac8509f1533c47dde9b01aaa4a53ac1d50df0541ce4ab58bad9f5666621ca')
+ '1f5fe837d5843e3016e86b10e165e8cb1691609cfdc5f5a0eb8c9cd29c2a0113'
+ 'bdae9e024cb5997668c7287591feee56a115a1afea86e25b4eeb7f73be19ca5e')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
diff --git a/config b/config
index 9de26ae20b9..0a417a0634b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.10 Kernel Configuration
+# Linux/x86 4.18.16 Kernel Configuration
#
#
@@ -1379,8 +1379,8 @@ CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m
CONFIG_NF_REJECT_IPV4=m
CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NFT_MASQ_IPV4=m
CONFIG_NFT_REDIR_IPV4=m
CONFIG_NF_NAT_SNMP_BASIC=m
@@ -7472,18 +7472,18 @@ CONFIG_UIO_NETX=m
CONFIG_UIO_PRUSS=m
CONFIG_UIO_MF624=m
CONFIG_UIO_HV_GENERIC=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=y
+CONFIG_VFIO_VIRQFD=y
+CONFIG_VFIO=y
# CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI=y
CONFIG_VFIO_PCI_VGA=y
CONFIG_VFIO_PCI_MMAP=y
CONFIG_VFIO_PCI_INTX=y
CONFIG_VFIO_PCI_IGD=y
-CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VFIO_MDEV=y
+CONFIG_VFIO_MDEV_DEVICE=y
+CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VBOXGUEST=m
CONFIG_VIRTIO=m