projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 93c8258)
Added patch to fix bug #169623. Fixed some problems with the tests.
authorTiziano Müller <dev-zero@gentoo.org>
Tue, 6 Mar 2007 23:17:45 +0000 (23:17 +0000)
committerTiziano Müller <dev-zero@gentoo.org>
Tue, 6 Mar 2007 23:17:45 +0000 (23:17 +0000)
Package-Manager: portage-2.1.2-r10

sys-fs/evms/ChangeLog patch | blob | history
sys-fs/evms/Manifest patch | blob | history
sys-fs/evms/evms-2.5.5-r5.ebuild patch | blob | history
sys-fs/evms/files/evms-2.5.5-getpagesize.patch [new file with mode: 0644] patch | blob

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 87f3a6563074201ceb03775de1c4818b6eae5223..60324beefb7b24d59d5974136078870e71642498 100644 (file)
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.62 2007/02/04 19:16:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.63 2007/03/06 23:17:45 dev-zero Exp $
+
+  06 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/evms-2.5.5-getpagesize.patch, evms-2.5.5-r5.ebuild:
+  Added patch to fix bug #169623. Fixed some problems with the tests.
 
   04 Feb 2007; Steve Dibb <beandog@gentoo.org> evms-2.5.5-r4.ebuild,
   evms-2.5.5-r5.ebuild:
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 884b3351a007c9f513db57a9a812cd6dfbcaa293..2cd5b5022004a3a0b1f9cf7c7ae16c406d331a34 100644 (file)
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -42,6 +42,10 @@ AUX evms-2.5.5-as-needed.patch 482 RMD160 ebef1e696e0490ebd2c530909c03ec96b52dda
 MD5 19e17ea80b35e5574777ed8e42b4210a files/evms-2.5.5-as-needed.patch 482
 RMD160 ebef1e696e0490ebd2c530909c03ec96b52ddacf files/evms-2.5.5-as-needed.patch 482
 SHA256 695811a6a22a17a2d7247a7109a3d081d4b3d376f6fdce1c64f2a574b9acdf3b files/evms-2.5.5-as-needed.patch 482
+AUX evms-2.5.5-getpagesize.patch 2313 RMD160 b63c5e2707cfbd55ce5701fc92b979475ff81845 SHA1 7d65cd52bb5e4e9c03fdc5ad612c3eb3321112d9 SHA256 c67ac61367346a9dad8e9e02dfa1e59e47f0fb19cb302309b918441a5b8d73a2
+MD5 8be1533bd15d192bbad51a4d06975513 files/evms-2.5.5-getpagesize.patch 2313
+RMD160 b63c5e2707cfbd55ce5701fc92b979475ff81845 files/evms-2.5.5-getpagesize.patch 2313
+SHA256 c67ac61367346a9dad8e9e02dfa1e59e47f0fb19cb302309b918441a5b8d73a2 files/evms-2.5.5-getpagesize.patch 2313
 AUX evms-2.5.5-glib_dep.patch 1341 RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 SHA1 4635d1f2a873457c4db2fef06631980de8da143a SHA256 5320524979a3a22490854ef8289c4f363dfb8dd5a09a64b2ff8fa5b29dfc79bf
 MD5 03cd65ccd0b2d5a07ec56cb8631ac769 files/evms-2.5.5-glib_dep.patch 1341
 RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 files/evms-2.5.5-glib_dep.patch 1341
@@ -67,14 +71,14 @@ EBUILD evms-2.5.5-r4.ebuild 4810 RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c
 MD5 459d32e5b7ff45cc0d383cbd236c8113 evms-2.5.5-r4.ebuild 4810
 RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c evms-2.5.5-r4.ebuild 4810
 SHA256 7f01a3c6aa8e5c4a89fabb96cb256f27932a7ae3e030de99fdcaff2173e9d953 evms-2.5.5-r4.ebuild 4810
-EBUILD evms-2.5.5-r5.ebuild 4837 RMD160 b64c8bfeacbb0246067245771dd8535bc60796c4 SHA1 e7bcd768c5cbc1393617cfe4d589b808d53ff844 SHA256 f94432b2c04bebee28c4c973e6e8074db2ef3ae5576795c4759da8fe49919bf2
-MD5 c3baf2e27e04f54a00499efb3c3a0bdb evms-2.5.5-r5.ebuild 4837
-RMD160 b64c8bfeacbb0246067245771dd8535bc60796c4 evms-2.5.5-r5.ebuild 4837
-SHA256 f94432b2c04bebee28c4c973e6e8074db2ef3ae5576795c4759da8fe49919bf2 evms-2.5.5-r5.ebuild 4837
-MISC ChangeLog 13207 RMD160 0b03d0ad2b551fa18482cf5219d480833124e61e SHA1 84fa98008f646109f54784cdb691d2da02a0bae5 SHA256 e0cbf6a4bffce5df01844e9a1168572ecd08561b5a9096278edfa83277e34a97
-MD5 906d111efe0b9aebbe473ba0e85dce6e ChangeLog 13207
-RMD160 0b03d0ad2b551fa18482cf5219d480833124e61e ChangeLog 13207
-SHA256 e0cbf6a4bffce5df01844e9a1168572ecd08561b5a9096278edfa83277e34a97 ChangeLog 13207
+EBUILD evms-2.5.5-r5.ebuild 4895 RMD160 8665b384a8157387bece9710af8b61088e3284c4 SHA1 920ace7e5cc5a8bcf2af52ac06cabb271e383b05 SHA256 0f339468c02405610bfbdba26266b7122213266311a13d1cc50f001db32d0d28
+MD5 3c81ebc380577eeb54c7e2bb4fe8a26a evms-2.5.5-r5.ebuild 4895
+RMD160 8665b384a8157387bece9710af8b61088e3284c4 evms-2.5.5-r5.ebuild 4895
+SHA256 0f339468c02405610bfbdba26266b7122213266311a13d1cc50f001db32d0d28 evms-2.5.5-r5.ebuild 4895
+MISC ChangeLog 13393 RMD160 80cedf39e477df449658fa06c83b003e23bc0aea SHA1 06f64e5ebafff840ad154d604eedcc00f22b6c2d SHA256 b7f37caf452049eb90acb61309319f8e76783f76bf0e1a8bb99f149f3db432a7
+MD5 96e657d9df308290f5da4d0c96702caf ChangeLog 13393
+RMD160 80cedf39e477df449658fa06c83b003e23bc0aea ChangeLog 13393
+SHA256 b7f37caf452049eb90acb61309319f8e76783f76bf0e1a8bb99f149f3db432a7 ChangeLog 13393
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
diff --git a/sys-fs/evms/evms-2.5.5-r5.ebuild b/sys-fs/evms/evms-2.5.5-r5.ebuild
index 92330403ee70f10617721e9a35494f9a5f966b69..0a94e3a64c0a6202ebc409e8ed2616631a97f16b 100644 (file)
--- a/sys-fs/evms/evms-2.5.5-r5.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r5.ebuild,v 1.5 2007/02/04 19:16:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r5.ebuild,v 1.6 2007/03/06 23:17:45 dev-zero Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -46,6 +46,7 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-glib_dep.patch"
        epatch "${FILESDIR}/${P}-ocfs2.patch"
        epatch "${FILESDIR}/${P}-use_disk_group.patch"
+       epatch "${FILESDIR}/${P}-getpagesize.patch"
 
        eautoreconf
 }
@@ -125,7 +126,7 @@ src_test() {
                einfo "  dd if=/dev/zero of=/tmp/evms_test_file bs=1M count=4096"
                einfo "- Activate a loop device on this file:"
                einfo "  losetup /dev/loop0 /tmp/evms_test_file"
-               einfo "- export EVMS_TEST_VOLUME=loop0"
+               einfo "- export EVMS_TEST_VOLUME=loop/0"
                einfo "The disk has to be at least 4GB!"
                einfo "To deactivate the loop-device afterwards:"
                einfo "- losetup -d /dev/loop0"
@@ -148,5 +149,5 @@ src_test() {
        addwrite /var/lock/evms-engine
 
        cd "${S}/tests/suite"
-       PATH="${PATH}:/sbin:/${S}/tests" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
+       PATH="${S}/ui/cli:${S}/tests:/sbin:${PATH}" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
 }
diff --git a/sys-fs/evms/files/evms-2.5.5-getpagesize.patch b/sys-fs/evms/files/evms-2.5.5-getpagesize.patch
new file mode 100644 (file)
index 0000000..656d684
--- /dev/null
+++ b/sys-fs/evms/files/evms-2.5.5-getpagesize.patch
@@ -0,0 +1,55 @@
+diff -Naur evms-2.5.5.orig/plugins/swap/swapfs.c evms-2.5.5/plugins/swap/swapfs.c
+--- evms-2.5.5.orig/plugins/swap/swapfs.c      2007-03-06 23:14:01.000000000 +0100
++++ evms-2.5.5/plugins/swap/swapfs.c   2007-03-06 23:14:54.000000000 +0100
+@@ -27,7 +27,6 @@
+ #include <plugin.h>
+ #include <fcntl.h>
+ #include <sys/wait.h>
+-#include <asm/page.h> /* to get PAGE_SIZE */
+ #include <sys/swap.h>
+ 
+ #include "swapfs.h"
+@@ -341,7 +340,7 @@
+ 
+       *max_volume_size = (sector_count_t)-1;  /* No limit. */
+       *max_object_size = (sector_count_t)-1;  /* No limit. */
+-      *min_size = (sector_count_t)(PAGE_SIZE * 10);   /* 10 page minimum. */
++      *min_size = (sector_count_t)(getpagesize() * 10);       /* 10 page minimum. */
+ 
+       LOG_EXTRA("Volume: %s, min: %"PRIu64", max: %"PRIu64"\n",
+                 volume->name, *min_size, *max_volume_size);
+diff -Naur evms-2.5.5.orig/plugins/swap/swapfs.h evms-2.5.5/plugins/swap/swapfs.h
+--- evms-2.5.5.orig/plugins/swap/swapfs.h      2007-03-06 23:14:01.000000000 +0100
++++ evms-2.5.5/plugins/swap/swapfs.h   2007-03-06 23:14:42.000000000 +0100
+@@ -47,8 +47,8 @@
+ #define PUT 1
+ #define SWAPFS_MAGIC_STRING   "SWAP_SPACE"
+ #define SWAPFS_MAGIC_STRING2  "SWAPSPACE2"
+-#define SWAPFS_MIN_SIZE               (PAGE_SIZE / EVMS_VSECTOR_SIZE * 10)
+-#define SWAP_MAGIC_OFFSET_IN_BYTES    (PAGE_SIZE - 10) /* last 10 bytes of first page */
++#define SWAPFS_MIN_SIZE               (getpagesize() / EVMS_VSECTOR_SIZE * 10)
++#define SWAP_MAGIC_OFFSET_IN_BYTES    (getpagesize() - 10) /* last 10 bytes of first page */
+ 
+ #define EVMS_Task_swapon      EVMS_Task_Plugin_Function + 1
+ #define EVMS_Task_swapoff     EVMS_Task_Plugin_Function + 2
+diff -Naur evms-2.5.5.orig/plugins/xfs/fsimxfs.h evms-2.5.5/plugins/xfs/fsimxfs.h
+--- evms-2.5.5.orig/plugins/xfs/fsimxfs.h      2007-03-06 23:14:01.000000000 +0100
++++ evms-2.5.5/plugins/xfs/fsimxfs.h   2007-03-06 23:16:00.000000000 +0100
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <uuid/uuid.h>
+-#include <asm/page.h>
++#include <unistd.h> /* for getpagesize() */
+ 
+ extern plugin_record_t xfs_plugin_record;
+ extern plugin_record_t * my_plugin_record;
+@@ -165,7 +165,7 @@
+  * superblock.  This is not the same as the superblock structure, since all of
+  * this space is not currently being used.
+  */
+-#define SIZE_OF_SUPER         PAGE_SIZE
++#define SIZE_OF_SUPER         getpagesize()
+ 
+ /* Fixed byte offset of primary superblock */
+ #define XFS_SUPER1_OFF                0x00
Unnamed repository; edit this file 'description' to name the repository.