Fixed compilation on recent kernels. Marked stable on x86 and amd64.

Package-Manager: portage-2.1.4.4

4 files changed, 34 insertions, 5 deletions

diff --git a/sys-cluster/drbd-kernel/ChangeLog b/sys-cluster/drbd-kernel/ChangeLog
index 45613a96376f..60a664375a94 100644
--- a/sys-cluster/drbd-kernel/ChangeLog
+++ b/sys-cluster/drbd-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/drbd-kernel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.16 2009/03/29 19:43:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.17 2009/08/17 10:18:34 xmerlin Exp $
+
+  17 Aug 2009; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch,
+  drbd-kernel-8.0.16.ebuild:
+  Fixed compilation on recent kernels. Marked stable on x86 and amd64.
 
 *drbd-kernel-8.0.16 (29 Mar 2009)
 
diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest
index f00a4e445896..d7468185aca0 100644
--- a/sys-cluster/drbd-kernel/Manifest
+++ b/sys-cluster/drbd-kernel/Manifest
@@ -1,12 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX drbd-0.7.22-nodevfs.patch 306 RMD160 64fbbdc6347f3e0dca5e97dcffce6416a816ccd1 SHA1 39a6279e5ce1708eeaf27663196664c89303a2ef SHA256 54126b9910f2075d40c41e82418ee124618b2d5a1487805ceeb5646d9942bb54
 AUX drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch 376 RMD160 40a2e6fd54b8fedbe68f648341da590bd48f131e SHA1 b955b17aef3a2a218cedff1b33d81ed8180524e0 SHA256 d5d853484d3f9dcfb770391a97e74e5c2690a3410f7d3ed750ba5a9ed616d7bc
+AUX drbd-8.0.16-kernel-2.6.30-compile-fix.patch 394 RMD160 71f4e77ca8d179df66b3769a902e23265f98d457 SHA1 8d0fe0f3fc0f6b182bd67e11b0f650220ec03e41 SHA256 75201a1d384be2ed7dffec833d45701ca8f9941bcce8a54afbee1ed270d7f756
 AUX drbd-8.0.8-missing-include.patch 310 RMD160 75934cabe504549d6ef3c9cf8b186dd800c7b718 SHA1 27eb329415257dc840757640c6cf82587d12b31c SHA256 1f8a6cbccb94292a50f75ab2643623d6bcb0e0bb811a828ab63df40bcf7ca2bf
 AUX drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch 679 RMD160 f459b054e5a0ee43bac860a365ce42d19b35f70f SHA1 d1553f440d1c2b152e6166d2d3148e80d9cd5a1c SHA256 594527b03820de4f8fbfbdfdbfeb004242e8a712575fb2854f0f6b99880d9b36
 DIST drbd-0.7.24.tar.gz 292132 RMD160 3f8e5540e1040ec30926c1f7e114c56c499151e2 SHA1 b38846eb3cbb8aa356e3c28ebf4c4da6e971b06d SHA256 bdeec861bdab2b9a43eda2da743f3e7fd3974126d589f853ed2b22e1f27da5e4
 DIST drbd-0.7.25.tar.gz 287737 RMD160 992eaf67114d027f7f2891d35e96dc939e9f60a2 SHA1 9f507ffd41306409357e1eb4e6f73e3671acad28 SHA256 1ad7c91416026b70afc92bcbe64df16f685807f5608ff52ab52a5201935ccd6e
 DIST drbd-8.0.11.tar.gz 319026 RMD160 19c202a6b00862b4482f395fca1538763fcf65f8 SHA1 f1f3cffeac2896aa94e2d42773028ec540b0ec5f SHA256 5afb3d867be54ed833b7a1c7b149ae7ea93465aead7d2be68f0753bf4da7feac
 DIST drbd-8.0.12.tar.gz 331014 RMD160 7ebfe2ce5eb45d27d7f75358bc3815d413c5c479 SHA1 6b03e10ef8f8a870f207d63a213eef4fc9930345 SHA256 469ca5623c39f125b527e924befc6b0416fe4c1c7d96d41a1c52b3278c040fee
-DIST drbd-8.0.13.tar.gz 334582 RMD160 4f866dfd989c6a8055ec958fd77577ce3ab34fad SHA1 31575e419fa3930960394b54ed076534af6fdb98 SHA256 5ebb439fa01b58de7b41d94c8a714ca61fd462161ddbbf35691da8caae0ef5b7
+DIST drbd-8.0.13.tar.gz 3812 RMD160 0581332750982d163ed40664b0fd08bfdc578c3c SHA1 63c52aa0f5eb1f21918dc47aa2f208fea5382491 SHA256 8146b5d620a954302cabdbc48cfbcf90cf655c21f21e4b05e8c23c968b738861
 DIST drbd-8.0.14.tar.gz 319039 RMD160 676a9e40f5d2aa3517ad43ccaab65f9ef2933632 SHA1 0f14ce4de28e08f125be28e7feb31d0e5ff64c7f SHA256 6cdc9656e1d0f76f02e399eb739fb9e5916cad32494904da4ca3fe26b8805ab2
 DIST drbd-8.0.16.tar.gz 322758 RMD160 7df7766e5fb96c6aa9130b03e3d1257394ad0c07 SHA1 379ce0b4664468b779dd16f90853f91da4a85e59 SHA256 3bdb662663d308da9d871cc66ddc9e807a10ad5ab510a33b62877231150bc059
 DIST drbd-8.0.6.tar.gz 495421 RMD160 7b920592d2d74e897cc904fbbfa010a088ad62ec SHA1 6c19883b19813ee0a3d02a07d89e6ba21517edb9 SHA256 f08eb9a1fade6a089fefd5652d394f516531857890e83757f67ec54144ae50a2
@@ -18,9 +22,16 @@ EBUILD drbd-kernel-8.0.11.ebuild 1350 RMD160 a8f21dbe2517652bd8634140d4cd5e56001
 EBUILD drbd-kernel-8.0.12.ebuild 1350 RMD160 861d55e23094b529f7ce3c37241c917aa070ade6 SHA1 69327cd9802b0941c52b4a78a92ac69e7d76fa2c SHA256 0cb105422eff04a93dfbf718cbc51fd83edcf719db47ae849dba73b1dd41adcc
 EBUILD drbd-kernel-8.0.13.ebuild 1350 RMD160 a1a64595f953c2185bf6f9f0d59a4603168d04b5 SHA1 1241f222b7fd1d9538ff13123d66b88a0593b4ef SHA256 481af42602b0efe8e59419aed0a030443a0fc3faed7332bddc481e22255bdfea
 EBUILD drbd-kernel-8.0.14.ebuild 1350 RMD160 a06f55a42b5beec7d9137488ca19ba552fc7550e SHA1 58c53f703471f63c5397fa26e8de6ee4440928a4 SHA256 d8226f7114dc0bf2fbbe6e5820735d8575da6bbe4653eb283b5230e7968821a1
-EBUILD drbd-kernel-8.0.16.ebuild 1350 RMD160 70afca7b1431f30b5cb3b554540078d7fc9b28c9 SHA1 ba10e1339d4715d06b59fbb3395170cb100c3d38 SHA256 272d8b4a356cb5fc0a796113f334096ea5a2021e99c5ed4a11bda83e4c4bf4b8
+EBUILD drbd-kernel-8.0.16.ebuild 1421 RMD160 685a413bdc7f051fad9798446f16269b635e5bd7 SHA1 7c86912b706ab3321d5d7afe1bef6eb824f82162 SHA256 7c8f82a88d8f486b53b499e74b49c2271b2a5ce82744255ea20482e4e780b1f5
 EBUILD drbd-kernel-8.0.6.ebuild 1351 RMD160 ea2f85a3d804fd18ba45fa1e901eb4c60c4fa5f6 SHA1 b4c94bd5badbdec82de798e0d547fbbf1b4e45a1 SHA256 f4e93341cc2d4c0f885ceb620ee694157b57a4f0528740adfeb96314770c7f0c
 EBUILD drbd-kernel-8.0.7.ebuild 1349 RMD160 d792d18226b945a4202912a42f45db26220b040c SHA1 1f3cd75517bb4c5581e18e37aaf4a65d7c2017a6 SHA256 7bbf06e5f49b25c2e778159bed6575aa025739f2955bbb8df4f7cd205e4f3218
 EBUILD drbd-kernel-8.0.8.ebuild 1414 RMD160 30ccb859b0533a86ac79a0b3ca83bde6e80839b6 SHA1 8e676eccc73620140f00ea0c2b98d37a10422e15 SHA256 d361721451a6ce727e952e8270e3edda1e1992a54e0447ee804281f790b694f0
-MISC ChangeLog 2677 RMD160 57b3209bb37aa279ba7a590dce231bd5e9fce5a2 SHA1 25ee5e8deb89293e2c3c57267b8ccb585b3f7959 SHA256 4e894efb531b1a710cf3c882e3e7f6cd223f73c0d0bb6f541cb3ff4bbedce78f
+MISC ChangeLog 2888 RMD160 73fcf497eb0730847fa3ce5ba98743180b2a7a4a SHA1 77c6261ff92b970ac0cba89bd95be9d484054e05 SHA256 0c69a556e1671ad70c921cc0b04f61a43e9433c95c99738799d5cc908d156827
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkqJSdAACgkQgMUyd/cdjWuimgCdEBEm3lgBuxVqVOgjOpUZMgmK
+sMUAnA5D5TpAq272NWlM1qeQVjTxRHF6
+=0DXJ
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
index a011f54470ef..97f0d627a4b4 100644
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild,v 1.1 2009/03/29 19:43:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild,v 1.2 2009/08/17 10:18:34 xmerlin Exp $
 
 inherit eutils versionator linux-mod
 
@@ -41,6 +41,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die
+	epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
new file mode 100644
index 000000000000..c7b4f814077e
--- /dev/null
+++ b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
@@ -0,0 +1,12 @@
+--- drbd-8.0.16/drbd/drbd_main.c.orig	2009-08-04 17:55:52.000000000 +0300
++++ drbd-8.0.16/drbd/drbd_main.c	2009-08-04 17:56:35.000000000 +0300
+@@ -2770,7 +2770,9 @@
+ 	}
+ 
+ 	drbd_proc->proc_fops = &drbd_proc_fops;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ 	drbd_proc->owner = THIS_MODULE;
++#endif
+ #else
+ # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
+ #endif