Skip to contentSkip to conversation

util-linux: bump version to 2.24.1

PATCH New Anton Kolesov 2 participants 3 messages Apr 3, 2014 – Apr 4, 2014

lore
Share & tools
lore

Anton Kolesov

author
#0 lore raw

PATCH 1/1 util-linux: bump version to 2.24.1

From: Mischa Jonker <[email protected]>

Removed "support older machines" patch as it has been fixed upstream, fixed up other patches.

This removes some arch-dependencies in fdiskbsdlabel.h, fixing the build for the ARC-architecture.

This fixes:
http://autobuild.buildroot.net/results/8863799d856ccab51ee8ffd499378574ef166aee/

Signed-off-by Mischa Jonker <[email protected]>
Signed-off-by Anton Kolesov <[email protected]>
---
 .../util-linux-001-sscanf-no-ms-as.patch           |   8 +-
 ...l-linux-002-program-invocation-short-name.patch |  11 ++
 .../util-linux-002-support-older-machines.patch    | 208 ---------------------
 ...l-linux-003-program-invocation-short-name.patch |  11 --
 package/util-linux/util-linux.mk                   |   4 +-
 5 files changed, 17 insertions(+), 225 deletions(-)
 create mode 100644 package/util-linux/util-linux-002-program-invocation-short-name.patch
 delete mode 100644 package/util-linux/util-linux-002-support-older-machines.patch
 delete mode 100644 package/util-linux/util-linux-003-program-invocation-short-name.patch
package/util-linux/util-linux-001-sscanf-no-ms-as.patch +4 -4
index c95b755..918e846 100644
@@ -2,17 +2,17 @@ Fix libmount build under uClibc
 
 See https://bugs.gentoo.org/show_bug.cgi?id=406303
 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.21.1-no-printf-alloc.patch?revision=1.2
-ported to util-linux-2.23.2
+ported to util-linux-2.24
 
 --- a/configure.ac	2013-07-30 03:39:26.188738061 -0500
 +++ b/configure.ac	2013-09-05 15:31:11.460864363 -0500
-@@ -755,7 +755,6 @@
+@@ -769,7 +769,6 @@ AC_ARG_ENABLE([libmount],
  UL_BUILD_INIT([libmount])
  UL_REQUIRES_LINUX([libmount])
  UL_REQUIRES_BUILD([libmount], [libblkid])
 -UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
- AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
- AM_CONDITIONAL(BUILD_LIBMOUNT_TESTS, test "x$build_libmount" = xyes -a "x$enable_static" = xyes)
+ AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes])
+ AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes])
  
 --- a/libmount/src/tab_parse.c	2013-07-30 03:39:26.218738358 -0500
 +++ b/libmount/src/tab_parse.c	2013-09-05 15:31:11.460864363 -0500
package/util-linux/util-linux-002-program-invocation-short-name.patch new file +11 -0
new file mode 100644
index 0000000..95fea3f
@@ -0,0 +1,11 @@
+--- a/configure.ac	2013-09-05 15:31:21.590981268 -0500
++++ b/configure.ac	2013-09-05 15:31:29.160981049 -0500
+@@ -387,7 +387,7 @@
+ 
+ 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";
+ ]])], [
package/util-linux/util-linux-002-support-older-machines.patch deleted +0 -208

208 lines not on this page · raw message

package/util-linux/util-linux-003-program-invocation-short-name.patch deleted +0 -11
deleted file mode 100644
index 95fea3f..0000000
@@ -1,11 +0,0 @@
---- a/configure.ac	2013-09-05 15:31:21.590981268 -0500
-+++ b/configure.ac	2013-09-05 15:31:29.160981049 -0500
-@@ -387,7 +387,7 @@
- 
- 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";
- ]])], [
package/util-linux/util-linux.mk +2 -2
index 20b3d35..d661447 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
-UTIL_LINUX_VERSION_MAJOR = 2.23
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
+UTIL_LINUX_VERSION_MAJOR = 2.24
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
Signature · 1 line
1.8.4.1
Applied
#1 lore raw

PATCH 1/1 util-linux: bump version to 2.24.1

Dear Anton Kolesov,

Quoted 5 lines · Anton Kolesov

From: Mischa Jonker <[email protected]>

Removed "support older machines" patch as it has been fixed upstream, fixed up other patches.

Quoted 8 lines

This removes some arch-dependencies in fdiskbsdlabel.h, fixing the build for the ARC-architecture.

This fixes:
http://autobuild.buildroot.net/results/8863799d856ccab51ee8ffd499378574ef166aee/

Signed-off-by Mischa Jonker <[email protected]>
Signed-off-by Anton Kolesov <[email protected]>

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 util-linux: bump version to 2.24.1

In reply to Anton Kolesov

Dear Anton Kolesov,

Quoted 5 lines · Anton Kolesov

From: Mischa Jonker <[email protected]>

Removed "support older machines" patch as it has been fixed upstream, fixed up other patches.

Quoted 8 lines

This removes some arch-dependencies in fdiskbsdlabel.h, fixing the build for the ARC-architecture.

This fixes:
http://autobuild.buildroot.net/results/8863799d856ccab51ee8ffd499378574ef166aee/

Signed-off-by Mischa Jonker <[email protected]>
Signed-off-by Anton Kolesov <[email protected]>

This breaks the build on AVR32:

http://autobuild.buildroot.org/results/45f/45ffc56784160447c6594354cc3fbab7fa94c196/build-end.log

Error is undefined reference to `mkostemp', most likely due to the old uClibc used on AVR32.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com