fix includedir patches for live ebuilds of spl and zfs(referenced by issue #3)

This commit is contained in:
2012-01-29 21:52:27 +04:00
parent fb75471208
commit e1603b1a72
6 changed files with 46 additions and 4 deletions

View File

@ -1,6 +1,7 @@
AUX spl-0.6.0-includedir.patch 1179 RMD160 cade3b696d6981b2583cc5ae8ecf614d38ef2efc SHA1 2c5ce007df75a7a8425e1a28308eefdcb29446c2 SHA256 8d05fc006348264e1633e14b73e022d482164d6cefc8d2425faffc50d2346150
AUX spl-0.6.0-kernel-3.1-compat.patch 27063 RMD160 df1d3e67b7aba240b7e02150122715396888e83d SHA1 d2f9266741758c8b94212885dc74b115fb6c5bcb SHA256 7cb0f13b973f03907a35f81fd4b2e7f3316029ed2aa6a79522bc2a4bf5501d72
AUX spl-9999-includedir.patch 1165 RMD160 98219674ccbea205a3ec1de20ecfd0ca331a2537 SHA1 4d5f92617640dcdb763586f86633c894ef260fb5 SHA256 d5e7a3edabdce01cdda2dc105bafd62935f54f9cd708dcfb5b9927c6e179ecb8
DIST spl-0.6.0-rc6.tar.gz 438215 RMD160 8acfc2f7817993f561e78e6627eab22555d8ed27 SHA1 7cdbf313ccae73b382022da408eb17d6a612dd5b SHA256 a728ec0e5db9260d48e8165d3ac6f783b17812fca7b87966fae085c9e7a48446
EBUILD spl-0.6.0_rc6-r1.ebuild 1113 RMD160 a18bcdc22b92b651544e81c2ee973ac03494ad4b SHA1 e01e006853fbb356ffb55ee9b26c06b972a45eb9 SHA256 d9fda2a368fa33be6d5821e9387db35f3369f5260fae3a63f3a59b47216c5966
EBUILD spl-0.6.0_rc6.ebuild 1007 RMD160 cdbf9d35749584ec03f629cb056f7d667ceb2268 SHA1 e2ac30a80e61ec2c31afaefa87707163abf25b53 SHA256 25e2e25924c18ec112842b917202da8dd97989ca3175e79b824811066ea3d6f3
EBUILD spl-9999.ebuild 937 RMD160 264271eef05434a09873bc421c04361617ab4954 SHA1 743df906867e4a15e8ea8713bf8aea5c7fe7ab7b SHA256 f429140c1d75c809c8c960c8eabbc0c76b5c89e1ebd6f048e64acb4a0fb274d2
EBUILD spl-9999.ebuild 930 RMD160 f80465a36115277d860f6c931c44052578a8c97a SHA1 3962be9e632fe195cf8d069a55bf56abaf53e46a SHA256 eefd5ddf6c45d36ac39ed7e29e872064e823e87f2d895a09f6c8aaf87f1f55f2

View File

@ -0,0 +1,26 @@
diff -urN spl-9999.orig/include/Makefile.am spl-9999/include/Makefile.am
--- spl-9999.orig/include/Makefile.am 2012-01-29 21:39:26.000000000 +0400
+++ spl-9999/include/Makefile.am 2012-01-29 21:40:53.927394626 +0400
@@ -15,8 +15,7 @@
noinst_HEADERS += $(top_srcdir)/include/vm/*.h
install-data-local:
- release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
- instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
+ instdest=$(DESTDIR)/${includedir}/spl; \
instfiles=`find . -name '*.h'`; \
for instfile in $$instfiles; do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
diff -urN spl-9999.orig/Makefile.am spl-9999/Makefile.am
--- spl-9999.orig/Makefile.am 2012-01-29 21:39:26.000000000 +0400
+++ spl-9999/Makefile.am 2012-01-29 21:40:35.047393124 +0400
@@ -30,8 +30,7 @@
if CONFIG_KERNEL
install-data-local:
- release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
- instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
+ instdest=$(DESTDIR)/${includedir}/spl; \
echo "$$release" >$$instdest/spl.release; \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \

View File

@ -24,7 +24,7 @@ DEPEND="
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
epatch "${FILESDIR}"/${P}-includedir.patch
eautoreconf
}