From 6cbcee1a7fe52437e58045d4acd169ea214b6cb3 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 22 Jun 2012 22:58:58 -0700 Subject: util-linux: Update to 2.21.2 Remove patch that was corrected upstream Signed-off-by: Saul Wold --- .../util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch | 24 ----------- meta/recipes-core/util-linux/util-linux_2.21.1.bb | 46 ---------------------- meta/recipes-core/util-linux/util-linux_2.21.2.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch delete mode 100644 meta/recipes-core/util-linux/util-linux_2.21.1.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.21.2.bb diff --git a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch deleted file mode 100644 index 545c3a9c7b..0000000000 --- a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch +++ /dev/null @@ -1,24 +0,0 @@ -configure uses AC_CHECK_DECLS to check for _NL_TIME_WEEK_1STDAY -which means we will get HAVE_DECL__NL_TIME_WEEK_1STDAY -defined to 1 if symbol is declared, otherwise to 0 in config.h - -Therefore we cannot rely on conditionals which check for it -being defined or not since it always will be defined so correct -thing is to use #if instead of #ifdef - -Signed-off-by: Khem Raj - -Upstream-Status: Pending -Index: util-linux-2.21/misc-utils/cal.c -=================================================================== ---- util-linux-2.21.orig/misc-utils/cal.c 2012-02-29 23:41:54.413347665 -0800 -+++ util-linux-2.21/misc-utils/cal.c 2012-02-29 23:42:44.573350057 -0800 -@@ -297,7 +297,7 @@ - * the locale database, which can be overridden with the - * -s (Sunday) or -m (Monday) options. - */ --#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY -+#if HAVE_DECL__NL_TIME_WEEK_1STDAY - /* - * You need to use 2 locale variables to get the first day of the week. - * This is needed to support first_weekday=2 and first_workday=1 for diff --git a/meta/recipes-core/util-linux/util-linux_2.21.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.1.bb deleted file mode 100644 index 8492cdf8e7..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.21.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -MAJOR_VERSION = "2.21" -PR = "r1" -require util-linux.inc - -# note that `lscpu' is under GPLv3+ -LICENSE_${PN}-lscpu = "GPLv3+" - -SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ - file://util-linux-ng-2.16-mount_lock_path.patch \ - file://uclibc-__progname-conflict.patch \ - file://fix_NL_TIME_FIRST_WEEKDAY.patch \ -" - -SRC_URI[md5sum] = "3d9ad37bf8c5a8e6d0e165b020cf9ba5" -SRC_URI[sha256sum] = "4bf9641fd58454106589be8a8d1cfd61e7694f0a6912d8095d17b1fb94b85abe" - -# Only lscpu part is gplv3; rest of the code is not, -# so take out the lscpu parts while running non-gplv3 build. -# The removal of the package should now occur during -# the build if INCOMPATIBLE_LICENSE is set to GPLv3 - -python () { - d.setVar("REMOVELSCPU", "no") - if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: - # avoid GPLv3 - d.setVar("REMOVELSCPU", "yes") - src_uri = (d.getVar("SRC_URI", False) or "").split() - src_uri.append("file://remove-lscpu.patch") - d.setVar("SRC_URI", " ".join(src_uri)) -} - -do_remove_lscpu() { - if [ "x${REMOVELSCPU}" = "xyes" ]; then - rm -f sys-utils/lscpu.c sys-utils/lscpu.1 - rm -rf tests/ts/lscpu tests/expected/lscpu - fi -} - -addtask remove_lscpu before do_configure after do_patch - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" -EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" - -do_install_append () { - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe -} diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb new file mode 100644 index 0000000000..7f2c2a915f --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb @@ -0,0 +1,45 @@ +MAJOR_VERSION = "2.21" +PR = "r0" +require util-linux.inc + +# note that `lscpu' is under GPLv3+ +LICENSE_${PN}-lscpu = "GPLv3+" + +SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ + file://util-linux-ng-2.16-mount_lock_path.patch \ + file://uclibc-__progname-conflict.patch \ +" + +SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" +SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30" + +# Only lscpu part is gplv3; rest of the code is not, +# so take out the lscpu parts while running non-gplv3 build. +# The removal of the package should now occur during +# the build if INCOMPATIBLE_LICENSE is set to GPLv3 + +python () { + d.setVar("REMOVELSCPU", "no") + if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: + # avoid GPLv3 + d.setVar("REMOVELSCPU", "yes") + src_uri = (d.getVar("SRC_URI", False) or "").split() + src_uri.append("file://remove-lscpu.patch") + d.setVar("SRC_URI", " ".join(src_uri)) +} + +do_remove_lscpu() { + if [ "x${REMOVELSCPU}" = "xyes" ]; then + rm -f sys-utils/lscpu.c sys-utils/lscpu.1 + rm -rf tests/ts/lscpu tests/expected/lscpu + fi +} + +addtask remove_lscpu before do_configure after do_patch + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" +EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" + +do_install_append () { + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe +} -- cgit v1.2.3