* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 53ac9dd222aac232b35d0c1ce453eaf4cacc3419
@ 2018-12-13 13:15 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2018-12-13 13:15 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8370 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 53ac9dd222aac232b35d0c1ce453eaf4cacc3419 (commit)
via edff2bb85107c411d890b0ad4c55305fd9297566 (commit)
via 848ac6900974f8ac3718c0ea4febec6e56954823 (commit)
from 81e1e80e38609e01f98af649ee38e064420bab3d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53ac9dd222aac232b35d0c1ce453eaf4cacc3419
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Dec 12 20:41:54 2018 +0100
unbound: Update to 1.8.3
For details see:
https://nlnetlabs.nl/svn/unbound/tags/release-1.8.3/doc/Changelog
"Fix dns64 allocation in wrong region for returned internal queries."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit edff2bb85107c411d890b0ad4c55305fd9297566
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 13 13:11:01 2018 +0000
core127: Ship updated grub
It doesn't need to be re-installed because no system with
that configuration should exist right now.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 848ac6900974f8ac3718c0ea4febec6e56954823
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Dec 13 12:52:50 2018 +0100
grub: xfs: Accept filesystem with sparse inodes
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Tested-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/unbound | 2 +-
.../124 => core/127}/filelists/aarch64/grub | 0
.../{oldcore/100 => core/127}/filelists/i586/grub | 0
.../100 => core/127}/filelists/x86_64/grub | 0
lfs/grub | 1 +
lfs/unbound | 4 +-
...-xfs-accept-filesystem-with-sparse-inodes.patch | 60 ++++++++++++++++++++++
7 files changed, 64 insertions(+), 3 deletions(-)
copy config/rootfiles/{oldcore/124 => core/127}/filelists/aarch64/grub (100%)
copy config/rootfiles/{oldcore/100 => core/127}/filelists/i586/grub (100%)
copy config/rootfiles/{oldcore/100 => core/127}/filelists/x86_64/grub (100%)
create mode 100644 src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch
Difference in files:
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index e02860487..9a8126c15 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.0.2
+usr/lib/libunbound.so.8.0.3
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor
diff --git a/config/rootfiles/core/127/filelists/aarch64/grub b/config/rootfiles/core/127/filelists/aarch64/grub
new file mode 120000
index 000000000..40ae85fb6
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/aarch64/grub
@@ -0,0 +1 @@
+../../../../common/aarch64/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/127/filelists/i586/grub b/config/rootfiles/core/127/filelists/i586/grub
new file mode 120000
index 000000000..feb236a22
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/i586/grub
@@ -0,0 +1 @@
+../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/127/filelists/x86_64/grub b/config/rootfiles/core/127/filelists/x86_64/grub
new file mode 120000
index 000000000..78d3bd784
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/x86_64/grub
@@ -0,0 +1 @@
+../../../../common/x86_64/grub
\ No newline at end of file
diff --git a/lfs/grub b/lfs/grub
index 1a10c2aa5..e6131f2f5 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch
# Install unifont
cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
diff --git a/lfs/unbound b/lfs/unbound
index 3c876b79a..e4761eb67 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
include Config
-VER = 1.8.2
+VER = 1.8.3
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3b2f1024df47ccc59a8100c3b40c6dc1
+$(DL_FILE)_MD5 = 4646203343d3b8f5aeb1b57753c27ead
install : $(TARGET)
diff --git a/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch b/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch
new file mode 100644
index 000000000..6c6a750b4
--- /dev/null
+++ b/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch
@@ -0,0 +1,60 @@
+From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
+From: Daniel Kiper <daniel.kiper(a)oracle.com>
+Date: Tue, 29 May 2018 16:16:02 +0200
+Subject: xfs: Accept filesystem with sparse inodes
+
+The sparse inode metadata format became a mkfs.xfs default in
+xfsprogs-4.16.0, and such filesystems are now rejected by grub as
+containing an incompatible feature.
+
+In essence, this feature allows xfs to allocate inodes into fragmented
+freespace. (Without this feature, if xfs could not allocate contiguous
+space for 64 new inodes, inode creation would fail.)
+
+In practice, the disk format change is restricted to the inode btree,
+which as far as I can tell is not used by grub. If all you're doing
+today is parsing a directory, reading an inode number, and converting
+that inode number to a disk location, then ignoring this feature
+should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
+
+I did some brief testing of this patch by hacking up the regression
+tests to completely fragment freespace on the test xfs filesystem, and
+then write a large-ish number of inodes to consume any existing
+contiguous 64-inode chunk. This way any files the grub tests add and
+traverse would be in such a fragmented inode allocation. Tests passed,
+but I'm not sure how to cleanly integrate that into the test harness.
+
+Signed-off-by: Eric Sandeen <sandeen(a)redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com>
+Tested-by: Chris Murphy <lists(a)colorremedies.com>
+---
+ grub-core/fs/xfs.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index c6031bd..3b00c74 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */
+ #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */
+
+-/* We do not currently verify metadata UUID so it is safe to read such filesystem */
++/*
++ * Directory entries with ftype are explicitly handled by GRUB code.
++ *
++ * We do not currently read the inode btrees, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature.
++ *
++ * We do not currently verify metadata UUID, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
++ */
+ #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
+ (XFS_SB_FEAT_INCOMPAT_FTYPE | \
++ XFS_SB_FEAT_INCOMPAT_SPINODES | \
+ XFS_SB_FEAT_INCOMPAT_META_UUID)
+
+ struct grub_xfs_sblock
+--
+cgit v1.0-41-gc330
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-12-13 13:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-13 13:15 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 53ac9dd222aac232b35d0c1ce453eaf4cacc3419 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox