0a150e97d4
This updates: * m4 * bison * e2fsprogs * make_ext4fs * mtd-utils * findutils * squashfs * squashfs4 * grub2 to their version used in LEDE v17.01.6. This fixes various compile errors appearing on Debian Sid. A list of the patches picked from upstream: m4: $ git log --oneline f7e56763e1..HEAD tools/m4 6e78c5502c tools: m4: fix compilation with glibc 2.28 a91d8dd162 tools/m4: update 1.4.18 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes bison: $ git log --oneline 877f2972d4..HEAD tools/bison 1e09cbf118 tools/bison: Update to 3.0.5 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes 5062cff673 tools/bison: update to 3.0.4 e2fsprogs: $ git log --oneline f7e56763e1..HEAD tools/e2fsprogs/ 8f5c55f63e tools/e2fsprogs: update to 1.44.1 d35a7bf4b4 e2fsprogs: bump to 1.44.0 79ac69d9c9 tools/e2fsprogs: Update to 1.43.7 5d9114c9cb tools/e2fsprogs: Update to 1.43.6 7955fab22a tools/e2fsprogs: Update to 1.43.5 866e5b4956 tools/e2fsprogs: Update to 1.43.4 a964738a5c Revert "tools/e2fsprogs: fix building on a glibc 2.27 host" 58a95f0f8f tools/e2fsprogs: fix building on a glibc 2.27 host 720b99215d treewide: clean up download hashes b8b807b1a9 tools/e2fsprogs: Update to 1.43.3 d635ef50c5 e2fsprogs: fix build problem with very old libmagic 819cf75c40 tools: e2fsprogs: bump to 1.43.1 2baf90a84e tools/e2fsprogs: remove outdated configure args b7e946f33e tools/e2fsprogs: update to 1.42.13 52ea491bdf tools/e2fsprogs: add a darwin-compat patch make-ext4fs: $ git log --oneline 1170a3de76..HEAD tools/make-ext4fs/ c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible 95bad62f2a tools: make_ext4fs: switch to LEDE git mirror 98b960c218 tools: make_ext4fs: support creating empty filesystem images 9ec4ca525c tools: make-ext4fs: fix build regression on mac os x 49ad0c565a tools: fix make_ext4fs build with recent glibc 8af9119ff4 tools: make-ext4fs: explicitely request C collation for sorting 01fb448d56 tools/make-ext4fs: prefer static linking $ git log --oneline 17ae95bb20..HEAD tools/mtd-utils 96dbf59e5a tools/mtd-utils: include sysmacros.h explicitly 018d80007e kernel: remove ubifs xz decompression support c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible e27c8bb156 update mtd-utils to 1.5.2 $ git log --oneline dd86bc73fb..HEAD tools/findutils 6449ed1553 tools: findutils: fix compilation with glibc 2.28 d2fd6412a6 tools/findutils: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes 70a5c062f1 tools/findutils: Update to 4.6.0 $ git log --oneline f7e56763e1..HEAD tools/squashfs tools/squashfs4 1aedf2f149 tools/squashfs: use host cflags 8a48a53dcb tools/squashfs4: include sysmacros.h explicitly 8406e50df5 tools/squashfs: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes f97ad870e1 squashfs4: use upstream xz compression header format d437c72c21 tools/squashfs4: refresh patches 34124de139 tools/squashfs: refresh patches fd1c1b4918 tools/squashfs: add argument -fixed-time to set all timestamps $ git log --oneline fcc6f801ca..HEAD package/boot/grub2/ 2252731af4 grub2: rebase patches 6aae528cc3 grub2: Fix CVE-2015-8370 6e1e2e7b96 package/grub2: update to 2.02 10182cb2c6 grub2: update to 2.02~rc2 f0e8470aa9 grub2: update to 2.02~rc1 806d3cc2c3 packages: mark packages depending on a target as nonshared 65c8f2890c grub2: upgrade to 2.02-beta3 (3 years newer than previous) 77812cdfec grub2: disable 'check-macro-version' build rule in 'po' build 2b54fa4dff grub2: do not generate mkfonts at build time b33845b2da grub2: add PKG_FIXUP:=autoreconf 720b99215d treewide: clean up download hashes 3c52cbfa53 Revert "grub2: add PKG_FIXUP:=autoreconf" a0ea22ac43 grub2: add PKG_FIXUP:=autoreconf f2752f4735 grub2: add missing SECTION variable and remove non breaking space d140648622 grub2: move to Boot Loaders category 59e3a4714a grub2: switch back to installing to STAGING_DIR_HOST 9b01282515 grub2: disable stack-protector 25eddec9cb grub2: fix build against musl $ git log --oneline 81a2f9d6f86 81a2f9d6f8 target/linux/x86/image: add explicit prefix to grub-mkimage command Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
81 lines
3.2 KiB
Diff
81 lines
3.2 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Tue, 21 Aug 2018 20:29:12 +0200
|
|
Subject: Revert "tools/e2fsprogs: fix building on a glibc 2.27 host"
|
|
|
|
This reverts commit 58a95f0f8ff768b43d68eed2b6a786e0f40f723b.
|
|
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
|
|
index c5bdb1c0d47779d2a9222b70bf2a79395dd11565..fca90f2091b91dfde8a980e48a871dc8693551c2 100644
|
|
--- a/tools/e2fsprogs/Makefile
|
|
+++ b/tools/e2fsprogs/Makefile
|
|
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|
PKG_NAME:=e2fsprogs
|
|
PKG_VERSION:=1.43.3
|
|
PKG_HASH:=ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927
|
|
-PKG_RELEASE:=2
|
|
+PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
PKG_SOURCE_URL:=@SF/e2fsprogs
|
|
diff --git a/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch b/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch
|
|
deleted file mode 100644
|
|
index bd6ee81b906b6fd000f97a915a6959c678acd1f8..0000000000000000000000000000000000000000
|
|
--- a/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch
|
|
+++ /dev/null
|
|
@@ -1,53 +0,0 @@
|
|
-From 01551bdba16ab16512a01affe02ade32c41ede8a Mon Sep 17 00:00:00 2001
|
|
-From: Palmer Dabbelt <palmer@dabbelt.com>
|
|
-Date: Fri, 29 Dec 2017 10:19:51 -0800
|
|
-Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk
|
|
-
|
|
-As of 2.27, glibc will have a copy_file_range library call to wrap the
|
|
-new copy_file_range system call. This conflicts with the function in
|
|
-misc/create_inode.c, which this patch renames _copy_file_range.
|
|
-
|
|
-Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
|
|
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
----
|
|
- misc/create_inode.c | 8 ++++----
|
|
- 1 file changed, 4 insertions(+), 4 deletions(-)
|
|
-
|
|
---- a/misc/create_inode.c
|
|
-+++ b/misc/create_inode.c
|
|
-@@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu
|
|
- }
|
|
- #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
|
|
-
|
|
--static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
|
|
-+static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file,
|
|
- off_t start, off_t end, char *buf,
|
|
- char *zerobuf)
|
|
- {
|
|
-@@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil
|
|
-
|
|
- data_blk = data & ~(fs->blocksize - 1);
|
|
- hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
|
|
-- err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
|
|
-+ err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf,
|
|
- zerobuf);
|
|
- if (err)
|
|
- return err;
|
|
-@@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi
|
|
- }
|
|
- for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
|
|
- i++, ext++) {
|
|
-- err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
|
|
-+ err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical,
|
|
- ext->fe_logical + ext->fe_length,
|
|
- buf, zerobuf);
|
|
- if (err)
|
|
-@@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f
|
|
- goto out;
|
|
- #endif
|
|
-
|
|
-- err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
|
|
-+ err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
|
|
- zerobuf);
|
|
- out:
|
|
- ext2fs_free_mem(&zerobuf);
|