Skip to contentSkip to conversation

util-linux: bump version to util-linux-ng 2.18

PATCH New heiko at zuerker.org 3 participants 5 messages Dec 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util-linux: bump version to util-linux-ng 2.18

From: Heiko Zuerker <[email protected]>

---
 ...linux-2.13-pre17-hardcode-a-out-constants.patch |   41 --
 package/util-linux/util-linux-no-nls-fix.patch     |   25 --
 package/util-linux/util-linux-susv3-legacy.patch   |  429 --------------------
 package/util-linux/util-linux-umount2-fix.patch    |   20 -
 package/util-linux/util-linux.mk                   |    9 +-
 5 files changed, 5 insertions(+), 519 deletions(-)
 delete mode 100644 package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
 delete mode 100644 package/util-linux/util-linux-no-nls-fix.patch
 delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch
 delete mode 100644 package/util-linux/util-linux-umount2-fix.patch
package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch deleted +0 -41
deleted file mode 100644
index b115c41..0000000
@@ -1,41 +0,0 @@
-Hardcode a.out related constants
-
-The OMAGIC, NMAGIC and ZMAGIC constants, related to the legacy a.out
-binary format, are no longer available in the headers of all
-architectures, due to this binary format being deprecated. For that
-reason, util-linux fails to build.
-
-We therefore take the approach used in newer versions of
-util-linux-ng: hardcoding those values. See
-http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- text-utils/more.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-Index: util-linux-2.13-pre7/text-utils/more.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/more.c
-+++ util-linux-2.13-pre7/text-utils/more.c
-@@ -53,7 +53,6 @@
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#include <a.out.h>
- #include <locale.h>
- #include "xstrncpy.h"
- #include "nls.h"
-@@ -504,9 +503,9 @@
- 
- 	if (fread(twobytes, 2, 1, f) == 1) {
- 		switch(twobytes[0] + (twobytes[1]<<8)) {
--		case OMAGIC:	/* 0407 */
--		case NMAGIC:	/* 0410 */
--		case ZMAGIC:	/* 0413 */
-+		case 0407:	/* a.out obj */
-+		case 0410:	/* a.out exec */
-+		case 0413:	/* a.out demand exec */
- 		case 0405:
- 		case 0411:
- 		case 0177545:
package/util-linux/util-linux-no-nls-fix.patch deleted +0 -25
deleted file mode 100644
index c02009f..0000000
@@ -1,25 +0,0 @@
-[PATCH]: fix util-linux build without NLS support
-
-util-linux partly supports builds without NLS support, but it forgets to
-provide a dummy setlocale() macro.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- include/nls.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: util-linux-2.13-pre7/include/nls.h
-===================================================================
---- util-linux-2.13-pre7.orig/include/nls.h
-+++ util-linux-2.13-pre7/include/nls.h
-@@ -19,6 +19,10 @@
- # define textdomain(Domain) /* empty */
- # define _(Text) (Text)
- # define N_(Text) (Text)
-+# undef LC_ALL
-+# define LC_ALL 0
-+# undef setlocale
-+# define setlocale(category, locale)
- #endif
- 
- 
package/util-linux/util-linux-susv3-legacy.patch deleted +0 -429

429 lines not on this page · raw message

package/util-linux/util-linux-umount2-fix.patch deleted +0 -20
deleted file mode 100644
index 14b6c34..0000000
@@ -1,20 +0,0 @@
-[PATCH] fix multiple definitions of umount2 issue
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- mount/umount.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: util-linux-2.13-pre7/mount/umount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/umount.c
-+++ util-linux-2.13-pre7/mount/umount.c
-@@ -29,7 +29,7 @@
- #include "nfsmount.h"
- #include <arpa/inet.h>
- 
--#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
-+#if 1
- /* Interesting ... it seems libc knows about MNT_FORCE and presumably
-    about umount2 as well -- need not do anything */
- #else /* MNT_FORCE */
package/util-linux/util-linux.mk +5 -4
index 445b4d1..f9d410f 100644
@@ -3,10 +3,10 @@
 # util-linux
 #
 #############################################################
-UTIL-LINUX_VERSION:=2.13-pre7
-UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2
-UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux/testing
-UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION)
+UTIL-LINUX_VERSION:=2.18
+UTIL-LINUX_SOURCE:=util-linux-ng-$(UTIL-LINUX_VERSION).tar.bz2
+UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux-ng/v2.18
+UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-ng-$(UTIL-LINUX_VERSION)
 UTIL-LINUX_CAT:=$(BZCAT)
 UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe
 UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe
@@ -52,6 +52,7 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
+		--includedir=/usr/include \
 		$(UTIL-LINUX_SCHED_UTILS) \
 		$(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
Signature · 1 line
1.7.3.2
#1 lore raw

PATCH 1/1 util-linux: bump version to util-linux-ng 2.18

Am 05.12.2010 16:00, schrieb heiko at zuerker.org:

Quoted 11 lines

From: Heiko Zuerker<[email protected]>

---
  ...linux-2.13-pre17-hardcode-a-out-constants.patch |   41 --
  package/util-linux/util-linux-no-nls-fix.patch     |   25 --
  package/util-linux/util-linux-susv3-legacy.patch   |  429 --------------------
  package/util-linux/util-linux-umount2-fix.patch    |   20 -
  package/util-linux/util-linux.mk                   |    9 +-
  5 files changed, 5 insertions(+), 519 deletions(-)
Quoted 5 lines

delete mode 100644 package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch delete mode 100644 package/util-linux/util-linux-no-nls-fix.patch
delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch
delete mode 100644 package/util-linux/util-linux-umount2-fix.patch

Hi,

I did similar work for version 2.17.2 some time ago. You can find my work in bugzilla:
https://bugs.uclibc.org/show_bug.cgi?id=2677

Your version does not seem to use the autotargets infrastructure. Mine does. Maybe you can use my version from bugzilla, update it to 2.18 and present the developers a new patch.

Just a hint to prevent double work.

Regards,
Ossy

#2 lore raw

PATCH 1/1 util-linux: bump version to util-linux-ng 2.18

Quoted 9 lines · On Sun, 05 Dec 2010 21:17:55 +0100 Marcus Osdoba…

I did similar work for version 2.17.2 some time ago. You can find my work in bugzilla:
https://bugs.uclibc.org/show_bug.cgi?id=2677

Your version does not seem to use the autotargets infrastructure. Mine does. Maybe you can use my version from bugzilla, update it to 2.18 and present the developers a new patch.

Just a hint to prevent double work.

Yes, I was going to tell Heiko about your previous work. I remember that one thing made it a bit complicated to review: the relationship with libuuid. I'll try to have a look at the patches again and see if I can get them merged.

Regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/1 util-linux: bump version to util-linux-ng 2.18

I did not want to mess with the original package, just update it. Ignore my patch, Ossy's seems to be much better anyway.

Signature · 3 lines
Regards
   Heiko Zuerker
   http://www.devil-linux.org
Quoted 6 lines

-----Original Message-----
From: buildroot-bounces at busybox.net [mailto:buildroot- bounces at busybox.net] On Behalf Of Thomas Petazzoni
Sent: Sunday, December 05, 2010 2:24 PM
To: buildroot at busybox.net
Subject: Re: [Buildroot] [PATCH] util-linux: bump version to util-linux-ng

2.18

Quoted 8 lines
Quoted 4 lines · On Sun, 05 Dec 2010 21:17:55 +0100 Marcus Osdoba…

I did similar work for version 2.17.2 some time ago. You can find my work in bugzilla:
https://bugs.uclibc.org/show_bug.cgi?id=2677

Quoted 7 lines
Quoted 5 lines

Your version does not seem to use the autotargets infrastructure. Mine does. Maybe you can use my version from bugzilla, update it to 2.18 and present the developers a new patch.

Just a hint to prevent double work.

Yes, I was going to tell Heiko about your previous work. I remember that

one

Quoted 1 line

thing made it a bit complicated to review: the relationship with libuuid.

I'll try

Quoted 14 lines

to have a look at the patches again and see if I can get them merged.

Regards,

Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux development, consulting, training and support.
http://free-electrons.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#4 lore raw

PATCH 1/1 util-linux: bump version to util-linux-ng 2.18

In reply to Thomas Petazzoni

Am 05.12.2010 21:24, schrieb Thomas Petazzoni:

Quoted 6 lines

Yes, I was going to tell Heiko about your previous work. I remember that one thing made it a bit complicated to review: the relationship with libuuid. I'll try to have a look at the patches again and see if I can get them merged.

Just for information: Libuuid's origin is within the e2fsprogs package. Since util-linux-ng 2.16? it is also part of that package. I guess the goal is to remove libuuid from e2fsprogs and maintain it in ulng.

Recently, both packages provide a plausible libuuid. Both can be used. Since many emebedded developers will always use busybox (which provides blkid - 3rd? fork of beside e2fsprogs and ulng?) it may be better to provide libuuid by e2fsprogs - so you do not need to select another package.
If the devleopment goes on, ulng might become the leading implementation. So this version should be selectable, too.

Using both versions at the same time does not look reasonable to me.

Regards,
Ossy