summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordysphr@aur2015-07-27 07:25:22 +0100
committerdysphr@aur2015-07-27 07:25:22 +0100
commitb173f08edf89aabc0f6df23c0af20e9b1c6fc317 (patch)
treef67408b5de16059d9be1612eba8ea6c21f9756c4
parent9d5dfdaa078b4abfc02878c4216ea7bf053c3a15 (diff)
downloadaur-b173f08edf89aabc0f6df23c0af20e9b1c6fc317.tar.gz
Update and fix PKGBUILD
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD15
-rw-r--r--config19
-rw-r--r--config.x86_6419
4 files changed, 40 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 349f7788df03..35afcff1dd11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-lts-tomoyo
- pkgver = 3.14.44
+ pkgver = 3.14.48
pkgrel = 1
url = http://www.kernel.org/
arch = i686
@@ -15,8 +15,8 @@ pkgbase = linux-lts-tomoyo
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.44.xz
- source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.44.sign
+ source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.48.xz
+ source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.48.sign
source = config
source = config.x86_64
source = linux-lts-tomoyo.preset
@@ -28,10 +28,10 @@ pkgbase = linux-lts-tomoyo
source = gcc5_buildfixes.diff
sha256sums = 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa
sha256sums = SKIP
- sha256sums = 5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0
+ sha256sums = d654e53b889fd9244ce2ec9d8ab4cb5fe68d0c4ae6a49efa517850cbd22ebcd5
sha256sums = SKIP
- sha256sums = 999486d20e07e489bb42356b529b739c65ad65de9191282f0ddbbc0eb9b1718e
- sha256sums = 140098de1ba714c5916ea76578b8bf549ce801c4aa0c786b7c90289b85ecdb77
+ sha256sums = af6a452fcc11cfa6b538f4124b50381f1dc05ca20bf8dc336552fa7cc354bac3
+ sha256sums = b6f0f344773b51768ca53158a05a16e1328ad0def7b77ca0bce43211216e5cb1
sha256sums = 55f4f80d7cfe294d11f44c84ce8a20eaf698ca69667c660621a05472ada49f9a
sha256sums = faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182
sha256sums = 6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02
@@ -48,20 +48,20 @@ pkgname = linux-lts-tomoyo
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = kernel26-lts-tomoyo=3.14.44
+ provides = kernel26-lts-tomoyo=3.14.48
conflicts = kernel26-lts-tomoyo
replaces = kernel26-lts-tomoyo
backup = etc/mkinitcpio.d/linux-lts-tomoyo.preset
pkgname = linux-lts-tomoyo-headers
pkgdesc = Header files and scripts for building modules for Linux-lts-tomoyo kernel
- provides = kernel26-lts-tomoyo-headers=3.14.44
+ provides = kernel26-lts-tomoyo-headers=3.14.48
conflicts = kernel26-lts-tomoyo-headers
replaces = kernel26-lts-tomoyo-headers
pkgname = linux-lts-tomoyo-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-lts-tomoyo kernel
- provides = kernel26-lts-tomoyo-docs=3.14.44
+ provides = kernel26-lts-tomoyo-docs=3.14.48
conflicts = kernel26-lts-tomoyo-docs
replaces = kernel26-lts-tomoyo-docs
diff --git a/PKGBUILD b/PKGBUILD
index 2b108f130e0a..1a8b16f05a21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
# AUR/linux-lts-tomoyo PKGBUILD
# Maintainer: dysphr <>
#
+# arch/linux-lts PKGBUILD
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-lts-tomoyo
_srcname=linux-3.14
-pkgver=3.14.44
+pkgver=3.14.48
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -30,10 +31,10 @@ source=(https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.{xz,sign}
# https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
'SKIP'
- '5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0'
+ 'd654e53b889fd9244ce2ec9d8ab4cb5fe68d0c4ae6a49efa517850cbd22ebcd5'
'SKIP'
- '999486d20e07e489bb42356b529b739c65ad65de9191282f0ddbbc0eb9b1718e'
- '140098de1ba714c5916ea76578b8bf549ce801c4aa0c786b7c90289b85ecdb77'
+ 'af6a452fcc11cfa6b538f4124b50381f1dc05ca20bf8dc336552fa7cc354bac3'
+ 'b6f0f344773b51768ca53158a05a16e1328ad0def7b77ca0bce43211216e5cb1'
'55f4f80d7cfe294d11f44c84ce8a20eaf698ca69667c660621a05472ada49f9a'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
'6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
@@ -84,6 +85,12 @@ prepare() {
cat "${srcdir}/config" > ./.config
fi
+ # Enable TOMOYO Linux
+ msg "Enabling TOMOYO Linux..."
+ sed -i -e 's:# CONFIG_SECURITY_TOMOYO is not set:CONFIG_SECURITY_TOMOYO=y\nCONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048\nCONFIG_SECURITY_TOMYO_MAX_AUDIT_LOG=1024\n# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set\nCONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"\nCONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init":' \
+ -i -e 's/CONFIG_DEFAULT_SECURITY_DAC=y/# CONFIG_DEFAULT_DAC is not set/' \
+ -i -e '/CONFIG_DEFAULT_SECURITY/ s,"","tomoyo",' ./.config
+
if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
diff --git a/config b/config
index 52c0ef1c602c..2cb8a40e3ab7 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.21-1 Kernel Configuration
+# Linux/x86 3.14.48-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -407,6 +407,7 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -748,6 +749,7 @@ CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_MISC=y
CONFIG_COREDUMP=y
CONFIG_HAVE_ATOMIC_IOMAP=y
+# CONFIG_IOSF_MBI is not set
CONFIG_NET=y
#
@@ -1871,7 +1873,7 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5641,22 +5643,21 @@ CONFIG_FB_OLPC_DCON=m
CONFIG_FB_OLPC_DCON_1=y
CONFIG_FB_OLPC_DCON_1_5=y
# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
CONFIG_RTL8192U=m
CONFIG_RTLLIB=m
CONFIG_RTLLIB_CRYPTO_CCMP=m
CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
CONFIG_R8188EU=m
CONFIG_88EU_AP_MODE=y
CONFIG_88EU_P2P=y
CONFIG_R8821AE=m
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
-# CONFIG_RTS5208_DEBUG is not set
+# CONFIG_RTS5208 is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
@@ -5665,8 +5666,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
CONFIG_FB_SM7XX=m
CONFIG_CRYSTALHD=m
CONFIG_FB_XGI=m
diff --git a/config.x86_64 b/config.x86_64
index 68ebc833de5f..55f95494414a 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.21-1 Kernel Configuration
+# Linux/x86 3.14.48-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -405,6 +405,7 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -732,6 +733,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y
+# CONFIG_IOSF_MBI is not set
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -1835,7 +1837,7 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5430,22 +5432,21 @@ CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
CONFIG_RTL8192U=m
CONFIG_RTLLIB=m
CONFIG_RTLLIB_CRYPTO_CCMP=m
CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
CONFIG_R8188EU=m
CONFIG_88EU_AP_MODE=y
CONFIG_88EU_P2P=y
CONFIG_R8821AE=m
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
-# CONFIG_RTS5208_DEBUG is not set
+# CONFIG_RTS5208 is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
@@ -5454,8 +5455,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
CONFIG_FB_SM7XX=m
CONFIG_CRYSTALHD=m
CONFIG_FB_XGI=m