[arch-commits] Commit in linux-hardened/trunk (3 files)

[Daniel Micay]

    Date: Monday, May 1, 2017 @ 04:01:14
  Author: thestinger
Revision: 226385

upgpkg: linux-hardened 4.10.13-2

add slab_nomerge

Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
Deleted:
  linux-hardened/trunk/linux.install.pkg

-------------------+
 PKGBUILD          |    4 ++--
 config.x86_64     |    2 +-
 linux.install.pkg |   27 ---------------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-01 00:57:08 UTC (rev 226384)
+++ PKGBUILD	2017-05-01 04:01:14 UTC (rev 226385)
@@ -6,7 +6,7 @@
 pkgbase=linux-hardened
 _srcname=linux-4.10
 pkgver=4.10.13
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -27,7 +27,7 @@
             'SKIP'
             'b1a7a98aa97cc0917fcab0def68032d5bf61838c79177b2222cee2485015458f'
             'SKIP'
-            '08a88a002ab2c5f9aec5c522b3dfc78291731d5b6ace50621f82831ee05a04f7'
+            '8473caa7014dcfc90fdc2a8412c944a3e0c1e858fd0fbf227585ff46f342e2e5'
             '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(

Modified: config.x86_64
===================================================================
--- config.x86_64	2017-05-01 00:57:08 UTC (rev 226384)
+++ config.x86_64	2017-05-01 04:01:14 UTC (rev 226385)
@@ -613,7 +613,7 @@
 # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="page_poison=1"
+CONFIG_CMDLINE="page_poison=1 slab_nomerge"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y

Deleted: linux.install.pkg
===================================================================
--- linux.install.pkg	2017-05-01 00:57:08 UTC (rev 226384)
+++ linux.install.pkg	2017-05-01 04:01:14 UTC (rev 226385)
@@ -1,27 +0,0 @@
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod 4.10.13-1-hardened
-}
-
-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 4.10.13-1-hardened
-
-  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
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-hardened.img
-  rm -f boot/initramfs-linux-hardened-fallback.img
-}