Skip to content

Commit 1aa6403

Browse files
packages: bump util-linux to 2.41.4 and e2fsprogs to 1.47.4
util-linux 2.37.2 -> 2.41.4 and e2fsprogs 1.46.3 -> 1.47.4, bumped together because e2fsprogs links against util-linux's libblkid/libuuid. These were deferred from the package sweep: under the old uClibc-ng 1.0.38 toolchain, e2fsprogs' configure libblkid link-test (AC_CHECK_LIB(blkid, blkid_get_cache)) failed because util-linux 2.41's libblkid referenced a libc symbol not present in 1.0.38. uClibc-ng 1.0.54 (the current toolchain) provides it, so the link-test passes and both build cleanly. Also fix the util-linux kernel.org fallback URL to use the major-version directory (v$(UTILLINUX_MAJOR_VERSION)/, e.g. v2.41/) instead of the full version; the old form pointed at a directory that never existed and only worked because the ONIE mirror happened to carry the old tarball. Signed-off-by: Brad House <bhouse@nexthop.ai>
1 parent f670887 commit 1aa6403

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

build-config/make/e2fsprogs.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# This is a makefile fragment that defines the build of e2fsprogs
1010
#
1111

12-
E2FSPROGS_VERSION = 1.46.3
12+
E2FSPROGS_VERSION = 1.47.4
1313
E2FSPROGS_TARBALL = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
1414
E2FSPROGS_TARBALL_URLS += $(ONIE_MIRROR) \
1515
https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)

build-config/make/util-linux.make

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
# This is a makefile fragment that defines the build of some libraries
1010
# from the util-linux package.
1111
#
12-
UTILLINUX_MAJOR_VERSION = 2.37
13-
UTILLINUX_VERSION = $(UTILLINUX_MAJOR_VERSION).2
12+
UTILLINUX_MAJOR_VERSION = 2.41
13+
UTILLINUX_VERSION = $(UTILLINUX_MAJOR_VERSION).4
1414
UTILLINUX_TARBALL = util-linux-$(UTILLINUX_VERSION).tar.xz
1515
UTILLINUX_TARBALL_URLS += $(ONIE_MIRROR) \
16-
https://www.kernel.org/pub/linux/utils/util-linux/v$(UTILLINUX_VERSION)/
16+
https://www.kernel.org/pub/linux/utils/util-linux/v$(UTILLINUX_MAJOR_VERSION)/
1717

1818
ifneq ($(filter yes, $(EXT3_4_ENABLE) $(LVM2_ENABLE)),)
1919
UTILLINUX_FLAVOR = util-linux

upstream/e2fsprogs-1.46.3.tar.xz.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e3c83517d8decc339e9fa0f5afe8246d3d0c6d82 e2fsprogs-1.47.4.tar.xz

upstream/util-linux-2.37.2.tar.xz.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0e61178c68875f33be327a7606429904d1663867 util-linux-2.41.4.tar.xz

0 commit comments

Comments
 (0)