diff options
Diffstat (limited to 'poky/meta/recipes-bsp')
-rw-r--r-- | poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 34 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/efivar/efivar/no-werror.patch | 18 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/efivar/efivar_37.bb | 37 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/grub/grub2.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch | 25 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/usbutils/usbutils_012.bb (renamed from poky/meta/recipes-bsp/usbutils/usbutils_010.bb) | 5 |
9 files changed, 149 insertions, 34 deletions
diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch b/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch new file mode 100644 index 000000000..42f3a8182 --- /dev/null +++ b/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch @@ -0,0 +1,31 @@ +From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Wed, 13 Jun 2018 09:41:01 -0400 +Subject: [PATCH] remove extra decl + +Signed-off-by: Peter Jones <pjones@redhat.com> + +Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- + src/efibootmgr.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index de38f01..4e1a680 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) + "invalid numeric value %s\n", + optarg); + } +- /* XXX efivar-36 accidentally doesn't have a public +- * header for this */ +- extern int efi_set_verbose(int verbosity, FILE *errlog); + efi_set_verbose(opts.verbose - 2, stderr); + break; + case 'V': +-- +2.7.4 + diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb new file mode 100644 index 000000000..0e5a81e31 --- /dev/null +++ b/poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager." +SUMMARY = "EFI Boot Manager" +HOMEPAGE = "https://github.com/rhboot/efibootmgr" +SECTION = "base" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +DEPENDS = "efivar popt" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + +SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ + file://0001-remove-extra-decl.patch \ + " +SRCREV = "e067160ecef8208e1944002e5d50b275733211fb" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +# The directory under the ESP that the default bootloader is found in. When +# wic uses a subdirectory, this should use the same one too. +EFIDIR ?= "/" + +EXTRA_OEMAKE += "'EFIDIR=${EFIDIR}'" + +CFLAGS += " -Wno-error" + +do_install () { + oe_runmake install DESTDIR="${D}" +} + +CLEANBROKEN = "1" diff --git a/poky/meta/recipes-bsp/efivar/efivar/no-werror.patch b/poky/meta/recipes-bsp/efivar/efivar/no-werror.patch new file mode 100644 index 000000000..50a0b1023 --- /dev/null +++ b/poky/meta/recipes-bsp/efivar/efivar/no-werror.patch @@ -0,0 +1,18 @@ +Don't use -Werror because newer compilers introduce newer warnings. + +Upstream-Status: Inappropriate [https://github.com/rhboot/efivar/issues/131] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/gcc.specs b/gcc.specs +index 45d43d1..1baf11a 100644 +--- a/gcc.specs ++++ b/gcc.specs +@@ -2,7 +2,7 @@ + + -D_GNU_SOURCE + + *efivar_cpp_options: +- -Werror -Wall -std=gnu11 -Wextra ++ -Wall -std=gnu11 -Wextra + + *cpp_options: + + %(efivar_cpp_options) diff --git a/poky/meta/recipes-bsp/efivar/efivar_37.bb b/poky/meta/recipes-bsp/efivar/efivar_37.bb new file mode 100644 index 000000000..c4254c70d --- /dev/null +++ b/poky/meta/recipes-bsp/efivar/efivar_37.bb @@ -0,0 +1,37 @@ +SUMMARY = "Tools to manipulate UEFI variables" +DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" +HOMEPAGE = "https://github.com/rhboot/efivar" + +LICENSE = "LGPLv2.1+" +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://no-werror.patch" +SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +export CCLD_FOR_BUILD = "${BUILD_CCLD}" + +# Upstream uses --add-needed in gcc.specs which gold doesn't support, so +# enforce BFD. +LDFLAGS += "-fuse-ld=bfd" + +do_compile_prepend() { + # Remove when https://github.com/rhboot/efivar/issues/130 is fixed + oe_runmake CFLAGS="${BUILD_CFLAGS}" -C src makeguids +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native" + +RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs" + +CLEANBROKEN = "1" diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index 7d8c280b3..bac2d7d41 100644 --- a/poky/meta/recipes-bsp/grub/grub2.inc +++ b/poky/meta/recipes-bsp/grub/grub2.inc @@ -60,7 +60,7 @@ BUILD_CFLAGS = "" BUILD_CXXFLAGS = "" BUILD_LDFLAGS = "" -CFLAGS_append = "-Wno-error" +CFLAGS_append = " -Wno-error" do_configure_prepend() { # The grub2 configure script uses variables such as TARGET_CFLAGS etc diff --git a/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch new file mode 100644 index 000000000..5fcb3aa92 --- /dev/null +++ b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch @@ -0,0 +1,25 @@ +Implicit declaration compile warning fixes from Debian + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Upstream-Status: Inappropriate [upstream is dead] + +--- lrzsz-0.12.21.orig/lib/long-options.c ++++ lrzsz-0.12.21/lib/long-options.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #include <getopt.h> + #include "long-options.h" + +--- lrzsz-0.12.21.orig/src/lsyslog.c ++++ lrzsz-0.12.21/src/lsyslog.c +@@ -22,6 +22,7 @@ + #ifdef ENABLE_SYSLOG + #include "zglobal.h" + #include <pwd.h> ++#include <stdio.h> + #include <stdlib.h> + #include <string.h> + #endif diff --git a/poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb index 002c774c6..34556b2c2 100644 --- a/poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +++ b/poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ file://lrzsz_fix_for_automake-1.12.patch \ file://lrzsz-check-locale.h.patch \ file://cve-2018-10195.patch \ + file://include.patch \ " SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" diff --git a/poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch deleted file mode 100644 index 7edff2614..000000000 --- a/poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Backport (https://github.com/gregkh/usbutils/commit/508d1acf42e1bfd470c6bf1a188574c69c20aeed) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 1c9162a5b30550aec8fa163906067bc179291b57 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Fri, 27 Jul 2018 15:28:34 +0100 -Subject: [PATCH] usb-devices: use /bin/sh - -This script doesn't use any bashisms, so change the hashbang to /bin/sh. - -Fixes #73. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - usb-devices | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usb-devices b/usb-devices -index afb4217..89d1b7d 100755 ---- a/usb-devices -+++ b/usb-devices -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # SPDX-License-Identifier: GPL-2.0+ - # - # Copyright (c) 2009 Greg Kroah-Hartman <greg@kroah.com> --- -2.11.0 - diff --git a/poky/meta/recipes-bsp/usbutils/usbutils_010.bb b/poky/meta/recipes-bsp/usbutils/usbutils_012.bb index e6d05b8e8..0213e7af6 100644 --- a/poky/meta/recipes-bsp/usbutils/usbutils_010.bb +++ b/poky/meta/recipes-bsp/usbutils/usbutils_012.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe DEPENDS = "libusb1 virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ - file://usb-devices-avoid-dependency-on-bash.patch \ " -SRC_URI[md5sum] = "5eb2d2d68f9ed6dc3e9659a5988f7ed6" -SRC_URI[sha256sum] = "881ba47fb2df10c3ba54a4cd6755a90377180890788e476f99d480ea9bc8bb58" +SRC_URI[md5sum] = "7484445cbcf04b3eacac892fe58f8d9f" +SRC_URI[sha256sum] = "ae2e10aad530d95839b6f4d46cd41715eae6f0f1789310d793e9be21b3e7ae20" inherit autotools pkgconfig distro_features_check update-alternatives |