[patch] aufs3-3_p20141103.aufs3 ebuild patch to include hardened-kernel.patch and pax-3.14.patch

aufs3-3_p20141103.ebuild.patch (text/plain), 1.25 KB, created by Andrea Zuccherelli on 2014-11-08 11:53:18 UTC

--- /usr/local/portage/sys-fs/aufs3/aufs3-3_p20141103-r1.ebuild	2014-11-06 22:29:51.000000000 +0100
+++ /usr/portage/sys-fs/aufs3/aufs3-3_p20141103.ebuild	2014-11-04 09:11:48.000000000 +0100
@@ -87,9 +87,6 @@
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
 	einfo "Using ${module_branch} as patch source"
 	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	if [[ ${KV_EXTRA} == -hardened* ]]; then
-	    patch ${PN}-mmap.patch ${FILESDIR}/hardened-kernel.patch
-	fi
 	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
 	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
@@ -138,13 +135,11 @@
 	use ramfs && set_config BR_RAMFS
 
 	if use pax_kernel; then
-	    if kernel_is ge 3 14; then
-		epatch "${FILESDIR}"/pax-3.14.patch
-	    elif kernel_is ge 3 11; then
-		epatch "${FILESDIR}"/pax-3.11.patch
-	    else
-		epatch "${FILESDIR}"/pax-3.patch
-	    fi
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
 	fi
 
 	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die