Patchwork [2/2] util-linux: Update to 2.24.1

login
register
mail settings
Submitter Saul Wold
Date Feb. 27, 2014, 10:27 p.m.
Message ID <1393540055-13033-2-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/67679/
State New
Headers show

Comments

Saul Wold - Feb. 27, 2014, 10:27 p.m.
Drop unneeded configure fix and native patch
Update LIC_FILES_CHECKSUM for modified text, no License Changes
remove deprecated elvtune flag

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc        |  12 +-
 .../util-linux/util-linux/fix-configure.patch      |  20 --
 .../util-linux/util-linux/util-linux-native.patch  | 210 ---------------------
 .../{util-linux_2.23.2.bb => util-linux_2.24.1.bb} |  15 +-
 4 files changed, 10 insertions(+), 247 deletions(-)
 delete mode 100644 meta/recipes-core/util-linux/util-linux/fix-configure.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native.patch
 rename meta/recipes-core/util-linux/{util-linux_2.23.2.bb => util-linux_2.24.1.bb} (57%)

Patch

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4c80bf2..51c982a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -7,22 +7,22 @@  SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
-LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3 \
+LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
                     file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
                     file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
-                    file://libuuid/COPYING;md5=aa3ac5b4a5bcb707f714f78794011b80 \
-                    file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
-                    file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
+                    file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \
+                    file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
+                    file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
 
 inherit autotools gettext pkgconfig systemd
 DEPENDS = "zlib ncurses"
 DEPENDS_append_class-native = " lzo-native"
 DEPENDS_append_class-nativesdk = " lzo-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
            file://MCONFIG \
            file://defines.h \
            file://make_include \
@@ -39,7 +39,7 @@  PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-partx ${PN}-bash-completion"
 
 SHARED_EXTRA_OECONF = "--disable-use-tty-group \
-                       --disable-makeinstall-chown --enable-elvtune \
+                       --disable-makeinstall-chown \
                        --enable-kill --enable-last --enable-mesg --enable-partx \
                        --enable-raw --enable-reset --disable-login \
                        --disable-vipw --disable-newgrp --disable-chfn-chsh \
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
deleted file mode 100644
index 0ea2318..0000000
--- a/meta/recipes-core/util-linux/util-linux/fix-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-The userlib_execdir was not getting set correctly, the quoting
-was wrong as these quoted items were not getting expanded correctly.
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: util-linux-2.22.1/configure.ac
-===================================================================
---- util-linux-2.22.1.orig/configure.ac
-+++ util-linux-2.22.1/configure.ac
-@@ -79,7 +79,7 @@ fi
- AC_SUBST([usrsbin_execdir])
- 
- case $libdir in
-- '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
-+ ${exec_prefix}/* | ${prefix}/* | /usr/*)
-     usrlib_execdir=$libdir ;;
-  *)
-     usrlib_execdir='${exec_prefix}'$libdir ;;
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
deleted file mode 100644
index e8fcd98..0000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+++ /dev/null
@@ -1,210 +0,0 @@ 
-Support older hosts with latest util-linux-native
-
-mkostemp is not defined on older machines.  So we detect this and
-provide a define that uses mkstemp instead.
-
-O_CLOEXEC is not defined on older machines.  It is however defined
-in the 'c.h' header.  Fix up the users to include 'c.h'.
-
-fdisks/fdisksunlabel.c was modified to use qsort_r, however
-this is not defined on older hosts.  Revert:
-  commit c69bbca9c1f6645097bd20fe3a21f5a99a2a0698
-  fdisk: (sun): use ask API, remove global variable
-
-Upstream-Status: Inappropriate [other]
-Patches revert upstream changes in order to support older
-machines.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -ur util-linux-2.23/configure.ac /home/lmhatle/util-linux-2.23-fixed/configure.ac
---- util-linux-2.23/configure.ac	2013-05-29 14:44:35.147853585 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/configure.ac	2013-05-30 14:56:15.050799650 -0500
-@@ -323,6 +323,7 @@
- 	llseek \
- 	lseek64 \
- 	mempcpy \
-+	mkostemp \
- 	nanosleep \
- 	personality \
- 	posix_fadvise \
-diff -ur util-linux-2.23/include/c.h /home/lmhatle/util-linux-2.23-fixed/include/c.h
---- util-linux-2.23/include/c.h	2013-04-12 04:25:46.852156874 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/include/c.h	2013-05-30 14:56:11.310799488 -0500
-@@ -236,6 +236,13 @@
- #endif
- 
- /*
-+ * mkostemp replacement
-+ */
-+#ifndef HAVE_MKOSTEMP
-+#define mkostemp(template, flags) mkstemp(template)
-+#endif
-+
-+/*
-  * MAXHOSTNAMELEN replacement
-  */
- static inline size_t get_hostname_max(void)
-diff -ur util-linux-2.23/lib/randutils.c /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c
---- util-linux-2.23/lib/randutils.c	2013-04-12 04:25:46.855156901 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c	2013-05-30 14:55:26.622799644 -0500
-@@ -16,6 +16,7 @@
- #include <sys/syscall.h>
- 
- #include "randutils.h"
-+#include "c.h"
- 
- #ifdef HAVE_TLS
- #define THREAD_LOCAL static __thread
-diff -ur util-linux-2.23/lib/wholedisk.c /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c
---- util-linux-2.23/lib/wholedisk.c	2013-04-12 04:25:46.855156901 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c	2013-05-30 14:55:31.182799350 -0500
-@@ -10,6 +10,7 @@
- 
- #include "blkdev.h"
- #include "wholedisk.h"
-+#include "c.h"
- 
- int is_whole_disk_fd(int fd, const char *name)
- {
-diff -ur util-linux-2.23/fdisks/fdisksunlabel.c /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c
---- util-linux-2.23/fdisks/fdisksunlabel.c	2013-04-23 09:14:19.229015244 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c	2013-05-30 14:54:55.978799735 -0500
-@@ -383,10 +383,10 @@
- 	}
- }
- 
--static int verify_sun_cmp(int *a, int *b, void *data)
--{
--    unsigned int *verify_sun_starts = (unsigned int *) data;
-+static unsigned int *verify_sun_starts;
- 
-+static int verify_sun_cmp(int *a, int *b)
-+{
-     if (*a == -1)
- 	    return 1;
-     if (*b == -1)
-@@ -401,7 +401,6 @@
-     uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
-     uint32_t i,j,k,starto,endo;
-     int array[SUN_MAXPARTITIONS];
--    unsigned int *verify_sun_starts;
- 
-     assert(cxt);
-     assert(cxt->label);
-@@ -442,16 +441,14 @@
- 	    }
- 	}
-     }
--
-     for (i = 0; i < SUN_MAXPARTITIONS; i++) {
-         if (lens[i])
-             array[i] = i;
-         else
-             array[i] = -1;
-     }
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
-+	  (int (*)(const void *,const void *)) verify_sun_cmp);
- 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined"));
-@@ -468,6 +465,7 @@
-     start = (starts[array[i]] + lens[array[i]]);
-     if (start < stop)
-         fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"), start, stop);
-+
-     return 0;
- }
- 
-@@ -746,18 +744,12 @@
- 	}
- }
- 
--
- void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->acyl),		/* default */
--			65535,					/* high */
--			_("Number of alternate cylinders"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->acyl = cpu_to_be16(res);
-+	sunlabel->acyl =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->acyl), 65535, 0,
-+				_("Number of alternate cylinders")));
- }
- 
- void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl)
-@@ -769,54 +761,33 @@
- void fdisk_sun_set_xcyl(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->apc),		/* default */
--			cxt->geom.sectors,			/* high */
--			_("Extra sectors per cylinder"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->apc = cpu_to_be16(res);
-+	sunlabel->apc =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->apc), cxt->geom.sectors, 0,
-+				_("Extra sectors per cylinder")));
- }
- 
- void fdisk_sun_set_ilfact(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 1,			/* low */
--			be16_to_cpu(sunlabel->intrlv),		/* default */
--			32,					/* high */
--			_("Interleave factor"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->intrlv = cpu_to_be16(res);
-+	sunlabel->intrlv =
-+		cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->intrlv), 32, 0,
-+				_("Interleave factor")));
- }
- 
- void fdisk_sun_set_rspeed(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 1,			/* low */
--			be16_to_cpu(sunlabel->rpm),		/* default */
--			USHRT_MAX,				/* high */
--			_("Rotation speed (rpm)"),		/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->rpm = cpu_to_be16(res);
--
-+	sunlabel->rpm =
-+		 cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->rpm), 100000, 0,
-+				_("Rotation speed (rpm)")));
- }
- 
- void fdisk_sun_set_pcylcount(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->pcyl),		/* default */
--			USHRT_MAX,				/* high */
--			_("Number of physical cylinders"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->pcyl = cpu_to_be16(res);
-+	sunlabel->pcyl =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->pcyl), 65535, 0,
-+				_("Number of physical cylinders")));
- }
- 
- static int sun_write_disklabel(struct fdisk_context *cxt)
diff --git a/meta/recipes-core/util-linux/util-linux_2.23.2.bb b/meta/recipes-core/util-linux/util-linux_2.24.1.bb
similarity index 57%
rename from meta/recipes-core/util-linux/util-linux_2.23.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.24.1.bb
index f65932c..83a4882 100644
--- a/meta/recipes-core/util-linux/util-linux_2.23.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.24.1.bb
@@ -1,21 +1,14 @@ 
-MAJOR_VERSION = "2.23"
+MAJOR_VERSION = "2.24"
 require util-linux.inc
 
-# To support older hosts, we need to patch and/or revert
-# some upstream changes.  Only do this for native packages.
-OLDHOST = ""
-OLDHOST_class-native = "file://util-linux-native.patch"
-
 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://configure-sbindir.patch \
-            file://fix-configure.patch \
-            ${OLDHOST} \
-"
+           "
 
-SRC_URI[md5sum] = "39a02ad0b3b37824c394f40930b7aa38"
-SRC_URI[sha256sum] = "6c5be3f7beec91b4893de14bbd722886fa2521be5bfa0fc079b749d0018633b1"
+SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f"
+SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
 EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \