From e1603b1a72ed380ca40a39154377a5ae6507e1e6 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Sun, 29 Jan 2012 21:52:27 +0400 Subject: [PATCH] fix includedir patches for live ebuilds of spl and zfs(referenced by issue #3) --- sys-devel/spl/Manifest | 3 ++- sys-devel/spl/files/spl-9999-includedir.patch | 26 +++++++++++++++++++ sys-devel/spl/spl-9999.ebuild | 2 +- sys-fs/zfs/Manifest | 3 ++- sys-fs/zfs/files/zfs-9999-includedir.patch | 14 ++++++++++ sys-fs/zfs/zfs-9999.ebuild | 2 +- 6 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 sys-devel/spl/files/spl-9999-includedir.patch create mode 100644 sys-fs/zfs/files/zfs-9999-includedir.patch diff --git a/sys-devel/spl/Manifest b/sys-devel/spl/Manifest index e554572..fb061fd 100644 --- a/sys-devel/spl/Manifest +++ b/sys-devel/spl/Manifest @@ -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 diff --git a/sys-devel/spl/files/spl-9999-includedir.patch b/sys-devel/spl/files/spl-9999-includedir.patch new file mode 100644 index 0000000..3fcfa91 --- /dev/null +++ b/sys-devel/spl/files/spl-9999-includedir.patch @@ -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; \ diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild index e974f4b..786fb81 100644 --- a/sys-devel/spl/spl-9999.ebuild +++ b/sys-devel/spl/spl-9999.ebuild @@ -24,7 +24,7 @@ DEPEND=" RDEPEND="" src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch + epatch "${FILESDIR}"/${P}-includedir.patch eautoreconf } diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 0b13311..9f2be8c 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,5 +1,6 @@ AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d +AUX zfs-9999-includedir.patch 601 RMD160 a75d2aca63f0b94a88003a9361c54cf54e77b533 SHA1 f0c60696b6bdfb349897c9b936ffb33b48a70cbf SHA256 d13c30e83548482cde91fb3366ab3d53bc5d0a554270c15a213e2dd15ec937ce AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476 DIST zfs-0.6.0-rc6.tar.gz 1936503 RMD160 c5bcaa967fe70f5c72863f9e230850b37d76b8ce SHA1 70e6d4a6c97281df52e9c91ae577d15637804934 SHA256 b4f72580307d8b81fa9568fd46dccc993367402bf085adb9eca4dd1a24f323e0 EBUILD zfs-0.6.0_rc6.ebuild 1581 RMD160 f2792e1dd837425ba509176abbbcc34d9badc937 SHA1 bb98600e0b6944d2c77183da7ae7c4b6b760eb8c SHA256 0dbfc7ea982d4e8d243b8dc8c4b5a2aa430c9c846baba42f6a819126e87d2713 -EBUILD zfs-9999.ebuild 1485 RMD160 304a5d868949113257b907bb76b55f940f60ab56 SHA1 74c6e49fcd9b4dc697da25831e80f3d108642d9c SHA256 e2013536cb7d1873d867c60fcf9d910ad1754441ebbe71bbe45be17e0a96d97a +EBUILD zfs-9999.ebuild 1478 RMD160 74c3c243479e0a5e648c8d20122bfe7802438c8a SHA1 245a203a145160d9fcb7a349fe12b28f291e836a SHA256 d94e9a20286df8ed2f407b08e3d71a29b24d8af5fbba20869a8bc7f7505f296c diff --git a/sys-fs/zfs/files/zfs-9999-includedir.patch b/sys-fs/zfs/files/zfs-9999-includedir.patch new file mode 100644 index 0000000..641c5ad --- /dev/null +++ b/sys-fs/zfs/files/zfs-9999-includedir.patch @@ -0,0 +1,14 @@ +diff -urN zfs-0.6.0-rc3.orig/Makefile.am zfs-0.6.0-rc3/Makefile.am +--- zfs-0.6.0-rc3.orig/Makefile.am 2011-04-07 22:31:01.000000000 +0400 ++++ zfs-0.6.0-rc3/Makefile.am 2011-04-12 03:25:36.000000000 +0400 +@@ -33,9 +33,7 @@ + + if CONFIG_KERNEL + install-data-local: +- release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +- instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ +- echo "$$release" >$$instdest/zfs.release; \ ++ instdest=$(DESTDIR)/${includedir}/zfs-linux; \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + done diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 2b03dac..56efeed 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -40,7 +40,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch + epatch "${FILESDIR}"/${P}-includedir.patch eautoreconf }