This rebases all specific versions of lvm2 on a global recipe lvm2.inc which defines the common parameters for building lvm2. Staging is overwritten as we don't need any of the executables or manpages the build of lvm2 produces for any related builds.
Signed-off-by: Simon Busch <[email protected]> --- recipes/lvm2/files/crosscompile_fix.patch | 13 +++++++++++++ recipes/lvm2/lvm2-2.01.15/crosscompile_fix.patch | 13 ------------- recipes/lvm2/lvm2.inc | 20 ++++++++++++++++++++ recipes/lvm2/lvm2_2.01.09.bb | 11 ++--------- recipes/lvm2/lvm2_2.01.15.bb | 17 ++--------------- 5 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 recipes/lvm2/files/crosscompile_fix.patch delete mode 100644 recipes/lvm2/lvm2-2.01.15/crosscompile_fix.patch create mode 100644 recipes/lvm2/lvm2.inc diff --git a/recipes/lvm2/files/crosscompile_fix.patch b/recipes/lvm2/files/crosscompile_fix.patch new file mode 100644 index 0000000..7f54f80 --- /dev/null +++ b/recipes/lvm2/files/crosscompile_fix.patch @@ -0,0 +1,13 @@ +Index: LVM2.2.01.15/make.tmpl.in +=================================================================== +--- LVM2.2.01.15.orig/make.tmpl.in 2008-03-26 11:24:50.000000000 +0000 ++++ LVM2.2.01.15/make.tmpl.in 2008-03-26 11:25:02.000000000 +0000 +@@ -72,7 +72,7 @@ + CFLAGS += -DINTL_PACKAGE=\"@intl_pack...@\" -DLOCALEDIR=\"@locale...@\" + endif + +-LDFLAGS += -L$(top_srcdir)/lib -L$(libdir) ++LDFLAGS += -L$(top_srcdir)/lib + + #CFLAGS += -DDEBUG_POOL + #CFLAGS += -DBOUNDS_CHECK diff --git a/recipes/lvm2/lvm2-2.01.15/crosscompile_fix.patch b/recipes/lvm2/lvm2-2.01.15/crosscompile_fix.patch deleted file mode 100644 index 7f54f80..0000000 --- a/recipes/lvm2/lvm2-2.01.15/crosscompile_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: LVM2.2.01.15/make.tmpl.in -=================================================================== ---- LVM2.2.01.15.orig/make.tmpl.in 2008-03-26 11:24:50.000000000 +0000 -+++ LVM2.2.01.15/make.tmpl.in 2008-03-26 11:25:02.000000000 +0000 -@@ -72,7 +72,7 @@ - CFLAGS += -DINTL_PACKAGE=\"@intl_pack...@\" -DLOCALEDIR=\"@locale...@\" - endif - --LDFLAGS += -L$(top_srcdir)/lib -L$(libdir) -+LDFLAGS += -L$(top_srcdir)/lib - - #CFLAGS += -DDEBUG_POOL - #CFLAGS += -DBOUNDS_CHECK diff --git a/recipes/lvm2/lvm2.inc b/recipes/lvm2/lvm2.inc new file mode 100644 index 0000000..a7e37b5 --- /dev/null +++ b/recipes/lvm2/lvm2.inc @@ -0,0 +1,20 @@ +SECTION = "utils" +DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." +LICENSE = "GPL" +DEPENDS = "device-mapper" +INC_PR = "r2" + +S = "${WORKDIR}/LVM2.${PV}" +SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ + file://crosscompile_fix.patch" + +# Unset user/group to unbreak install. +EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct" +EXTRA_OECONF_arm = "--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() { +} diff --git a/recipes/lvm2/lvm2_2.01.09.bb b/recipes/lvm2/lvm2_2.01.09.bb index e708d10..9682fa7 100644 --- a/recipes/lvm2/lvm2_2.01.09.bb +++ b/recipes/lvm2/lvm2_2.01.09.bb @@ -1,15 +1,8 @@ -SECTION = "utils" -DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPL" -PR = "r1" -DEPENDS = "device-mapper" +require lvm2.inc -S = "${WORKDIR}/LVM2.${PV}" - -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz"; +PR = "${INC_PR}.0" SRC_URI[md5sum] = "ed6fe3b734d05c6497cfa4f9932046e6" SRC_URI[sha256sum] = "f72b5868f8ab4c6d5ba4cd470e33ef8d916e9c6c1363a7ae48aefd9361e5fc90" -inherit autotools diff --git a/recipes/lvm2/lvm2_2.01.15.bb b/recipes/lvm2/lvm2_2.01.15.bb index d66e355..0c4d0ea 100644 --- a/recipes/lvm2/lvm2_2.01.15.bb +++ b/recipes/lvm2/lvm2_2.01.15.bb @@ -1,19 +1,6 @@ -SECTION = "utils" -DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPL" -PR = "r1" -DEPENDS = "device-mapper" - -S = "${WORKDIR}/LVM2.${PV}" - -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz \ - file://crosscompile_fix.patch" - -# Unset user/group to unbreak install. -EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct" -EXTRA_OECONF_arm = "--with-user= --with-group= --disable-o_direct" -inherit autotools +require lvm2.inc +PR = "${INC_PR}.0" SRC_URI[md5sum] = "c71654baff263254fb5a226624ee8ef3" SRC_URI[sha256sum] = "80b47604ace83db4450f43d94a99fdf2ca317323fde8a591f57290d28ece7d3b" -- 1.7.0.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
