From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 22 Oct 2010 10:31:16 +0000 (+0200)
Subject: lvm2: add patch for build with newer eglibc, drop empty do_stage()
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f307f24f6e74aa903e0f6479f06392f5460abf3;p=openembedded.git

lvm2: add patch for build with newer eglibc, drop empty do_stage()

* also rename files to lvm2 for faster FILESPATH lookup

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/lvm2/lvm2.inc b/recipes/lvm2/lvm2.inc
index da7cc9ca7f..dd3f509494 100644
--- a/recipes/lvm2/lvm2.inc
+++ b/recipes/lvm2/lvm2.inc
@@ -2,7 +2,7 @@ SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
 LICENSE = "GPL"
 DEPENDS = "device-mapper"
-INC_PR = "r2"
+INC_PR = "r3"
 
 S = "${WORKDIR}/LVM2.${PV}"
 SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
@@ -15,11 +15,6 @@ EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct"
 
 inherit autotools
 
-# We don't need to stage anything (the executables are no needed at build time by any
-# other recipe)
-do_stage() {
-}
-
 do_install_append() {
     # Install machine specific configuration file
     install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
diff --git a/recipes/lvm2/files/crosscompile_fix.patch b/recipes/lvm2/lvm2/crosscompile_fix.patch
similarity index 100%
rename from recipes/lvm2/files/crosscompile_fix.patch
rename to recipes/lvm2/lvm2/crosscompile_fix.patch
diff --git a/recipes/lvm2/lvm2/eglibc-2.12.patch b/recipes/lvm2/lvm2/eglibc-2.12.patch
new file mode 100644
index 0000000000..0663bd6141
--- /dev/null
+++ b/recipes/lvm2/lvm2/eglibc-2.12.patch
@@ -0,0 +1,11 @@
+diff -uNr LVM2.2.01.15.orig//lib/filters/filter-sysfs.c LVM2.2.01.15/lib/filters/filter-sysfs.c
+--- LVM2.2.01.15.orig//lib/filters/filter-sysfs.c	2005-03-10 23:34:17.000000000 +0100
++++ LVM2.2.01.15/lib/filters/filter-sysfs.c	2010-10-22 12:28:36.000000000 +0200
+@@ -20,6 +20,7 @@
+ #ifdef linux
+ 
+ #include <dirent.h>
++#include <sys/stat.h>
+ 
+ static int _locate_sysfs_blocks(const char *proc, char *path, size_t len)
+ {
diff --git a/recipes/lvm2/files/include-limits.patch b/recipes/lvm2/lvm2/include-limits.patch
similarity index 100%
rename from recipes/lvm2/files/include-limits.patch
rename to recipes/lvm2/lvm2/include-limits.patch
diff --git a/recipes/lvm2/files/lvm.conf b/recipes/lvm2/lvm2/lvm.conf
similarity index 100%
rename from recipes/lvm2/files/lvm.conf
rename to recipes/lvm2/lvm2/lvm.conf
diff --git a/recipes/lvm2/files/palmpre/lvm.conf b/recipes/lvm2/lvm2/palmpre/lvm.conf
similarity index 100%
rename from recipes/lvm2/files/palmpre/lvm.conf
rename to recipes/lvm2/lvm2/palmpre/lvm.conf
diff --git a/recipes/lvm2/lvm2_2.01.15.bb b/recipes/lvm2/lvm2_2.01.15.bb
index 0c4d0ea1a9..5036475488 100644
--- a/recipes/lvm2/lvm2_2.01.15.bb
+++ b/recipes/lvm2/lvm2_2.01.15.bb
@@ -1,5 +1,7 @@
 require lvm2.inc
 
+SRC_URI += "file://eglibc-2.12.patch"
+
 PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "c71654baff263254fb5a226624ee8ef3"