Skip to content

Commit 4cb5125

Browse files
committed
util-linux: bump version to 2.24
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. Signed-off-by: Mischa Jonker <[email protected]>
1 parent 9528253 commit 4cb5125

File tree

4 files changed

+6
-214
lines changed

4 files changed

+6
-214
lines changed

package/util-linux/util-linux-001-sscanf-no-ms-as.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ Fix libmount build under uClibc
22

33
See https://bugs.gentoo.org/show_bug.cgi?id=406303
44
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
5-
ported to util-linux-2.23.2
5+
ported to util-linux-2.24
66

77
--- a/configure.ac 2013-07-30 03:39:26.188738061 -0500
88
+++ b/configure.ac 2013-09-05 15:31:11.460864363 -0500
9-
@@ -755,7 +755,6 @@
9+
@@ -769,7 +769,6 @@ AC_ARG_ENABLE([libmount],
1010
UL_BUILD_INIT([libmount])
1111
UL_REQUIRES_LINUX([libmount])
1212
UL_REQUIRES_BUILD([libmount], [libblkid])
1313
-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
14-
AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
15-
AM_CONDITIONAL(BUILD_LIBMOUNT_TESTS, test "x$build_libmount" = xyes -a "x$enable_static" = xyes)
14+
AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes])
15+
AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes])
1616

1717
--- a/libmount/src/tab_parse.c 2013-07-30 03:39:26.218738358 -0500
1818
+++ b/libmount/src/tab_parse.c 2013-09-05 15:31:11.460864363 -0500

package/util-linux/util-linux-002-support-older-machines.patch

Lines changed: 0 additions & 208 deletions
This file was deleted.

package/util-linux/util-linux.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
8-
UTIL_LINUX_VERSION_MAJOR = 2.23
7+
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
8+
UTIL_LINUX_VERSION_MAJOR = 2.24
99
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
1010
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
1111

0 commit comments

Comments
 (0)