diff options
-rw-r--r-- | meta/packages/util-linux/files/fix-make-c.patch | 41 | ||||
-rw-r--r-- | meta/packages/util-linux/files/optional-uuid.patch | 55 | ||||
-rw-r--r-- | meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz | bin | 100566 -> 0 bytes | |||
-rw-r--r-- | meta/packages/util-linux/files/uuid.patch | 22 | ||||
-rw-r--r-- | meta/packages/util-linux/util-linux.inc | 3 | ||||
-rw-r--r-- | meta/packages/util-linux/util-linux_2.15.bb | 6 |
6 files changed, 122 insertions, 5 deletions
diff --git a/meta/packages/util-linux/files/fix-make-c.patch b/meta/packages/util-linux/files/fix-make-c.patch new file mode 100644 index 0000000000..bf1082e85c --- /dev/null +++ b/meta/packages/util-linux/files/fix-make-c.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From: Karel Zak <kzak@redhat.com> | ||
2 | Date: Mon, 11 May 2009 09:49:00 +0000 (+0200) | ||
3 | Subject: build-sys: fix "make -C" bug | ||
4 | X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d | ||
5 | |||
6 | build-sys: fix "make -C" bug | ||
7 | |||
8 | Running: | ||
9 | |||
10 | ./configure --with-fsprobe=builtin | ||
11 | make -C mount mount | ||
12 | |||
13 | causes the following error: | ||
14 | |||
15 | gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -include ../config.h | ||
16 | -I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\" | ||
17 | -fsigned-char -I../libs/blkid/src -g -O2 -MT mount-setproctitle.o | ||
18 | -MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o | ||
19 | `test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv | ||
20 | -f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po | ||
21 | make -C | ||
22 | make: option requires an argument -- 'C' | ||
23 | Usage: make [options] [target] ... | ||
24 | ... | ||
25 | |||
26 | Reported-by: Matthew Burgess <matthew@linuxfromscratch.org> | ||
27 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
28 | --- | ||
29 | |||
30 | diff --git a/config/include-Makefile.am b/config/include-Makefile.am | ||
31 | index b42a0c3..d5da619 100644 | ||
32 | --- a/config/include-Makefile.am | ||
33 | +++ b/config/include-Makefile.am | ||
34 | @@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS) | ||
35 | # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) | ||
36 | # | ||
37 | ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src | ||
38 | +ul_libblkid_builddir = $(top_builddir)/libs/blkid/src | ||
39 | ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la | ||
40 | |||
41 | $(ul_libblkid_la): | ||
diff --git a/meta/packages/util-linux/files/optional-uuid.patch b/meta/packages/util-linux/files/optional-uuid.patch new file mode 100644 index 0000000000..2d0ea43cd2 --- /dev/null +++ b/meta/packages/util-linux/files/optional-uuid.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From: Karel Zak <kzak@redhat.com> | ||
2 | Date: Tue, 12 May 2009 19:22:19 +0000 (+0200) | ||
3 | Subject: blkid: make libuuid optional | ||
4 | X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed | ||
5 | |||
6 | blkid: make libuuid optional | ||
7 | |||
8 | read.c:28:23: error: uuid/uuid.h: No such file or directory | ||
9 | make[3]: *** [read.lo] Error 1 | ||
10 | make[3]: *** Waiting for unfinished jobs.... | ||
11 | |||
12 | Reported-by: Olaf <mailinglists@ban-solms.de> | ||
13 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
14 | --- | ||
15 | |||
16 | diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c | ||
17 | index 2e59218..9091736 100644 | ||
18 | --- a/libs/blkid/src/config.c | ||
19 | +++ b/libs/blkid/src/config.c | ||
20 | @@ -24,9 +24,6 @@ | ||
21 | #include <errno.h> | ||
22 | #endif | ||
23 | #include <stdint.h> | ||
24 | -#ifdef HAVE_LIBUUID | ||
25 | -#include <uuid/uuid.h> | ||
26 | -#endif | ||
27 | #include <stdarg.h> | ||
28 | |||
29 | #include "blkdev.h" | ||
30 | diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c | ||
31 | index a9c9fba..f0ae126 100644 | ||
32 | --- a/libs/blkid/src/evaluate.c | ||
33 | +++ b/libs/blkid/src/evaluate.c | ||
34 | @@ -27,9 +27,6 @@ | ||
35 | #include <errno.h> | ||
36 | #endif | ||
37 | #include <stdint.h> | ||
38 | -#ifdef HAVE_LIBUUID | ||
39 | -#include <uuid/uuid.h> | ||
40 | -#endif | ||
41 | #include <stdarg.h> | ||
42 | |||
43 | #include "pathnames.h" | ||
44 | diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c | ||
45 | index 4163874..b5e9cd0 100644 | ||
46 | --- a/libs/blkid/src/read.c | ||
47 | +++ b/libs/blkid/src/read.c | ||
48 | @@ -25,7 +25,6 @@ | ||
49 | #endif | ||
50 | |||
51 | #include "blkidP.h" | ||
52 | -#include "uuid/uuid.h" | ||
53 | |||
54 | #ifdef HAVE_STRTOULL | ||
55 | #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */ | ||
diff --git a/meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz b/meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz deleted file mode 100644 index a00cedeb15..0000000000 --- a/meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz +++ /dev/null | |||
Binary files differ | |||
diff --git a/meta/packages/util-linux/files/uuid.patch b/meta/packages/util-linux/files/uuid.patch new file mode 100644 index 0000000000..3208e0a865 --- /dev/null +++ b/meta/packages/util-linux/files/uuid.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Index: util-linux-ng-2.15/libs/blkid/src/Makefile.am | ||
2 | =================================================================== | ||
3 | --- util-linux-ng-2.15.orig/libs/blkid/src/Makefile.am 2009-05-19 17:01:15.000000000 +0100 | ||
4 | +++ util-linux-ng-2.15/libs/blkid/src/Makefile.am 2009-05-19 17:08:11.000000000 +0100 | ||
5 | @@ -7,7 +7,7 @@ | ||
6 | common_ldadd = | ||
7 | |||
8 | if HAVE_UUID | ||
9 | -common_ldadd += -luuid #TODO $(UUID_LIBS) | ||
10 | +common_ldadd += -luuid | ||
11 | endif | ||
12 | |||
13 | # includes | ||
14 | @@ -26,7 +26,7 @@ | ||
15 | $(top_srcdir)/lib/md5.c | ||
16 | |||
17 | libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd) | ||
18 | -libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym | ||
19 | +libblkid_la_DEPENDENCIES = probers/libblkid_probers.la blkid.sym | ||
20 | |||
21 | # TODO: for unknown reason "make distcheck" requires | ||
22 | # full path to the version script | ||
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc index 75177c8f28..c5fbf2ec37 100644 --- a/meta/packages/util-linux/util-linux.inc +++ b/meta/packages/util-linux/util-linux.inc | |||
@@ -11,6 +11,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng | |||
11 | file://swapargs.h \ | 11 | file://swapargs.h \ |
12 | file://fdiskbsdlabel_thumb.diff;patch=1 \ | 12 | file://fdiskbsdlabel_thumb.diff;patch=1 \ |
13 | file://umount.diff;patch=1 \ | 13 | file://umount.diff;patch=1 \ |
14 | file://fix-make-c.patch;patch=1 \ | ||
15 | file://optional-uuid.patch;patch=1 \ | ||
16 | file://uuid.patch;patch=1 \ | ||
14 | file://defines.h" | 17 | file://defines.h" |
15 | # file://gcc34.patch;patch=1 \ | 18 | # file://gcc34.patch;patch=1 \ |
16 | 19 | ||
diff --git a/meta/packages/util-linux/util-linux_2.15.bb b/meta/packages/util-linux/util-linux_2.15.bb index 3e0b3cf053..5ace54fa1e 100644 --- a/meta/packages/util-linux/util-linux_2.15.bb +++ b/meta/packages/util-linux/util-linux_2.15.bb | |||
@@ -1,7 +1,3 @@ | |||
1 | require util-linux.inc | 1 | require util-linux.inc |
2 | 2 | ||
3 | SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" | 3 | PR = "r15" |
4 | #SRC_URI += "file://glibc-fix.patch;patch=1" | ||
5 | #SRC_URI += "file://debian-bug392236.patch;patch=1" | ||
6 | |||
7 | PR = "r11" | ||