diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-05-30 00:02:59 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-02 04:02:52 +0300 |
commit | 1e34c2d0324cbcebab11799af2abb18f6639a535 (patch) | |
tree | d4eb639acbdf2c1cb7fd86a74e9f0b1fa8f05295 /poky/meta/recipes-devtools/syslinux | |
parent | 2ee498a2ac22fe5c3eb083ef883628f319b86421 (diff) | |
download | openbmc-1e34c2d0324cbcebab11799af2abb18f6639a535.tar.xz |
poky: subtree update:f468a73523..a35bf0e5d3
Adrian Bunk (3):
apt: Remove workarounds for host gcc < 5
apt: The C.UTF-8 locale is not portable
gcc: Remove mudflap remnants
Alexander Kanavin (5):
devtool: do not write md5sums into upgraded recipes
testresults.json: add duration of the tests as well
bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
libsdl2: enable opengl option for native/nativesdk, subject to 'opengl' in DISTRO_FEATURES
qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE
Anuj Mittal (3):
mtools: upgrade 4.0.23 -> 4.0.24
gsettings-desktop-schemas: upgrade 3.36.0 -> 3.36.1
libsoup-2.4: upgrade 2.68.4 -> 2.70.0
Aníbal Limón (3):
recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
recipes-kernel/linux-firmware: Add adreno-a630 firmware package
linux-firmware: Update to 20200122 -> 20200421
Bruce Ashfield (3):
linux-yocto/5.4: update to v5.4.38
linux-yocto/5.4: update to v5.4.40
kernel/reproducibility: kernel modules need SOURCE_DATE_EPOCH export
Daniel Díaz (1):
ltp: Add net-tools as rdependency
Denys Dmytriyenko (1):
xz: upgrade 5.2.4 -> 5.2.5
Diego (2):
image_types: declare support for wic.zst
bmap-tools: update development snapshot revision
Gregor Zatko (1):
sanity.bbclass: Detect and fail if 'inherit' is used in conf file
Jacob Kroon (2):
squashfs-tools: Backport fix for compiling with gcc 10
bitbake: doc: Clarify how task dependencies relate to RDEPENDS
Jan-Simon Moeller (1):
file: add bzip2-replacement-native to DEPENDS to fix sstate issue
Joe Slater (2):
acpica: Upgrade 20200214 -> 20200430 for gcc-10 fixes
terminal.py: do not stop searching for auto
Joshua Watt (7):
pycryptodome: Import from meta-python
pyelftools: Import from meta-python
python3-pycryptodome(x): Upgrade 3.9.4 -> 3.9.7
python3-pyelftools: Upgrade 0.25 -> 0.26
diffoscope: upgrade 143 -> 144
python3-magic: upgrade 0.4.15 -> 0.4.18
checklayer: Skip layers without a collection
Kai Kang (3):
gcr: depends on gnupg-native
libsecret: add meson option introspection
Revert "webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled"
Khem Raj (20):
tune-cortexa55.inc: crc and crypto extentions are default on cortex-a55
tune-cortexa57.inc: Add new tune file
gcc: Do not set -march for arm64 for libatomic
aarch64: Adjust big.LITTLE tune files to use -mcpu
armv8/tunes: Define TUNE_PKGARCH
valgrind: Do not use outline-atomics on aarch64
gcc: Drop reverting __getauxval patch
qemuarm64.conf: Use cortext-a57 as default tune
glibc: Unify wordsize.h for arm and aarch64
glibc: Do not synthesize wordsize.h for arm multilibs
multilib_header_wrapper.h: Remove pragma once
multilib_header: Fall back to worsize form libc for bpf target
multilib_header_wrapper: Drop using __MHWORDSIZE
syslinux: Fix build with gcc10
valgrind: Backport upstream patch to fix __getauxval needs
re2c: Upgrade to 1.3
libxcrypt: Upgrade to 4.4.16
ltp: Fix format security warnings with gcc10
musl: Update to tip of master
cve-check: Run it after do_fetch
Konrad Weihmann (1):
lib/oe/recipeutils.py: passthrough of FETCHCMD
Lee Chee Yang (1):
qemu: fix CVE-2020-11869
Li Wang (1):
linux-modules.tgz: fix file permissions to root
Marek Vasut (1):
libubootenv: Depend on zlib
Martin Jansa (2):
libsecret: inherit features_check
webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled
Michael Ho (6):
package_rpm.bbclass: respect package overrides for the main package
package.bbclass: add PACKAGE_ADD_METADATA to sstate variables
package_ipk.bbclass: add PACKAGE_ADD_METADATA_IPK to sstate variables
package_deb.bbclass: add PACKAGE_ADD_METADATA_DEB to sstate variables
package_rpm.bbclass: add PACKAGE_ADD_METADATA_RPM to sstate variables
ref-manual: add PACKAGE_ADD_METADATA documentation
Ming Liu (1):
at-spi2-atk: dont inherit features_check
Mingli Yu (2):
bison: fix the parallel build
python3-setuptools: add the missing rdepends
Naveen Saini (2):
libva: upgrade 2.6.1 -> 2.7.1
libva-utils: upgrade 2.6.0 -> 2.7.1
Otavio Salvador (4):
go-mod.bbclass: Add class for `go mod` support
glide: Avoid use of 'go mod' support
go-dep: Avoid use of 'go mod' support
go.bbclass: Add `-trimpath` to default build flags
Ovidiu Panait (4):
lttng-modules: upgrade to 2.12.0
lttng-ust: upgrade to 2.12.0
lttng-modules: Fix "LTTng: vmalloc_sync_all symbol lookup failed" warnings
lttng-tools: upgrade to 2.12.0
Paul Barker (2):
archiver.bbclass: Make do_deploy_archives a recursive dependency
avahi: Don't advertise example services by default
Petr Vorel (1):
ltp: Update to 20200515
Quentin Schulz (2):
base/insane: Check pkgs lics are subset of recipe lics only once
ref-manual: document new unlisted-pkg-lics insane-skip qa check
Ricardo Ribalda (1):
classes/image_types_wic: Reorder do_flush_pseudodb
Richard Purdie (10):
ghostscript: Remove leftover file
layer.conf: Move to gatesgarth naming
meta-poky/meta-yocto-bsp layer.conf: Move to depend on gatesgarth release codename
ltp: Add missing dependencies on coreutils, bc, e2fsprogs and gdb
resulttool/report: Remove leftover debugging
resulttool/log: Add ability to dump ltp logs as well as ptest
ltp: Exclude the memcg_stress tests due to timeout problems
bitbake: event/ast: Add RecipePostKeyExpansion event
multilib/recipes: Use new RecipePostKeyExpansion event
poky.conf: Add Fedora 32, remove Ubuntu 19.04 and poky-2.7
Robert P. J. Day (3):
common-licenses: add "Unlicense" license file
ref-manual: delete long-unused comments in variable glossary
bitbake: user manual: properly tag content as <replaceable>
Robert Yang (1):
archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
Steve Sakoman (2):
oeqa/concurrencytest: don't delete build directory for failed tests
poky: Add Ubuntu 20.04 as a supported distro
Vyacheslav Yurkov (1):
bitbake: fetch2/cvs: Fix CVS fetcher clean method
Wang Mingyu (6):
freetype: upgrade 2.10.1 -> 2.10.2
watchdog: upgrade 5.15 -> 5.16
gnu-efi: upgrade 3.0.11 -> 3.0.12
boost: upgrade 1.72.0 -> 1.73.0
iso-codes: upgrade 4.4 -> 4.5.0
iproute2: upgrade 5.5.0 -> 5.6.0
zhengruoqin (3):
make-mod-scripts: Fix dependence error.
ruby: upgrade 2.7.0 -> 2.7.1
sysstat: upgrade 12.2.1 -> 12.2.2
Change-Id: I47d6a587b6f57ffd2da338f45cee51dfba471365
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/syslinux')
-rw-r--r-- | poky/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch | 97 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 1 |
2 files changed, 98 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch new file mode 100644 index 000000000..44cb15327 --- /dev/null +++ b/poky/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch @@ -0,0 +1,97 @@ +From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001 +From: Merlin Mathesius <mmathesi@redhat.com> +Date: Wed, 13 May 2020 08:02:27 -0500 +Subject: [PATCH] Workaround multiple definition of symbol errors + +Lifted from Fedora https://src.fedoraproject.org/rpms/syslinux/blob/master/f/0005-Workaround-multiple-definition-of-symbol-errors.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + com32/cmenu/Makefile | 2 +- + com32/elflink/ldlinux/Makefile | 2 +- + com32/gpllib/Makefile | 2 +- + com32/hdt/Makefile | 2 +- + core/Makefile | 2 +- + dos/Makefile | 2 +- + efi/Makefile | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +--- a/com32/cmenu/Makefile ++++ b/com32/cmenu/Makefile +@@ -49,7 +49,7 @@ makeoutputdirs: + @mkdir -p $(OBJ)/libmenu + + libmenu/libmenu.elf: $(LIBMENU) +- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) \ ++ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) \ + -o $@ $^ + + tidy dist: +--- a/com32/elflink/ldlinux/Makefile ++++ b/com32/elflink/ldlinux/Makefile +@@ -33,7 +33,7 @@ endif + all: $(BTARGET) ldlinux_lnx.a + + ldlinux.elf : $(OBJS) +- $(LD) $(LDFLAGS) -soname $(SONAME) -o $@ $^ $(LIBS) ++ $(LD) $(LDFLAGS) -z muldefs -soname $(SONAME) -o $@ $^ $(LIBS) + + LNXCFLAGS += -D__export='__attribute__((visibility("default")))' + LNXLIBOBJS = get_key.lo +--- a/com32/gpllib/Makefile ++++ b/com32/gpllib/Makefile +@@ -24,7 +24,7 @@ makeoutputdirs: + $(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b)) + + libgpl.elf : $(LIBOBJS) +- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ ++ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ + + tidy dist clean: + find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ +--- a/com32/hdt/Makefile ++++ b/com32/hdt/Makefile +@@ -52,7 +52,7 @@ QEMU ?= qemu-kvm + all: $(MODULES) $(TESTFILES) + + hdt.elf : $(OBJS) $(LIBS) $(C_LIBS) +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) -z muldefs -o $@ $^ + + memtest: + -[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST) +--- a/core/Makefile ++++ b/core/Makefile +@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld + NASM_ELF = elf + + %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS) +- $(LD) $(LDFLAGS) -pie -Bsymbolic \ ++ $(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \ + -T $(LDSCRIPT) \ + --unresolved-symbols=report-all \ + -E --hash-style=gnu -M -o $@ $< \ +--- a/dos/Makefile ++++ b/dos/Makefile +@@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk + CFLAGS += -D__MSDOS__ -mregparm=3 -DREGPARM=3 + # CFLAGS += -DDEBUG + +-LDFLAGS = -T $(SRC)/dosexe.ld ++LDFLAGS = -T $(SRC)/dosexe.ld -z muldefs + OPTFLAGS = -g + INCLUDES = -include code16.h -nostdinc -iwithprefix include \ + -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \ +--- a/efi/Makefile ++++ b/efi/Makefile +@@ -71,7 +71,7 @@ $(OBJS): | $(OBJ)/$(ARCH) + BTARGET = syslinux.efi + + syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS) +- $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi ++ $(LD) $(LDFLAGS) -z muldefs --strip-debug -o $@ $^ -lgnuefi -lefi + + # We need to rename the .hash section because the EFI firmware + # linker really doesn't like it. diff --git a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index e9dbefb93..3e7eef3a7 100644 --- a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \ file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ file://0009-linux-syslinux-implement-install_bootblock.patch \ + file://0010-Workaround-multiple-definition-of-symbol-errors.patch \ file://0001-install-don-t-install-obsolete-file-com32.ld.patch \ " |