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 3.x development tree".

The branch, master has been updated via 65e52362543425464bab0e1fd695e4a3cb0e89ac (commit) via 303036b9612a24cf85f2e6b534e19ebca246c737 (commit) via 868edea18f347a7de10c8211f45d726e9e4643a4 (commit) via edd9febb80d85d14f12f4491bd5f9ccd9ff09558 (commit) via ba902cdc4ffe460a4d5f7cc14d91657f646ce4c8 (commit) via 502b100ed5c1e3ec0261903f73db3de6e3384231 (commit) from f6b546b34c35d695c65b3b0487905ce94b8f3c5f (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 65e52362543425464bab0e1fd695e4a3cb0e89ac Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 21:24:37 2019 +0100

pcengines-apu-firmware: update to 4.9.0.6

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 303036b9612a24cf85f2e6b534e19ebca246c737 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 21:12:15 2019 +0100

grubby: drop package

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 868edea18f347a7de10c8211f45d726e9e4643a4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 21:11:16 2019 +0100

kernel: remove grubby from dependencies

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit edd9febb80d85d14f12f4491bd5f9ccd9ff09558 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 18:45:38 2019 +0200

grub: Import patches and bugfixes from IPFire 2.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ba902cdc4ffe460a4d5f7cc14d91657f646ce4c8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 14:29:02 2019 +0100

linux-firmware: update to 20190620 (git-7ae3a09)

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 502b100ed5c1e3ec0261903f73db3de6e3384231 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 14:45:42 2019 +0200

sed: Update to 4.7

This is a major update to the latest available version of sed.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: grub/grub.nm | 2 +- grub/patches/grub-2.02-X86_64_PLT32.patch | 75 ++++++++++++++++++++++ ....02-fix-packed-not-aligned-error-on-gcc-8.patch | 72 +++++++++++++++++++++ ...-xfs-accept-filesystem-with-sparse-inodes.patch | 60 +++++++++++++++++ grub/patches/grub-2.02_disable_vga_fallback.patch | 15 +++++ grubby/grubby.nm | 69 -------------------- kernel/kernel.nm | 19 ++---- linux-firmware/linux-firmware.nm | 4 +- pcengines-apu-firmware/pcengines-apu-firmware.nm | 2 +- sed/sed.nm | 11 +++- 10 files changed, 240 insertions(+), 89 deletions(-) create mode 100644 grub/patches/grub-2.02-X86_64_PLT32.patch create mode 100644 grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch create mode 100644 grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch create mode 100644 grub/patches/grub-2.02_disable_vga_fallback.patch delete mode 100644 grubby/grubby.nm

Difference in files: diff --git a/grub/grub.nm b/grub/grub.nm index dc75537f1..c076c0116 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@

name = grub version = 2.02 -release = 1 +release = 2

sup_arches = aarch64 x86_64 i686 thisapp = %{name}-%{version} diff --git a/grub/patches/grub-2.02-X86_64_PLT32.patch b/grub/patches/grub-2.02-X86_64_PLT32.patch new file mode 100644 index 000000000..2c65cb78a --- /dev/null +++ b/grub/patches/grub-2.02-X86_64_PLT32.patch @@ -0,0 +1,75 @@ +From 02702bdfe14d8a04643a45b03715f734ae34dbac Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" hjl.tools@gmail.com +Date: Sat, 17 Feb 2018 06:47:28 -0800 +Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 + +Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: + +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad5... + +x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for +32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as +R_X86_64_PC32. + +Signed-off-by: H.J. Lu hjl.tools@gmail.com +Reviewed-by: Daniel Kiper daniel.kiper@oracle.com + +Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa3... +Last-Update: 2018-07-30 + +Patch-Name: R_X86_64_PLT32.patch +--- + grub-core/efiemu/i386/loadcore64.c | 1 + + grub-core/kern/x86_64/dl.c | 1 + + util/grub-mkimagexx.c | 1 + + util/grub-module-verifier.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c +index e49d0b6ff..18facf47f 100644 +--- a/grub-core/efiemu/i386/loadcore64.c ++++ b/grub-core/efiemu/i386/loadcore64.c +@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + err = grub_efiemu_write_value (addr, + *addr32 + rel->r_addend + + sym.off +diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c +index 440690673..3a73e6e6c 100644 +--- a/grub-core/kern/x86_64/dl.c ++++ b/grub-core/kern/x86_64/dl.c +@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_int64_t value; + value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c +index e63f148e4..f20255a28 100644 +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_uint32_t *t32 = (grub_uint32_t *) target; + *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) +diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c +index 9179285a5..a79271f66 100644 +--- a/util/grub-module-verifier.c ++++ b/util/grub-module-verifier.c +@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { + -1 + }, (int[]){ + R_X86_64_PC32, ++ R_X86_64_PLT32, + -1 + } + }, diff --git a/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch b/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch new file mode 100644 index 000000000..51ee7dc86 --- /dev/null +++ b/grub/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch @@ -0,0 +1,72 @@ +From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 +From: Michael Chang mchang@suse.com +Date: Mon, 26 Mar 2018 16:52:34 +0800 +Subject: Fix packed-not-aligned error on GCC 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with GCC 8, there are several errors regarding packed-not-aligned. + +./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] + +This patch fixes the build error by cleaning up the ambiguity of placing +aligned structure in a packed one. In "struct grub_btrfs_time" and "struct +grub_gpt_part_type", the aligned attribute seems to be superfluous, and also +has to be packed, to ensure the structure is bit-to-bit mapped to the format +laid on disk. I think we could blame to copy and paste error here for the +mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as +the name suggests. :) + +Signed-off-by: Michael Chang mchang@suse.com +Tested-by: Michael Chang mchang@suse.com +Tested-by: Paul Menzel paulepanter@users.sourceforge.net +Reviewed-by: Daniel Kiper daniel.kiper@oracle.com +--- + grub-core/fs/btrfs.c | 2 +- + include/grub/efiemu/runtime.h | 2 +- + include/grub/gpt_partition.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 4849c1c..be19544 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -175,7 +175,7 @@ struct grub_btrfs_time + { + grub_int64_t sec; + grub_uint32_t nanosec; +-} __attribute__ ((aligned (4))); ++} GRUB_PACKED; + + struct grub_btrfs_inode + { +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729..36d2ded 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel + + struct efi_variable + { +- grub_efi_guid_t guid; ++ grub_efi_packed_guid_t guid; + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h +index 1b32f67..9668a68 100644 +--- a/include/grub/gpt_partition.h ++++ b/include/grub/gpt_partition.h +@@ -28,7 +28,7 @@ struct grub_gpt_part_type + grub_uint16_t data2; + grub_uint16_t data3; + grub_uint8_t data4[8]; +-} __attribute__ ((aligned(8))); ++} GRUB_PACKED; + typedef struct grub_gpt_part_type grub_gpt_part_type_t; + + #define GRUB_GPT_PARTITION_TYPE_EMPTY \ +-- +cgit v1.0-41-gc330 + diff --git a/grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch b/grub/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch new file mode 100644 index 000000000..6c6a750b4 --- /dev/null +++ b/grub/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@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@redhat.com +Reviewed-by: Daniel Kiper daniel.kiper@oracle.com +Tested-by: Chris Murphy lists@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 + diff --git a/grub/patches/grub-2.02_disable_vga_fallback.patch b/grub/patches/grub-2.02_disable_vga_fallback.patch new file mode 100644 index 000000000..0cf30cff4 --- /dev/null +++ b/grub/patches/grub-2.02_disable_vga_fallback.patch @@ -0,0 +1,15 @@ +We have to remove the vga fallback because this not work on bay-trail and other +new intel onboard graphics. + +diff -Naur grub-2.02.org/grub-core/video/i386/pc/vga.c grub-2.02/grub-core/video/i386/pc/vga.c +--- grub-2.02.org/grub-core/video/i386/pc/vga.c 2015-05-21 17:50:29.000000000 +0200 ++++ grub-2.02/grub-core/video/i386/pc/vga.c 2018-04-15 22:24:41.686842878 +0200 +@@ -122,7 +122,7 @@ + { + grub_err_t err; + +- if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480)) ++// if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480)) + return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found"); + + vga_height = height ? : 480; diff --git a/grubby/grubby.nm b/grubby/grubby.nm deleted file mode 100644 index 576d77a2c..000000000 --- a/grubby/grubby.nm +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = grubby -version = 8.11 -release = 5 - -groups = System/Base -url = http://git.fedorahosted.org/git/grubby.git -license = GPLv2+ -summary = Command line tool for updating bootloader configs. - -description - grubby is a command line tool for updating and displaying information about - the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) - and zipl (s390) boot loaders. It is primarily designed to be used from scripts - which install new kernels and need to find information about the current boot - environment. -end - -# Source tarballs must be generated from git. -sources = %{thisapp}.tar.bz2 - -build - requires - glib2-devel - libblkid-devel - popt-devel - util-linux - end - - make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" - - test - make test - end - - make_install_targets += mandir=%{mandir} - - install_cmds - mkdir -pv %{BUILDROOT}%{prefix} - mv -v %{BUILDROOT}{,%{prefix}}/sbin - end -end - -packages - package %{name} - # Pull in u-boot-tools on ARM platforms. - if "%{DISTRO_ARCH}" == "armv7hl" - requires += u-boot-tools - end - - if "%{DISTRO_ARCH}" == "armv5tel" - requires += u-boot-tools - end - - provides - /sbin/grubby - /sbin/installkernel - /sbin/new-kernel-pkg - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 193cf5772..033ef0e2e 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@

name = kernel version = 5.0 -release = 1 +release = 2 thisapp = linux-%{version}

maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org @@ -309,7 +309,7 @@ packages

requires dracut - grubby + kernel-updater linux-firmware end

@@ -322,8 +322,7 @@ packages end

_posttrans - /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release} - /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release} + kernel-updater install %{kernel_release} end

script posttransin @@ -334,16 +333,8 @@ packages %{_posttrans} end

- script postin - /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release} - end - - script postup - /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release} - end - - script preun - /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{kernel_release} + script postun + kernel-updater uninstall %{kernel_release} end end

diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index 7084e16f2..dc2d803f7 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -4,8 +4,8 @@ ###############################################################################

name = linux-firmware -version = 20180918 -git_ver = 44d4fca +version = 20190620 +git_ver = 7ae3a09 release = 1.git%{git_ver} arch = noarch thisapp = %{name}-%{git_ver} diff --git a/pcengines-apu-firmware/pcengines-apu-firmware.nm b/pcengines-apu-firmware/pcengines-apu-firmware.nm index 81308fe2b..72543d9a1 100644 --- a/pcengines-apu-firmware/pcengines-apu-firmware.nm +++ b/pcengines-apu-firmware/pcengines-apu-firmware.nm @@ -4,7 +4,7 @@ ###############################################################################

name = pcengines-apu-firmware -version = 4.9.0.3 +version = 4.9.0.6 release = 1 arch = noarch

diff --git a/sed/sed.nm b/sed/sed.nm index 49a44e463..7e1691b27 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -4,8 +4,8 @@ ###############################################################################

name = sed -version = 4.2.2 -release = 2 +version = 4.7 +release = 1

groups = Applications/Text url = http://sed.sourceforge.net/ @@ -21,12 +21,19 @@ description end

source_dl = ftp://ftp.gnu.org/gnu/sed/ +sources = %{thisapp}.tar.xz

build configure_options += \ --without-included-regex

test + # Disable broken tests. + sed \ + -e 's|testsuite/inplace-selinux.sh||g' \ + -e 's|testsuite/panic-tests.sh||g' \ + -i Makefile + make check end end

hooks/post-receive -- IPFire 3.x development tree