summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 18:18:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 10:10:35 (GMT)
commitb81d788c799a576dd1dc0db573639df69d91afef (patch)
tree3a96546c68c947b928fa24d4c52469d2b81133ec
parentbc4a29df84542f0ef905a2e20d8533a0ea7cb613 (diff)
downloadpoky-b81d788c799a576dd1dc0db573639df69d91afef.tar.gz
ossp-uuid: Add oss-uuid package and RPM 5.4.9 integration
RPM 5.4.9 now strongly encourages you to have the ossp-uuid library available. Add this recipe, and change RPM to use the uuid functionality. (From OE-Core rev: 8a2b55c5b7c544ec15113bc21e5c62276449c9c3) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch112
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch55
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch51
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch36
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch24
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch16
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb58
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch20
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb11
9 files changed, 380 insertions, 3 deletions
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
new file mode 100644
index 0000000..a46e244
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
@@ -0,0 +1,112 @@
1From: Piotr Roszatycki <dexter@debian.org>
2Date: Wed, 27 Jan 2010 16:53:11 +0100
3Subject: [PATCH] Change library name
4
5The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's
6uuid library.
7---
8 Makefile.in | 6 +++---
9 perl/Makefile.PL | 12 ++++++------
10 php/config.m4 | 2 +-
11 uuid-config.in | 2 +-
12 uuid.pc.in | 4 ++--
13 5 files changed, 13 insertions(+), 13 deletions(-)
14
15diff --git a/Makefile.in b/Makefile.in
16index d28f4be..c2ba99d 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -62,13 +62,13 @@ PERL = @PERL@
20 PHP = @PHP@
21 PG_CONFIG = @PG_CONFIG@
22
23-LIB_NAME = libuuid.la
24+LIB_NAME = libossp-uuid.la
25 LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
26
27-DCE_NAME = libuuid_dce.la
28+DCE_NAME = libossp-uuid_dce.la
29 DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
30
31-CXX_NAME = libuuid++.la
32+CXX_NAME = libossp-uuid++.la
33 CXX_OBJS = uuid++.lo $(LIB_OBJS)
34
35 PRG_NAME = uuid
36diff --git a/perl/Makefile.PL b/perl/Makefile.PL
37index 92f4494..9c6fee6 100644
38--- a/perl/Makefile.PL
39+++ b/perl/Makefile.PL
40@@ -33,9 +33,9 @@ use Config;
41 use ExtUtils::MakeMaker;
42
43 # determine source directory
44-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
45- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
46- or die "no source directory found (where libuuid.la is located)";
47+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
48+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
49+ or die "no source directory found (where libossp-uuid.la is located)";
50
51 # determine extra build options
52 my $compat = 0;
53@@ -47,15 +47,15 @@ WriteMakefile(
54 VERSION_FROM => 'uuid.pm',
55 ABSTRACT_FROM => 'uuid.pod',
56 PREREQ_PM => {},
57- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
58+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
59 DEFINE => '',
60 INC => "-I. -I$srcdir",
61 PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
62 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod',
63 ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()),
64 ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
65- MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
66- ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), },
67+ MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
68+ ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), },
69 TYPEMAPS => [ 'uuid.tm' ],
70 test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') },
71 NO_META => 1,
72diff --git a/php/config.m4 b/php/config.m4
73index 5091b96..969b457 100644
74--- a/php/config.m4
75+++ b/php/config.m4
76@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then
77 PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
78 AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
79 PHP_ADD_LIBPATH([..], )
80- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
81+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
82 PHP_ADD_INCLUDE([..])
83 PHP_SUBST(UUID_SHARED_LIBADD)
84
85diff --git a/uuid-config.in b/uuid-config.in
86index 8d2a063..5b58812 100644
87--- a/uuid-config.in
88+++ b/uuid-config.in
89@@ -121,7 +121,7 @@ do
90 output_extra="$output_extra $uuid_ldflags"
91 ;;
92 --libs)
93- output="$output -luuid"
94+ output="$output -lossp-uuid"
95 output_extra="$output_extra $uuid_libs"
96 ;;
97 * )
98diff --git a/uuid.pc.in b/uuid.pc.in
99index c76ad1e..de00c2f 100644
100--- a/uuid.pc.in
101+++ b/uuid.pc.in
102@@ -36,7 +36,7 @@ Name: OSSP uuid
103 Description: Universally Unique Identifier (UUID) Library
104 Version: @UUID_VERSION_RAW@
105 URL: http://www.ossp.org/pkg/lib/uuid/
106-Cflags: -I${includedir}
107-Libs: -L${libdir} -luuid
108+Cflags: -I${includedir}/ossp
109+Libs: -L${libdir} -lossp-uuid
110 Libs.private: @LIBS@
111
112--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
new file mode 100644
index 0000000..1467207
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
@@ -0,0 +1,55 @@
1From: Marco Nenciarini <marco.nenciarini@devise.it>
2Date: Wed, 27 Jan 2010 19:46:21 +0100
3Subject: [PATCH] uuid: preserve -m option status in -v option handling
4
5Bug: 531396
6---
7 uuid_cli.c | 19 ++++++++++---------
8 1 files changed, 10 insertions(+), 9 deletions(-)
9
10diff --git a/uuid_cli.c b/uuid_cli.c
11index d1b0b11..14a67fe 100644
12--- a/uuid_cli.c
13+++ b/uuid_cli.c
14@@ -140,11 +140,12 @@ int main(int argc, char *argv[])
15 i = strtol(optarg, &p, 10);
16 if (*p != '\0')
17 usage("invalid argument to option 'v'");
18+ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5);
19 switch (i) {
20- case 1: version = UUID_MAKE_V1; break;
21- case 3: version = UUID_MAKE_V3; break;
22- case 4: version = UUID_MAKE_V4; break;
23- case 5: version = UUID_MAKE_V5; break;
24+ case 1: version |= UUID_MAKE_V1; break;
25+ case 3: version |= UUID_MAKE_V3; break;
26+ case 4: version |= UUID_MAKE_V4; break;
27+ case 5: version |= UUID_MAKE_V5; break;
28 default:
29 usage("invalid version on option 'v'");
30 break;
31@@ -213,10 +214,10 @@ int main(int argc, char *argv[])
32 }
33 else {
34 /* encoding */
35- if ( (version == UUID_MAKE_V1 && argc != 0)
36- || (version == UUID_MAKE_V3 && argc != 2)
37- || (version == UUID_MAKE_V4 && argc != 0)
38- || (version == UUID_MAKE_V5 && argc != 2))
39+ if ( (version & UUID_MAKE_V1 && argc != 0)
40+ || (version & UUID_MAKE_V3 && argc != 2)
41+ || (version & UUID_MAKE_V4 && argc != 0)
42+ || (version & UUID_MAKE_V5 && argc != 2))
43 usage("invalid number of arguments");
44 if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
45 error(1, "uuid_create: %s", uuid_error(rc));
46@@ -232,7 +233,7 @@ int main(int argc, char *argv[])
47 if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK)
48 error(1, "uuid_load: %s", uuid_error(rc));
49 }
50- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) {
51+ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) {
52 if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK)
53 error(1, "uuid_create: %s", uuid_error(rc));
54 if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) {
55--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
new file mode 100644
index 0000000..060a754
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
@@ -0,0 +1,51 @@
1From: Marco Nenciarini <marco.nenciarini@devise.it>
2Date: Tue, 2 Feb 2010 12:16:49 +0100
3Subject: [PATCH] Fix whatis entries
4
5Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
6---
7 uuid++.pod | 2 +-
8 uuid.pod | 2 +-
9 uuid_cli.pod | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/uuid++.pod b/uuid++.pod
13index 8b5a4b1..89c5efb 100644
14--- a/uuid++.pod
15+++ b/uuid++.pod
16@@ -31,7 +31,7 @@
17
18 =head1 NAME
19
20-B<OSSP uuid> - B<Universally Unique Identifier> (C++ API)
21+B<uuid++> - B<Universally Unique Identifier> (C++ API)
22
23 =head1 VERSION
24
25diff --git a/uuid.pod b/uuid.pod
26index 4ad3742..0179a46 100644
27--- a/uuid.pod
28+++ b/uuid.pod
29@@ -31,7 +31,7 @@
30
31 =head1 NAME
32
33-B<OSSP uuid> - B<Universally Unique Identifier>
34+B<uuid> - B<Universally Unique Identifier>
35
36 =head1 VERSION
37
38diff --git a/uuid_cli.pod b/uuid_cli.pod
39index ddec6bb..df9dc83 100644
40--- a/uuid_cli.pod
41+++ b/uuid_cli.pod
42@@ -31,7 +31,7 @@
43
44 =head1 NAME
45
46-B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool>
47+B<uuid> - B<Universally Unique Identifier Command-Line Tool>
48
49 =head1 VERSION
50
51--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
new file mode 100644
index 0000000..1f92cea
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
@@ -0,0 +1,36 @@
1Description: Support dash-less args to from_string.
2Author: Tim Retout <diocles@debian.org>
3Bug-Debian: http://bugs.debian.org/635607
4
5The module Data::GUID depends on Data::UUID supporting this behaviour.
6
7--- a/perl/uuid_compat.pm
8+++ b/perl/uuid_compat.pm
9@@ -93,7 +93,9 @@
10 $uuid->import('str',
11 $str =~ /^0x/
12 ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str)
13- : $str
14+ : $str =~ /-/
15+ ? $str
16+ : join '-', unpack('A8 A4 A4 A4 A12', $str)
17 );
18 return $uuid->export('bin');
19 }
20--- a/perl/uuid_compat.ts
21+++ b/perl/uuid_compat.ts
22@@ -28,7 +28,7 @@
23 ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part)
24 ##
25
26-use Test::More tests => 14;
27+use Test::More tests => 16;
28
29 BEGIN {
30 use_ok('Data::UUID');
31@@ -53,3 +53,5 @@
32 ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8"));
33 ok($ug->compare($uuid7, $uuid8) == 0);
34
35+ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8"));
36+ok($ug->compare($uuid7, $uuid9) == 0);
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
new file mode 100644
index 0000000..97daca4
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
@@ -0,0 +1,24 @@
1Remove hardcoded libtool name, fall back to generated name
2
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4
5diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
6--- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:37:19.579672930 -0500
7+++ uuid-1.6.2/Makefile.in 2012-05-14 14:37:49.112733787 -0500
8@@ -32,6 +32,7 @@
9 VPATH = @srcdir@
10 srcdir = @srcdir@
11 top_srcdir = @top_srcdir@
12+top_builddir = @top_builddir@
13 S = $(srcdir)
14 C = .
15
16@@ -55,7 +56,7 @@
17 CP = cp
18 RMDIR = rmdir
19 SHTOOL = $(S)/shtool
20-LIBTOOL = $(C)/libtool
21+LIBTOOL = @LIBTOOL@
22 TRUE = true
23 POD2MAN = pod2man
24 PERL = @PERL@
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
new file mode 100644
index 0000000..78f3c94
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
@@ -0,0 +1,16 @@
1We don't want anything stripped
2
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4
5diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
6--- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:42:42.225789456 -0500
7+++ uuid-1.6.2/Makefile.in 2012-05-14 15:03:03.119733400 -0500
8@@ -254,7 +254,7 @@
9 -@if [ ".$(WITH_CXX)" = .yes ]; then \
10 $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
11 fi
12- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
13+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
14 $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
15 -@if [ ".$(WITH_PERL)" = .yes ]; then \
16 (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
new file mode 100644
index 0000000..cc1ec75
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -0,0 +1,58 @@
1SUMMARY = "Universally Unique Identifier (UUID) library"
2DESCRIPTION = "OSSP uuid is a ISO-C:1999 application programming interface \
3(API) and corresponding command line interface (CLI) for the generation of \
4DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique \
5Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time \
6and node based), version 3 (name based, MD5), version 4 (random number \
7based) and version 5 (name based, SHA-1)."
8DESCRIPTION_uuid = "This package contains a tool to create Universally \
9Unique Identifiers (UUID) from the command-line."
10
11HOMEPAGE = "http://www.ossp.org/pkg/lib/uuid/"
12SECTION = "libs"
13
14LICENSE = "ossp_uuid"
15LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e"
16
17PR = "r0"
18
19SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
20 file://0001-Change-library-name.patch \
21 file://0002-uuid-preserve-m-option-status-in-v-option-handling.patch \
22 file://0003-Fix-whatis-entries.patch \
23 file://0004-fix-data-uuid-from-string.patch \
24 file://uuid-libtool.patch \
25 file://uuid-nostrip.patch \
26 "
27SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
28SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
29
30S = "${WORKDIR}/uuid-${PV}"
31
32inherit autotools
33
34EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql"
35EXTRA_OECONF = "--includedir=${includedir}/ossp"
36
37do_configure_prepend() {
38 # This package has a completely custom aclocal.m4
39 # so we need to back it up and make it usable...
40 if [ ! -e m4/ossp.m4 ]; then
41 mkdir m4
42 mv aclocal.m4 m4/ossp.m4
43 fi
44
45 rm -f libtool.m4
46}
47
48do_install_append() {
49 mkdir -p ${D}${includedir}/ossp
50 mv ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/pkgconfig/ossp-uuid.pc
51}
52
53PACKAGES =+ "uuid"
54FILES_uuid = "${bindir}/uuid"
55FILES_${PN} = "${libdir}/libossp-uuid.so.16*"
56FILES_${PN}-dev += "${bindir}/uuid-config"
57
58BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
new file mode 100644
index 0000000..1f4ba98
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
@@ -0,0 +1,20 @@
1Fix integration of ossp-uuid
2
3We need to avoid including the util-linux uuid library, instead
4we need ossp-uuid. There is a related hack in do_configure to
5make sure that we use the right .pc file as well.
6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8
9diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
10--- rpm-5.4.9.orig/configure.ac 2012-05-17 16:37:20.594790192 -0500
11+++ rpm-5.4.9/configure.ac 2012-05-17 16:39:23.126933596 -0500
12@@ -1909,7 +1909,7 @@
13 esac
14 RPM_CHECK_LIB(
15 [OSSP uuid], [uuid],
16- [ossp-uuid uuid], [uuid_import], [uuid.h],
17+ [ossp-uuid], [uuid_import], [uuid.h],
18 [no,external:none], [],
19 [ dnl # enable OSSP uuid native API support for embedded Lua
20 if test ".$WITH_LUA" = .yes; then
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 6eba802..2ca0f58 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -42,8 +42,8 @@ HOMEPAGE = "http://rpm5.org/"
42LICENSE = "LGPLv2.1" 42LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt file" 45DEPENDS = "libpcre attr acl popt ossp-uuid file"
46PR = "r40" 46PR = "r41"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -69,6 +69,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
69 file://rpm-no-perl-urpm.patch \ 69 file://rpm-no-perl-urpm.patch \
70 file://rpm-macros.patch \ 70 file://rpm-macros.patch \
71 file://rpm-lua.patch \ 71 file://rpm-lua.patch \
72 file://rpm-ossp-uuid.patch \
72 " 73 "
73 74
74SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 75SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"
@@ -145,7 +146,7 @@ EXTRA_OECONF += "--verbose \
145 --without-gnutls \ 146 --without-gnutls \
146 --with-pcre \ 147 --with-pcre \
147 --enable-utf8 \ 148 --enable-utf8 \
148 --without-uuid \ 149 --with-uuid \
149 --with-attr \ 150 --with-attr \
150 --with-acl \ 151 --with-acl \
151 --with-popt=external \ 152 --with-popt=external \
@@ -330,6 +331,10 @@ do_configure() {
330 331
331 ./autogen.sh 332 ./autogen.sh
332 333
334 # NASTY hack to make sure configure files the right pkg-config file...
335 sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
336 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure
337
333 export varprefix=${localstatedir} 338 export varprefix=${localstatedir}
334 export CC_FOR_BUILD="${BUILD_CC}" 339 export CC_FOR_BUILD="${BUILD_CC}"
335 oe_runconf 340 oe_runconf