Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 497646 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/local/portage/sys-fs/aufs3/aufs3-3_p20141103-r1.ebuild (-10 / +5 lines)
Lines 87-95 Link Here
87
	local module_branch=origin/${PN}.${PATCH_BRANCH}
87
	local module_branch=origin/${PN}.${PATCH_BRANCH}
88
	einfo "Using ${module_branch} as patch source"
88
	einfo "Using ${module_branch} as patch source"
89
	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
89
	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
90
	if [[ ${KV_EXTRA} == -hardened* ]]; then
91
	    patch ${PN}-mmap.patch ${FILESDIR}/hardened-kernel.patch
92
	fi
93
	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
90
	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
94
	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
91
	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
95
	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
92
	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
Lines 138-150 Link Here
138
	use ramfs && set_config BR_RAMFS
135
	use ramfs && set_config BR_RAMFS
139
136
140
	if use pax_kernel; then
137
	if use pax_kernel; then
141
	    if kernel_is ge 3 14; then
138
		if kernel_is ge 3 11; then
142
		epatch "${FILESDIR}"/pax-3.14.patch
139
			epatch "${FILESDIR}"/pax-3.11.patch
143
	    elif kernel_is ge 3 11; then
140
		else
144
		epatch "${FILESDIR}"/pax-3.11.patch
141
			epatch "${FILESDIR}"/pax-3.patch
145
	    else
142
		fi
146
		epatch "${FILESDIR}"/pax-3.patch
147
	    fi
148
	fi
143
	fi
149
144
150
	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
145
	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die

Return to bug 497646