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

Collapse All | Expand All

(-)aufs2-9999.ebuild.old (-4 / +5 lines)
Lines 35-43 Link Here
35
	fi
35
	fi
36
36
37
	local branch=origin/aufs2-${KV_PATCH} 
37
	local branch=origin/aufs2-${KV_PATCH} 
38
	if [ $KV_PATCH -eq 31 ] ; then
38
	
39
		branch=origin/aufs2
40
	fi
41
	git checkout $branch || die "no patch exists for your kernel"
39
	git checkout $branch || die "no patch exists for your kernel"
42
40
43
	use debug || sed -i "s:DEBUG = y:DEBUG =:g" config.mk
41
	use debug || sed -i "s:DEBUG = y:DEBUG =:g" config.mk
Lines 49-60 Link Here
49
	cat aufs2-standalone.patch | \
47
	cat aufs2-standalone.patch | \
50
		sed -e "s/^+#ifdef CONFIG_AUFS_FS_MODULE/+#if 1/" \
48
		sed -e "s/^+#ifdef CONFIG_AUFS_FS_MODULE/+#if 1/" \
51
			-e "s/defined(CONFIG_AUFS_FS_MODULE)/1/" > $modified_patch
49
			-e "s/defined(CONFIG_AUFS_FS_MODULE)/1/" > $modified_patch
52
50
	
53
	if patch -p1 --dry-run --force -R -d ${KV_DIR} < $modified_patch >/dev/null; then
51
	if patch -p1 --dry-run --force -R -d ${KV_DIR} < $modified_patch >/dev/null; then
54
		einfo "aufs2 kernel patch has already been applied"
52
		einfo "aufs2 kernel patch has already been applied"
55
	elif use kernel-patch; then
53
	elif use kernel-patch; then
56
		addwrite ${KV_DIR}
54
		addwrite ${KV_DIR}
57
		ewarn "Patching your kernel..."
55
		ewarn "Patching your kernel..."
56
		patch --no-backup-if-mismatch --force -p1 -d ${KV_DIR} < aufs2-base.patch >/dev/null || \
57
			die "could not apply the kernel patch aufs2-base.patch to your kernel"
58
		patch --no-backup-if-mismatch --force -p1 -d ${KV_DIR} < $modified_patch >/dev/null || \
58
		patch --no-backup-if-mismatch --force -p1 -d ${KV_DIR} < $modified_patch >/dev/null || \
59
			die "could not apply the kernel patch $modified_patch to your kernel"
59
			die "could not apply the kernel patch $modified_patch to your kernel"
60
		einfo "You need to compile your kernel with the applied patch"
60
		einfo "You need to compile your kernel with the applied patch"
Lines 91-96 Link Here
91
	docinto design
91
	docinto design
92
	dodoc design/*.txt || die
92
	dodoc design/*.txt || die
93
	mkdir -p "${D}"/usr/share/aufs2
93
	mkdir -p "${D}"/usr/share/aufs2
94
	cp aufs2-base.patch "${D}"/usr/share/aufs2/aufs2-base.patch
94
	cp aufs2-standalone-modified.patch "${D}"/usr/share/aufs2/aufs2-kernel.patch
95
	cp aufs2-standalone-modified.patch "${D}"/usr/share/aufs2/aufs2-kernel.patch
95
	cd "${S}"-utils
96
	cd "${S}"-utils
96
	emake DESTDIR="${D}" install || die
97
	emake DESTDIR="${D}" install || die

Return to bug 275476