From 69ef2d4fd54b49281c5187be7a98da78c84346f3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 19 Jul 2009 09:31:34 -0700 Subject: 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. --- recipes/e2fsprogs-libs/e2fsprogs-libs.inc | 14 +++++--------- recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb | 1 + recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb | 2 +- recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb | 4 +++- recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb | 2 +- recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb | 4 ++-- recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb | 6 +++--- recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb | 16 ++++++++++++++++ .../util-linux-ng-2.16/uclibc-compile.patch | 13 +++++++++++++ recipes/util-linux-ng/util-linux-ng.inc | 4 ++-- recipes/util-linux-ng/util-linux-ng_2.16.bb | 11 +++++++++++ 11 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb create mode 100644 recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch create mode 100644 recipes/util-linux-ng/util-linux-ng_2.16.bb (limited to 'recipes') diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 5b82c11ca1..517771c11b 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -2,8 +2,9 @@ DESCRIPTION = "EXT2 Filesystem Utilities" LICENSE = "GPL" SECTION = "base" PRIORITY = "optional" +DEPENDS = "util-linux-ng" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -13,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ S = "${WORKDIR}/e2fsprogs-libs-${PV}" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" FILES_${PN} = "${bindir}" +EXTRA_OECONF = "--disable-libblkid --disable-libuuid" python populate_packages_prepend () { e2fs_libdir = bb.data.expand('${libdir}', d) @@ -24,18 +26,12 @@ python populate_packages_prepend () { } do_stage () { - for i in libcom_err libss libuuid libblkid; do + for i in libcom_err libss; do oe_libinstall -a -C lib $i ${STAGING_LIBDIR} done install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid + ${STAGING_INCDIR}/ss install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ } diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb index 38449667fe..0ac8ac34d1 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb @@ -1 +1,2 @@ +PR = "r1" require e2fsprogs-libs.inc diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb index 738d1ee206..6be92898d7 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb @@ -1,5 +1,5 @@ require e2fsprogs-libs.inc - +PR = "r1" SRC_URI += "file://ldflags.patch;patch=1" do_compile_prepend () { diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb index 0d7d25e2cc..fc3e85f2dc 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb @@ -1,8 +1,10 @@ require e2fsprogs-libs.inc +PR = "r1" + SRC_URI += "file://ldflags.patch;patch=1" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb index dfd83e3c1f..ccd5a3ce75 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb @@ -5,7 +5,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb index d9447ab616..53afbaabe7 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb @@ -1,6 +1,6 @@ require e2fsprogs-libs.inc -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://mkinstalldirs.patch;patch=1 \ @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ DEPENDS = "gettext-native" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb index 25a6490c7c..47e543c238 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb @@ -1,12 +1,12 @@ require e2fsprogs-libs.inc - +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://mkinstalldirs.patch;patch=1 \ " -DEPENDS = "gettext-native" +DEPENDS += "gettext-native" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb new file mode 100644 index 0000000000..f9a67af2f7 --- /dev/null +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb @@ -0,0 +1,16 @@ +require e2fsprogs-libs.inc +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + " + +DEPENDS += "gettext-native" + +EXTRA_OECONF += " --enable-elf-shlibs " + +do_configure() { + oe_runconf +} + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} 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*" -- cgit v1.2.3