summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 13:18:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 11:10:35 +0100
commitb81d788c799a576dd1dc0db573639df69d91afef (patch)
tree3a96546c68c947b928fa24d4c52469d2b81133ec /meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
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>
Diffstat (limited to 'meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch')
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch55
1 files changed, 55 insertions, 0 deletions
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 0000000000..1467207f51
--- /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--