[sys-fs/ocfs2-tools] Fix building with recent kernels

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 56 insertions, 11 deletions

diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog
index 3199e13638af..58728890e1eb 100644
--- a/sys-fs/ocfs2-tools/ChangeLog
+++ b/sys-fs/ocfs2-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/ocfs2-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.7 2012/02/21 14:29:00 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ChangeLog,v 1.8 2012/05/05 12:59:48 alexxy Exp $
+
+  05 May 2012; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/ocfs2-tools-recent-kernels.patch, ocfs2-tools-1.6.4-r1.ebuild,
+  ocfs2-tools-1.6.4.ebuild:
+  [sys-fs/ocfs2-tools] Fix building with recent kernels
 
 *ocfs2-tools-1.6.4-r1 (21 Feb 2012)
 
diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest
index e9057b09e910..0667b42fd63e 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -2,17 +2,28 @@
 Hash: SHA256
 
 AUX ocfs2-tools-1.6.4-asneeded.patch 2608 RMD160 0e660e9d90fcbe1c6a6a71c460df832d6a68e587 SHA1 618680256ff4eec78e66114ab24c27c06d738ab7 SHA256 1b017ccf60365b270a950f6c5772736becf3a8a8207e2a2e6bec36e8df775efe
+AUX ocfs2-tools-recent-kernels.patch 650 RMD160 8f610623080bda9889a289c60c6dfed643d255ec SHA1 8e7b6b9d9b55bc1a31e70e7c6d884e2b952e5b96 SHA256 23da66f6f13392b552ff345daa1748e9b1385cd0a2052250d952dee104c550ef
 AUX ocfs2.confd 1605 RMD160 18f07f87a57dc0c385996b5e28eeef9460ef8917 SHA1 295520b6dc716285390289835ca67b45e1cbe7bf SHA256 2fef37296825b1c2df2084cf4392ae555b68860aa0f673b93bec54c044f81dcf
 AUX ocfs2.initd 4114 RMD160 adf28acd493e7572fe9474ea1e45a8b258a209eb SHA1 1ac80848e784dcbc5d4dac4c9bcaf71eb3dcd006 SHA256 8be50bd1c1747896769447b56f289cdd9b1477268348b293c4b1224df22ed430
 DIST ocfs2-tools-1.6.4.tar.gz 823914 RMD160 c8b65f4c26017e257c4190322d6df64e9ef7925b SHA1 1409a13f63b55457a474c5f5662260e420452ee9 SHA256 dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755
-EBUILD ocfs2-tools-1.6.4-r1.ebuild 1682 RMD160 1bf23e3368a20678e9bcee46f6a4071367a28413 SHA1 dd25430d80c957109cfc23cd58796ce21cf9969b SHA256 0a458cbf4de94154853e5aa8f6a4a59cdb1dfe76dd1ba35661229e53e8027616
-EBUILD ocfs2-tools-1.6.4.ebuild 1648 RMD160 9a1297f4ead58259ad2e4fef03fa9dfd95d1ac5f SHA1 b41f9686ffde7b7c52d9a4ad1dc152ba7981ad91 SHA256 0721310874b4d52d9beff474340fb35794abfb6977211cfdff50db4823323a2b
-MISC ChangeLog 605 RMD160 6c623ed625bc68488527f1d5f0da96d64bd819a2 SHA1 8c0fcdb52e0dc450c6d65eb6b4051a11aafb143e SHA256 c364d6d5dab8fae2f47df7f58f16be0b3cb1f286e7acb542221719e8bee8f4d8
+EBUILD ocfs2-tools-1.6.4-r1.ebuild 1754 RMD160 46981aa0c1f5c932be2be294646a84fc73e9c755 SHA1 432f3dd7eb78b7a28f77641ef88001e72fe1106f SHA256 b0c8308fbc4527f4cf8ec4e2e5cae6bff9b333ee02fdf64cf9cb691cfbd39bbb
+EBUILD ocfs2-tools-1.6.4.ebuild 1740 RMD160 15174ddc555dd0c614c77bb425522bb9b851e1d1 SHA1 e47d85c598ca2156953b1d3221a6c9352827d176 SHA256 5fcb12145d7a63c21c51db3b50a9d702fb91b553c18a1c3ed07a9abf1c0a5243
+MISC ChangeLog 811 RMD160 ae78266e72376f48fa8b8fb0a7a3bc346002295d SHA1 0c5b5711795612c7dafcbb906439a4767d7fa74c SHA256 f3c94acfc203d0c55974121b4d9b798b21d9b8039bb3478f83898ed82de6e870
 MISC metadata.xml 318 RMD160 125e0bce8608c63cfac4690707384f4b9a5118ec SHA1 99e5d8c06141cc6cfb6b5d21be8ed7236b718466 SHA256 4adb0813c6bc1eb64cef456f02e0fe3488b2c497ac4d5612b55d235be981dc07
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9DqjUACgkQKiQSS7ZY+hPfwAD+L0f1qyxUBdjTpbV7vtDET4uX
-GjrJrbWh0LmaJQgm3fEBAOOlwnVl2jVJoCEOrLIm78DqNMF9289OpfXeyDTQGN/H
-=N2fp
+iQIcBAEBCAAGBQJPpSQkAAoJEOf+E+/4L5Lm8REP/i+Kqayollb3DvrHJlafm3TE
+6ZcKuoT8w6z55rQQEUYu/JpnxIIYeMMRZtTFUT5PCNssaOsAMLrvFir9UYEOkw6A
+6n2+JiSPGmAX2P2lhAW8KFPgQLxPc04zITFlT3HL5Brd7rh2T05GOx6KySIB1xaC
+DTdqkPdUWuWX8acyvP34CfdMm8BVyTn+e0WT0ETWSJsePDzF6f86BOF3QgK8mLkZ
+sfKQbSivmxnu8nBC9lGEhrZN66i6tRldHnU2Z5wxvYBywXPEPkxBH86yRHjkTp55
+xNUoSm5vx4Km8ULo5SWZ0jNAvVfZC5PqJ6MXOtA46eUZ8M84YGPIyA1Y7zYLBUD7
+cVr5MVqonRIrymnUrG3B+syLb+qUbXGJ0KwKRrZKcHEboiAcx6uYuHWQevQ+9ptW
+LcAo76ZvdvTXmNlZygyHTEV1udEYhFma2alM2u8JceX65vQ1zYT0+ToRqXuxaoKS
+cUeMx9gNgc1g3rqDSnR6DT3w6zgM5nHQIl3GZdaXDF0wxRxsPJvSOT2tajfUKP+K
+r982rINQ369hquIc9rtd6O01kq2M76PvOKrC8S02dtjWt4ORXGYJSArgcd5a7I9H
+iskVY5Pf3bGwz0QAnpORPk9O7/tzH+HSyBVtXFMGF2JJnVfEEpLPTsBHpL11Pkax
+j9cflLbfuKXk+D9FHKA/
+=WzzJ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch b/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch
new file mode 100644
index 000000000000..24bc40dcd09f
--- /dev/null
+++ b/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch
@@ -0,0 +1,19 @@
+# git diff  include/ocfs2-kernel/ocfs2_fs.h
+diff --git a/include/ocfs2-kernel/ocfs2_fs.h b/include/ocfs2-kernel/ocfs2_fs.h
+index 3eafb07..7bb954a 100644
+--- a/include/ocfs2-kernel/ocfs2_fs.h
++++ b/include/ocfs2-kernel/ocfs2_fs.h
+@@ -1681,11 +1681,11 @@ static inline int ocfs2_sprintf_system_inode_name(char *buf, int len,
+ 	return chars;
+ }
+ 
+-static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de,
++/*static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de,
+ 				    umode_t mode)
+ {
+ 	de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
+-}
++}*/
+ 
+ static inline int ocfs2_gd_is_discontig(struct ocfs2_group_desc *gd)
+ {
\ No newline at end of file
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
index 7d164841dd40..9ba6562d8c30 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild,v 1.1 2012/02/21 14:29:00 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4-r1.ebuild,v 1.2 2012/05/05 12:59:47 alexxy Exp $
 
 EAPI=4
 PYTHON_DEPEND="gtk? 2"
@@ -41,6 +41,11 @@ DOCS=(
 
 MAKEOPTS+=" -j1"
 
+PATCHES=(
+		"${FILESDIR}/${P}-asneeded.patch"
+		"${FILESDIR}/${PN}-recent-kernels.patch"
+		)
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -51,7 +56,7 @@ src_prepare() {
 	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
 		-i libo2dlm/o2dlm_test.c \
 		-i libocfs2/dlm.c || die "sed failed"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch ${PATCHES[@]}
 	rm -f aclocal.m4
 	AT_M4DIR=. eautoreconf
 }
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
index 74109404d08f..45c797a581a9 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild,v 1.2 2012/02/21 14:29:00 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild,v 1.3 2012/05/05 12:59:47 alexxy Exp $
 
 EAPI=3
 PYTHON_DEPEND="gtk? 2"
@@ -40,6 +40,11 @@ DOCS=(
 
 MAKEOPTS+=" -j1"
 
+PATCHES=(
+		"${FILESDIR}/${P}-asneeded.patch"
+		"${FILESDIR}/${PN}-recent-kernels.patch"
+		)
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup