aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-04-30 11:26:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:00:28 +0100
commit2114d734b9c4ace980ef9fa30dd5b5f76f49b934 (patch)
treee2b7239da2360bb1a69c5552c17e87cf770ff9b2
parent6a0dac89932b41502bb55a2dae07d835ca3c6245 (diff)
downloadopenembedded-core-contrib-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.gz
openembedded-core-contrib-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.bz2
openembedded-core-contrib-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.zip
util-linux: Update to 2.21.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux/MCONFIG (renamed from meta/recipes-core/util-linux/util-linux-2.21/MCONFIG)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/defines.h (renamed from meta/recipes-core/util-linux/util-linux-2.21/defines.h)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/make_include (renamed from meta/recipes-core/util-linux/util-linux-2.21/make_include)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove-lscpu.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/swapargs.h (renamed from meta/recipes-core/util-linux/util-linux-2.21/swapargs.h)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-compile.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch (renamed from meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.1.bb (renamed from meta/recipes-core/util-linux/util-linux_2.21.bb)6
12 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG b/meta/recipes-core/util-linux/util-linux/MCONFIG
index 3fea2c02d7..3fea2c02d7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
+++ b/meta/recipes-core/util-linux/util-linux/MCONFIG
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/defines.h b/meta/recipes-core/util-linux/util-linux/defines.h
index 6ce6b86df5..6ce6b86df5 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/defines.h
+++ b/meta/recipes-core/util-linux/util-linux/defines.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
index 545c3a9c7b..545c3a9c7b 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch
+++ b/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/make_include b/meta/recipes-core/util-linux/util-linux/make_include
index e6abcd91f7..e6abcd91f7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/make_include
+++ b/meta/recipes-core/util-linux/util-linux/make_include
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
index a15c1e32a7..a15c1e32a7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch
index 02e4d16ff7..02e4d16ff7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
+++ b/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h b/meta/recipes-core/util-linux/util-linux/swapargs.h
index e960eef05f..e960eef05f 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
+++ b/meta/recipes-core/util-linux/util-linux/swapargs.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
index 45826b180a..45826b180a 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux/uclibc-compile.patch
index 75774d8200..75774d8200 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-compile.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
index 5773d7ea1b..5773d7ea1b 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
index ef56048c60..ef56048c60 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.1.bb
index c0c8bc6edd..12faba00bd 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.21"
-PR = "r5"
+PR = "r0"
require util-linux.inc
# note that `lscpu' is under GPLv3+
@@ -11,8 +11,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
file://fix_NL_TIME_FIRST_WEEKDAY.patch \
"
-SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870"
-SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6"
+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.