util-linux: Update to 2.23
PATCH 1/1 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 <[email protected]>
---
meta/recipes-core/util-linux/util-linux.inc | 5 +-
...-fix-loopcxt_check_size-to-work-with-blkd.patch | 60 +++++++++++++++++
...etup-use-warn_size-for-regular-files-only.patch | 29 ++++++++
.../util-linux/util-linux/mbsalign-license.patch | 78 ----------------------
.../util-linux/uclibc-__progname-conflict.patch | 15 +++--
.../{util-linux_2.22.2.bb => util-linux_2.23.bb} | 11 +--
6 files changed, 107 insertions(+), 91 deletions(-)
create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
create mode 100644 meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/mbsalign-license.patch
rename meta/recipes-core/util-linux/{util-linux_2.22.2.bb => util-linux_2.23.bb} (55%)meta/recipes-core/util-linux/util-linux.inc +4 -1
@@ -34,7 +34,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd util-linux-libmount util-linux-libmount-dev \ util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ - util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd" + util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \ + util-linux-partx ${PN}-bash-completion" EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ --disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -52,6 +53,7 @@ EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemds EXTRA_OECONF_append_class-native = " --disable-login --disable-su" +FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_util-linux-agetty = "${base_sbindir}/agetty"
@@ -67,6 +69,7 @@ FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-reset = "${base_bindir}/reset" +FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch new file +60 -0
60 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch new file +29 -0
@@ -0,0 +1,29 @@ +Upstream-Status: Backport +Signed-off-by: Jonathan Liu <[email protected]> + +From b048b8af3a5568c90f6e0c2d56f6cb399dedb0d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +Date: Mon, 13 May 2013 11:00:47 +0200 +Subject: [PATCH] losetup: use warn_size() for regular files only + +Signed-off-by: Karel Zak <[email protected]> +--- + sys-utils/losetup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c +index ccf120e..b44c9e5 100644 +--- a/sys-utils/losetup.c ++++ b/sys-utils/losetup.c +@@ -380,7 +380,7 @@ static void warn_size(const char *filename, uint64_t size) + struct stat st; + + if (!size) { +- if (stat(filename, &st)) ++ if (stat(filename, &st) || S_ISBLK(st.st_mode)) + return; + size = st.st_size; + } +-- +1.8.2.3 +
meta/recipes-core/util-linux/util-linux/mbsalign-license.patch deleted +0 -78
78 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch +8 -7
@@ -14,6 +14,7 @@ make[3]: *** [cache.lo] Error 1 Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Jonathan Liu <[email protected]> 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"; + ]])], [
meta/recipes-core/util-linux/util-linux_2.23.bb renamed from meta/recipes-core/util-linux/util-linux_2.22.2.bb +6 -5
@@ -1,5 +1,5 @@ -MAJOR_VERSION = "2.22" -PR = "r3" +MAJOR_VERSION = "2.23" +PR = "r0" require util-linux.inc SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
@@ -7,11 +7,12 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://uclibc-__progname-conflict.patch \ file://configure-sbindir.patch \ file://fix-configure.patch \ - file://mbsalign-license.patch \ + file://0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch \ + file://0001-losetup-use-warn_size-for-regular-files-only.patch \ " -SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" -SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d" +SRC_URI[md5sum] = "7bd10387f1aa00efaa4b07dfa13215bc" +SRC_URI[sha256sum] = "19ee024b4c6678eaa928d38edc011c332b088e0ff06239575f6b7e00a1855959" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"
Signature · 1 line
1.8.2.3