* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2cecfd0fdb1ab4b0b7c1b9468a61c8d1d7d06961
@ 2019-04-26 15:20 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-04-26 15:20 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 11964 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 2cecfd0fdb1ab4b0b7c1b9468a61c8d1d7d06961 (commit)
via 452d2b6eaa31c1e0aee0bc1da61ebe5cb5538710 (commit)
via 999e17bf9e8e3c94bc13b1c417311b23bc6abb39 (commit)
via a0c9850c770ef905305766dcc206267c12cdd143 (commit)
via 95028c1ce2458970a3dd6a0e16e5b0b363222df2 (commit)
from 948173dbb4e1451c15ed622f2ba64bcd7d105132 (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 2cecfd0fdb1ab4b0b7c1b9468a61c8d1d7d06961
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 26 16:11:17 2019 +0100
grub: Fix build error with GCC 8
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 452d2b6eaa31c1e0aee0bc1da61ebe5cb5538710
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 26 16:10:25 2019 +0100
grub: Disable efiemu on PC builds
This won't compile with GCC 8 and we do not need it
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 999e17bf9e8e3c94bc13b1c417311b23bc6abb39
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 26 16:05:20 2019 +0100
nasm: Update to 2.14.02
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a0c9850c770ef905305766dcc206267c12cdd143
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 26 16:06:10 2019 +0100
ltrace: Bump package version
This package needs to be rebuilt because it uses elfutils
which has had an soname bump.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 95028c1ce2458970a3dd6a0e16e5b0b363222df2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 26 16:04:48 2019 +0100
elfutils: Update to 0.176
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/grub | 2 -
config/rootfiles/common/x86_64/grub | 4 --
config/rootfiles/packages/elfutils | 36 ++++++-----
lfs/elfutils | 6 +-
lfs/grub | 3 +-
lfs/ltrace | 2 +-
lfs/nasm | 4 +-
....02-fix-packed-not-aligned-error-on-gcc-8.patch | 72 ++++++++++++++++++++++
8 files changed, 99 insertions(+), 30 deletions(-)
create mode 100644 src/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch
Difference in files:
diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub
index bc28d4593..d8bd62113 100644
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@ -146,8 +146,6 @@ usr/lib/grub/i386-pc
#usr/lib/grub/i386-pc/drivemap.module
#usr/lib/grub/i386-pc/echo.mod
#usr/lib/grub/i386-pc/echo.module
-#usr/lib/grub/i386-pc/efiemu.mod
-#usr/lib/grub/i386-pc/efiemu.module
#usr/lib/grub/i386-pc/ehci.mod
#usr/lib/grub/i386-pc/ehci.module
#usr/lib/grub/i386-pc/elf.mod
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index d64a98819..c73e33986 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -146,10 +146,6 @@ usr/lib/grub/i386-pc/drivemap.mod
usr/lib/grub/i386-pc/drivemap.module
usr/lib/grub/i386-pc/echo.mod
usr/lib/grub/i386-pc/echo.module
-usr/lib/grub/i386-pc/efiemu.mod
-usr/lib/grub/i386-pc/efiemu.module
-usr/lib/grub/i386-pc/efiemu32.o
-usr/lib/grub/i386-pc/efiemu64.o
usr/lib/grub/i386-pc/ehci.mod
usr/lib/grub/i386-pc/ehci.module
usr/lib/grub/i386-pc/elf.mod
diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils
index ac6d1ccc2..e5b1124a5 100644
--- a/config/rootfiles/packages/elfutils
+++ b/config/rootfiles/packages/elfutils
@@ -28,44 +28,46 @@ usr/bin/eu-unstrip
#usr/include/libelf.h
#usr/include/nlist.h
usr/lib/elfutils
-#usr/lib/elfutils/libebl_aarch64-0.168.so
+usr/lib/elfutils/libebl_aarch64-0.176.so
#usr/lib/elfutils/libebl_aarch64.so
-#usr/lib/elfutils/libebl_alpha-0.168.so
+usr/lib/elfutils/libebl_alpha-0.176.so
#usr/lib/elfutils/libebl_alpha.so
-#usr/lib/elfutils/libebl_arm-0.168.so
+usr/lib/elfutils/libebl_arm-0.176.so
#usr/lib/elfutils/libebl_arm.so
-#usr/lib/elfutils/libebl_bpf-0.168.so
+usr/lib/elfutils/libebl_bpf-0.176.so
#usr/lib/elfutils/libebl_bpf.so
-#usr/lib/elfutils/libebl_i386-0.168.so
+usr/lib/elfutils/libebl_i386-0.176.so
#usr/lib/elfutils/libebl_i386.so
-#usr/lib/elfutils/libebl_ia64-0.168.so
+usr/lib/elfutils/libebl_ia64-0.176.so
#usr/lib/elfutils/libebl_ia64.so
-#usr/lib/elfutils/libebl_m68k-0.168.so
+usr/lib/elfutils/libebl_m68k-0.176.so
#usr/lib/elfutils/libebl_m68k.so
-#usr/lib/elfutils/libebl_ppc-0.168.so
+usr/lib/elfutils/libebl_ppc-0.176.so
#usr/lib/elfutils/libebl_ppc.so
-#usr/lib/elfutils/libebl_ppc64-0.168.so
+usr/lib/elfutils/libebl_ppc64-0.176.so
#usr/lib/elfutils/libebl_ppc64.so
-#usr/lib/elfutils/libebl_s390-0.168.so
+usr/lib/elfutils/libebl_riscv-0.176.so
+#usr/lib/elfutils/libebl_riscv.so
+usr/lib/elfutils/libebl_s390-0.176.so
#usr/lib/elfutils/libebl_s390.so
-#usr/lib/elfutils/libebl_sh-0.168.so
+usr/lib/elfutils/libebl_sh-0.176.so
#usr/lib/elfutils/libebl_sh.so
-#usr/lib/elfutils/libebl_sparc-0.168.so
+usr/lib/elfutils/libebl_sparc-0.176.so
#usr/lib/elfutils/libebl_sparc.so
-#usr/lib/elfutils/libebl_tilegx-0.168.so
+usr/lib/elfutils/libebl_tilegx-0.176.so
#usr/lib/elfutils/libebl_tilegx.so
-#usr/lib/elfutils/libebl_x86_64-0.168.so
+usr/lib/elfutils/libebl_x86_64-0.176.so
#usr/lib/elfutils/libebl_x86_64.so
-usr/lib/libasm-0.168.so
+usr/lib/libasm-0.176.so
#usr/lib/libasm.a
usr/lib/libasm.so
usr/lib/libasm.so.1
-usr/lib/libdw-0.168.so
+usr/lib/libdw-0.176.so
#usr/lib/libdw.a
usr/lib/libdw.so
usr/lib/libdw.so.1
#usr/lib/libebl.a
-usr/lib/libelf-0.168.so
+usr/lib/libelf-0.176.so
#usr/lib/libelf.a
usr/lib/libelf.so
usr/lib/libelf.so.1
diff --git a/lfs/elfutils b/lfs/elfutils
index de11fb570..f72d11531 100644
--- a/lfs/elfutils
+++ b/lfs/elfutils
@@ -24,7 +24,7 @@
include Config
-VER = 0.168
+VER = 0.176
THISAPP = elfutils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = elfutils
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 52adfa40758d0d39e5d5c57689bf38d6
+$(DL_FILE)_MD5 = 077e4f49320cad82bf17a997068b1db9
install : $(TARGET)
diff --git a/lfs/grub b/lfs/grub
index e6131f2f5..56cc9b557 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -100,6 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
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
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch
# Install unifont
cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
@@ -115,7 +116,7 @@ endif
ifeq "$(BUILD_PC)" "1"
cp -r $(DIR_APP) $(DIR_APP_PC)
cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \
- --with-platform=pc CFLAGS= LDFLAGS=
+ --with-platform=pc --disable-efiemu CFLAGS= LDFLAGS=
cd $(DIR_APP_PC) && make $(MAKETUNING)
cd $(DIR_APP_PC) && make install
diff --git a/lfs/ltrace b/lfs/ltrace
index d479910de..1ac7981ea 100644
--- a/lfs/ltrace
+++ b/lfs/ltrace
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ltrace
-PAK_VER = 1
+PAK_VER = 2
DEPS = "elfutils"
diff --git a/lfs/nasm b/lfs/nasm
index e17561684..fd397e710 100644
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -24,7 +24,7 @@
include Config
-VER = 2.13.02
+VER = 2.14.02
THISAPP = nasm-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = abb79a82fa30908217e30f76eca8a557
+$(DL_FILE)_MD5 = 6390bd67b07ff1df9fe628b6929c0353
install : $(TARGET)
diff --git a/src/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch b/src/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch
new file mode 100644
index 000000000..51ee7dc86
--- /dev/null
+++ b/src/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(a)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(a)suse.com>
+Tested-by: Michael Chang <mchang(a)suse.com>
+Tested-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
+Reviewed-by: Daniel Kiper <daniel.kiper(a)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
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-04-26 15:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-26 15:20 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2cecfd0fdb1ab4b0b7c1b9468a61c8d1d7d06961 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox