diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-04-19 22:02:49 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-04-19 22:02:49 +0300 |
commit | 36caa12533da01d4319c5ffe7613711a0ec7dea7 (patch) | |
tree | 591c2077bb14cfd9d23893d32cca71fa7a01bc9c /poky/meta/recipes-bsp | |
parent | 12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb (diff) | |
parent | 3cec7f5a630c1ddcad058eb76e1f732a5fa20d59 (diff) | |
download | openbmc-36caa12533da01d4319c5ffe7613711a0ec7dea7.tar.xz |
Merge tag '0.45' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-bsp')
-rw-r--r-- | poky/meta/recipes-bsp/efivar/efivar/determinism.patch | 18 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/efivar/efivar_37.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch | 47 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/grub/grub-efi_2.04.bb | 6 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/grub/grub2.inc | 1 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/grub/grub_2.04.bb | 11 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/opensbi/opensbi_0.9.bb (renamed from poky/meta/recipes-bsp/opensbi/opensbi_0.8.bb) | 3 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-common.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb | 5 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb | 1 |
13 files changed, 83 insertions, 17 deletions
diff --git a/poky/meta/recipes-bsp/efivar/efivar/determinism.patch b/poky/meta/recipes-bsp/efivar/efivar/determinism.patch new file mode 100644 index 000000000..bdf6bfc4a --- /dev/null +++ b/poky/meta/recipes-bsp/efivar/efivar/determinism.patch @@ -0,0 +1,18 @@ +Fix reproducibility issue caused by unsorted wildcard expansion. + +Upstream-Status: Pending +RP 2021/3/1 + +Index: git/src/Makefile +=================================================================== +--- git.orig/src/Makefile ++++ git/src/Makefile +@@ -15,7 +15,7 @@ TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PC + STATICTARGETS=$(STATICLIBTARGETS) $(STATICBINTARGETS) + + LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c \ +- linux.c $(wildcard linux-*.c) ++ linux.c $(sort $(wildcard linux-*.c)) + LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) + LIBEFIVAR_SOURCES = dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c \ + efivarfs.c error.c export.c guid.c guids.S guid-symbols.c \ diff --git a/poky/meta/recipes-bsp/efivar/efivar_37.bb b/poky/meta/recipes-bsp/efivar/efivar_37.bb index 9b95721a4..5bf121ff6 100644 --- a/poky/meta/recipes-bsp/efivar/efivar_37.bb +++ b/poky/meta/recipes-bsp/efivar/efivar_37.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRC_URI = "git://github.com/rhinstaller/efivar.git \ + file://determinism.patch \ file://no-werror.patch" SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" diff --git a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb index 7888aba0f..d27126603 100644 --- a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb +++ b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb @@ -1,5 +1,6 @@ SUMMARY = "Libraries for producing EFI binaries" HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" +DESCRIPTION = "GNU-EFI aims to Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain and the EFI development environment." SECTION = "devel" LICENSE = "GPLv2+ | BSD-2-Clause" LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ diff --git a/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch b/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch new file mode 100644 index 000000000..8aa209144 --- /dev/null +++ b/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch @@ -0,0 +1,47 @@ +From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001 +From: Simon Hardy <simon.hardy@itdev.co.uk> +Date: Tue, 24 Mar 2020 13:29:12 +0000 +Subject: build: Fix GRUB i386-pc build with Ubuntu gcc + +With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is +output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to +fail with: "error: Decompressor is too big." + +This seems to be caused by a section .note.gnu.property that is placed at an +offset such that objcopy needs to pad the img file with zeros. + +This issue is present on: +Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0 +Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008 + +This issue is not present on: +Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0 +RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4) + +The issue can be fixed by removing the section using objcopy as shown in +this patch. + +Signed-off-by: Simon Hardy <simon.hardy@itdev.co.uk> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + gentpl.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-Status: Backport + +diff --git a/gentpl.py b/gentpl.py +index 387588c05..c86550d4f 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -766,7 +766,7 @@ def image(defn, platform): + if test x$(TARGET_APPLE_LINKER) = x1; then \ + $(MACHO2IMG) $< $@; \ + else \ +- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \ ++ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \ + fi + """) + +-- +cgit v1.2.1 + diff --git a/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb b/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb index f80afd95c..287845c50 100644 --- a/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb @@ -70,10 +70,6 @@ do_install() { install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE} } -do_install_append_aarch64() { - rm -rf ${D}/${prefix}/ -} - GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ efi_gop iso9660 configfile search loadenv test" @@ -88,8 +84,6 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ ${EFI_FILES_PATH}/${GRUB_IMAGE} \ " -FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi" - # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index 49c869b5d..f870d41f6 100644 --- a/poky/meta/recipes-bsp/grub/grub2.inc +++ b/poky/meta/recipes-bsp/grub/grub2.inc @@ -27,6 +27,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://script-Remove-unused-fields-from-grub_script_functio.patch \ file://CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ file://CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ + file://6643507ce30f775008e093580f0c9499dfb2c485.patch \ file://determinism.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" diff --git a/poky/meta/recipes-bsp/grub/grub_2.04.bb b/poky/meta/recipes-bsp/grub/grub_2.04.bb index f2942b9e3..d4e09faa4 100644 --- a/poky/meta/recipes-bsp/grub/grub_2.04.bb +++ b/poky/meta/recipes-bsp/grub/grub_2.04.bb @@ -16,12 +16,15 @@ FILES_${PN}-common = " \ ${sbindir} \ ${datadir}/grub \ " - -FILES_${PN}-common_append_aarch64 = " \ - ${libdir}/${BPN} \ -" +ALLOW_EMPTY_${PN} = "1" do_install_append () { + # Avoid conflicts with the EFI package for systems such as arm64 where we + # need to build grub and grub-efi but only EFI is supported by removing EFI + # from this package. + rm -rf ${D}${libdir}/grub/*-efi/ + rmdir --ignore-fail-on-non-empty ${D}${libdir}/grub ${D}${libdir} + install -d ${D}${sysconfdir}/grub.d # Remove build host references... find "${D}" -name modinfo.sh -type f -exec \ diff --git a/poky/meta/recipes-bsp/opensbi/opensbi_0.8.bb b/poky/meta/recipes-bsp/opensbi/opensbi_0.9.bb index 818efac73..cb1c3f2eb 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi_0.8.bb +++ b/poky/meta/recipes-bsp/opensbi/opensbi_0.9.bb @@ -1,5 +1,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." +HOMEPAGE = "https://github.com/riscv/opensbi" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" @@ -7,7 +8,7 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "a98258d0b537a295f517bbc8d813007336731fa9" +SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351" SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index cbce408a2..5a8035f43 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890" +SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb index ef386f76e..ef386f76e 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb deleted file mode 100644 index 4f5b3e5df..000000000 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -require u-boot-common.inc -require u-boot.inc - -DEPENDS += "bc-native dtc-native" - diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb new file mode 100644 index 000000000..2eef1e900 --- /dev/null +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb @@ -0,0 +1,4 @@ +require u-boot-common.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native python3-setuptools-native" diff --git a/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb index a8df80fdd..e614de0c4 100644 --- a/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb @@ -1,5 +1,6 @@ SUMMARY = "User support binary for the uvesafb kernel module" HOMEPAGE = "https://tracker.debian.org/pkg/v86d" +DESCRIPTION = "v86d provides a backend for kernel drivers that need to execute x86 BIOS code. The code is executed in a controlled environment and the results are passed back to the kernel via the netlink interface." # the copyright info is at the bottom of README, expect break LICENSE = "GPLv2" |