summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch13
-rw-r--r--kernels/linux-libre-rt/PKGBUILD11
-rw-r--r--kernels/linux-libre-rt/config.armv7h2
3 files changed, 22 insertions, 4 deletions
diff --git a/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch b/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch
new file mode 100644
index 000000000..e02d20b01
--- /dev/null
+++ b/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b03f266..f3fadc9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -391,7 +391,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__
+
+ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+ -fno-strict-aliasing -fno-common \
+- -Werror-implicit-function-declaration \
++ -Wno-implicit-function-declaration \
+ -Wno-format-security \
+ -std=gnu89
+
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 5e4ad2f6e..1f73b09ff 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-libre-rt
_pkgbasever=4.6-gnu
_pkgver=4.6.7-gnu
_rtbasever=4.6
-_rtpatchver=rt12
+_rtpatchver=rt13
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -51,6 +51,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch.sig"
+ '0001-ARM-disable-implicit-function-declaration-error.patch'
'0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
'0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
'0003-SMILE-Plug-device-tree-file.patch'
@@ -63,7 +64,7 @@ sha256sums=('c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8'
'SKIP'
'2eb81e54aa5133159040ca5ce9ace126181ad75e7f832d0821f331d4a7a24d3d'
'SKIP'
- '33afdc9ab502da888b38fe59b64f9c7caa0c2781148f4c8ba883ffd6a58eb472'
+ '18240a6d6f2c853a5cffe3a2051c7b7f9d6ac5ae2d8001a19db139c063da0464'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -73,13 +74,14 @@ sha256sums=('c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8'
'SKIP'
'f82fc9e36dccff9bc761f3d4801ca78c8da08d269acdabc62b0c5c7b01356886'
'55aa06cb017dbbeb13b1da1bb124c479aadfa60b40957f25579a1a84db94f791'
- '54aa1af5dc301d8f8990608dcec0433518049564fb157bcacca17016a10a8e5e'
+ '45930d28f4e63cee7197919eae0ffc8bd88a3b658c920dd4066d984e26c7a13f'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3'
'351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25'
'afd8833f3e57bcda29910e47c8e490d1041eb07cbbf6b6d906b2a8d82c9d4982'
'SKIP'
+ '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
'9fc2533ed95497583752c6eca931f24c159be956fcc49d39cac64da7298a9c88'
'909c046f6123ec81764fde5d9a78431a9dc3b206ce01119ae4d91be54d9471dd'
'11c63a0952293b4fee080c2c0faf8b08283282c0a50694e71cab0c2503478ac5'
@@ -126,6 +128,9 @@ prepare() {
# patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK.
git apply -v "${srcdir}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch"
+ # disable implicit function declaration error since there are old backports patches
+ patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch"
+
# ALARM patches
patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
diff --git a/kernels/linux-libre-rt/config.armv7h b/kernels/linux-libre-rt/config.armv7h
index 947c48e7c..cb9975142 100644
--- a/kernels/linux-libre-rt/config.armv7h
+++ b/kernels/linux-libre-rt/config.armv7h
@@ -3264,7 +3264,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_SUN4I=m
-CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
CONFIG_TOUCHSCREEN_SX8654=m
CONFIG_TOUCHSCREEN_TPS6507X=m