summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch12
-rw-r--r--kernels/linux-libre-grsec-knock/PKGBUILD15
-rw-r--r--kernels/linux-libre-grsec-knock/config.armv7h5
-rw-r--r--libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch12
-rw-r--r--libre/linux-libre-grsec/PKGBUILD15
-rw-r--r--libre/linux-libre-grsec/config.armv7h5
6 files changed, 50 insertions, 14 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch b/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch
new file mode 100644
index 000000000..3b3015b1c
--- /dev/null
+++ b/kernels/linux-libre-grsec-knock/0001-ARM-fix-implicit-function-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
+index b24b581..c96f179 100644
+--- a/include/asm-generic/atomic-long.h
++++ b/include/asm-generic/atomic-long.h
+@@ -225,6 +225,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+ ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))
+
+ #ifdef CONFIG_PAX_REFCOUNT
++#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
+ static inline void pax_refcount_needs_these_functions(void)
+ {
+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index 416012d66..b3f4dd9cc 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -10,9 +10,9 @@
pkgbase=linux-libre-grsec-knock
_pkgbasever=4.4-gnu
-_pkgver=4.4.3-gnu
+_pkgver=4.4.4-gnu
_grsecver=3.1
-_timestamp=201603012143
+_timestamp=201603032158
_knockpatchver=4.2_2
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -58,6 +58,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
+ '0001-ARM-fix-implicit-function-declaration.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'
@@ -69,9 +70,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
- '1c67293bf85fef5e479965ee0e1d0281a7391bb29ada5479da93aead82bd6aa2'
+ '5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff'
'SKIP'
- '900aef045a2212e4b81dd852c7e3a024355ef26223eb8c2997f70b219dcb66da'
+ 'bd005e43a54213a4dc065cee68cbaacae54547c916d21762547ee14bec5d6726'
'SKIP'
'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4'
'SKIP'
@@ -83,13 +84,14 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
'64bce353c6da5c852f4b3b6331ddf5386a037fd91190645fe8883863078fe6bc'
'8b8b95e08dcfbda80f96574787b5f54773bc08587d7fccf14174a6d4aec7fcf8'
- '5d412c1c1992979b37d4980cc8a930d806ed1cf05d5341cdeda27596800df718'
+ '4f8a32fdcff0ee401af5e3018ac4004ef2a1d469bdf72b61a0d9b6afeb7f418b'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
'SKIP'
+ 'dcf02c2711307e577a487c90d9faaa6ec7ea784dbdca8226c05a65f7897f5de9'
'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
'486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
'6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -135,6 +137,9 @@ prepare() {
# RCN patch (CM3 firmware deblobbed)
git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
+ # fix implicit declaration of function
+ patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-function-declaration.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-grsec-knock/config.armv7h b/kernels/linux-libre-grsec-knock/config.armv7h
index e15899213..9904288e6 100644
--- a/kernels/linux-libre-grsec-knock/config.armv7h
+++ b/kernels/linux-libre-grsec-knock/config.armv7h
@@ -1982,7 +1982,7 @@ CONFIG_ARM_CHARLCD=y
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_BONE_CAPEMGR is not set
+CONFIG_BONE_CAPEMGR=y
# CONFIG_DEV_OVERLAYMGR is not set
CONFIG_TIEQEP=m
CONFIG_C2PORT=m
@@ -4898,7 +4898,8 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_ARMADA=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_NUM_CRTCS=1
-# CONFIG_DRM_TILCDC is not set
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_VIRTIO_GPU=m
diff --git a/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch b/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch
new file mode 100644
index 000000000..3b3015b1c
--- /dev/null
+++ b/libre/linux-libre-grsec/0001-ARM-fix-implicit-function-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
+index b24b581..c96f179 100644
+--- a/include/asm-generic/atomic-long.h
++++ b/include/asm-generic/atomic-long.h
+@@ -225,6 +225,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+ ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))
+
+ #ifdef CONFIG_PAX_REFCOUNT
++#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
+ static inline void pax_refcount_needs_these_functions(void)
+ {
+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 3ab2c85ce..79164ab9f 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -10,9 +10,9 @@
pkgbase=linux-libre-grsec
_pkgbasever=4.4-gnu
-_pkgver=4.4.3-gnu
+_pkgver=4.4.4-gnu
_grsecver=3.1
-_timestamp=201603012143
+_timestamp=201603032158
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -53,6 +53,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
+ '0001-ARM-fix-implicit-function-declaration.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'
@@ -64,9 +65,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
- '1c67293bf85fef5e479965ee0e1d0281a7391bb29ada5479da93aead82bd6aa2'
+ '5b52578afb3bab7a50748e9b8e26bd9df851b3dcfbb55079d2abf3d3ad46aaff'
'SKIP'
- '900aef045a2212e4b81dd852c7e3a024355ef26223eb8c2997f70b219dcb66da'
+ 'bd005e43a54213a4dc065cee68cbaacae54547c916d21762547ee14bec5d6726'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -76,13 +77,14 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
'8a911b8d635f2ab705b9f01f0301d9a08cff2ff9537172e02b1b8c5d4c050504'
'23d15c88761c08f31c3e8a3c288033e7f0cd47d414d7b3880109638d8d6afebd'
- '7ae63e764048587ad5e78adee9cc4a0e9c77e0ff6aeb8391aa8f83f899d7a2d3'
+ '71ff01c06871dd92312f35a7ac2194708b2d1b783bdde0b585605f0d9d5c03f5'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
'SKIP'
+ 'dcf02c2711307e577a487c90d9faaa6ec7ea784dbdca8226c05a65f7897f5de9'
'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
'486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
'6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -124,6 +126,9 @@ prepare() {
# RCN patch (CM3 firmware deblobbed)
git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
+ # fix implicit declaration of function
+ patch -p1 -i "${srcdir}/0001-ARM-fix-implicit-function-declaration.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/libre/linux-libre-grsec/config.armv7h b/libre/linux-libre-grsec/config.armv7h
index fb2dc027e..7fc325e77 100644
--- a/libre/linux-libre-grsec/config.armv7h
+++ b/libre/linux-libre-grsec/config.armv7h
@@ -1981,7 +1981,7 @@ CONFIG_ARM_CHARLCD=y
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_BONE_CAPEMGR is not set
+CONFIG_BONE_CAPEMGR=y
# CONFIG_DEV_OVERLAYMGR is not set
CONFIG_TIEQEP=m
CONFIG_C2PORT=m
@@ -4897,7 +4897,8 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_ARMADA=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_NUM_CRTCS=1
-# CONFIG_DRM_TILCDC is not set
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_VIRTIO_GPU=m