aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-18 12:34:40 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:06:58 +0100
commit54629315502247c5751c351b5792838f86dd1ea8 (patch)
treeb3135ea03040ffdc4db7141141df271085aecb3c /meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
parentbe4cd4614a2a702130d18e9d082fd83a15faa013 (diff)
downloadopenembedded-core-contrib-54629315502247c5751c351b5792838f86dd1ea8.tar.gz
util-linux: Update to 2.23
Remove license patch as it is integrated upstream. Add backports of upstream loopdev regression fixes. Updated uclibc-__progname-conflict.patch because it didn't apply. Added bash-completion and partx sub-packages. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch')
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
index 5b743cbc76..5031a7313e 100644
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
@@ -14,6 +14,7 @@ make[3]: *** [cache.lo] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
Upstream-Status: Pending
Index: util-linux-2.22.1/configure.ac
@@ -22,10 +23,10 @@ Index: util-linux-2.22.1/configure.ac
+++ util-linux-2.22.1/configure.ac
@@ -372,7 +372,7 @@ esac
-
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
- [program_invocation_short_name = "test";],
- AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
- [Define if program_invocation_short_name is defined])
+ AC_MSG_CHECKING([whether program_invocation_short_name is defined])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+- #include <argp.h>
++ #include <errno.h>
+ ]], [[
+ program_invocation_short_name = "test";
+ ]])], [