diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-07-19 09:31:34 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-07-19 09:31:34 -0700 |
| commit | 69ef2d4fd54b49281c5187be7a98da78c84346f3 (patch) | |
| tree | 6d1420c8dc55a561acb2fe266e606999aa770ef7 /recipes/util-linux-ng | |
| parent | 918aa5c5a17a342eaafad143cdc0ccff059e5884 (diff) | |
e2fsprogs-libs: Add version 1.41.8 and dont provide libblkid and libuuid.
util-linux-ng: Add version 2.16 and provide libblkid and libuuid.
Change the provider for libuuid and libblkid from e2fsprogs-libs
to util-linux-ng.
Diffstat (limited to 'recipes/util-linux-ng')
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch | 13 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng.inc | 4 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng_2.16.bb | 11 |
3 files changed, 26 insertions, 2 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch b/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch new file mode 100644 index 0000000000..b2e8a8b95a --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch @@ -0,0 +1,13 @@ +Index: util-linux-ng-2.16/misc-utils/cal.c +=================================================================== +--- util-linux-ng-2.16.orig/misc-utils/cal.c 2009-07-03 16:20:01.000000000 -0700 ++++ util-linux-ng-2.16/misc-utils/cal.c 2009-07-18 23:21:37.000000000 -0700 +@@ -407,7 +407,7 @@ + strcpy(day_headings,""); + strcpy(j_day_headings,""); + +-#ifdef HAVE_LANGINFO_H ++#ifdef HAVE_LANGINFO_H && !defined(__UCLIBC__) + # define weekday(wd) nl_langinfo(ABDAY_1+wd) + #else + # define weekday(wd) _time_info->abbrev_wkday[wd] diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 59d2f0818b..837ff70330 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,14 +1,14 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses virtual/libintl e2fsprogs-libs" +DEPENDS = "udev zlib ncurses virtual/libintl" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" DEFAULT_PREFERENCE = "-1" -INC_PR = "r6" +INC_PR = "r7" # allows for a release candidate RC ?= "" diff --git a/recipes/util-linux-ng/util-linux-ng_2.16.bb b/recipes/util-linux-ng/util-linux-ng_2.16.bb new file mode 100644 index 0000000000..1cfdc34b5c --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb @@ -0,0 +1,11 @@ +require util-linux-ng.inc + +PR = "${INC_PR}" + +SRC_URI += "file://uclibc-compile.patch;patch=1 \ +" + +EXTRA_OECONF += " --enable-libuuid --enable-libblkid \ + --disable-fsck" +LDFLAGS_append_libc-uclibc = " -lintl" +PACKAGES_DYNAMIC += "libuuid*" |