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>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From: Alexandru Ardelean <ardeleanalex@gmail.com>
|
|
Date: Wed, 23 Nov 2016 10:27:55 +0200
|
|
Subject: target/linux/x86/image: add explicit prefix to grub-mkimage command
|
|
|
|
In the latest version of grub-mkimage, the prefix option is mandatory.
|
|
Not supplying it fails with:
|
|
```
|
|
Prefix not specified (use the -p option).
|
|
```
|
|
|
|
In grub-2.02-beta2 a DEFAULT_DIRECTORY was defined
|
|
in `include/grub/osdep/hostfile_unix.h` as:
|
|
```
|
|
#if defined (__NetBSD__)
|
|
/* NetBSD uses /boot for its boot block. */
|
|
# define DEFAULT_DIRECTORY "/"GRUB_DIR_NAME
|
|
#else
|
|
# define DEFAULT_DIRECTORY "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME
|
|
#endif
|
|
```
|
|
|
|
Where:
|
|
* GRUB_BOOT_DIR_NAME == boot
|
|
* GRUB_DIR_NAME == grub
|
|
|
|
This was used if the -p option was omitted.
|
|
|
|
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
|
|
|
|
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
|
|
index 6f64eba398e34093308b766839e69780512a4ca8..ad995b675b51da11ea5fef83702f7dd9327a39f4 100644
|
|
--- a/target/linux/x86/image/Makefile
|
|
+++ b/target/linux/x86/image/Makefile
|
|
@@ -71,6 +71,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
|
|
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
|
|
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
|
|
grub-mkimage \
|
|
+ -p /boot/grub \
|
|
-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
|
|
-o $(KDIR)/grub2/core.img \
|
|
-O i386-pc \
|
|
@@ -108,6 +109,7 @@ define Image/Build/iso
|
|
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
|
|
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
|
|
grub-mkimage \
|
|
+ -p /boot/grub \
|
|
-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
|
|
-o $(KDIR)/grub2/eltorito.img \
|
|
-O i386-pc \
|