diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp')
4 files changed, 78 insertions, 46 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch deleted file mode 100644 index dbc9a5755..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3edce6a0019bcb90febc1f654b5b2e2bad5c59bd Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 26 May 2016 21:50:01 -0400 -Subject: [PATCH] fix compile failure with older host gcc (<=4.6) - -While host gcc version is 4.6.3 in ubuntu 1204, it -did not recognize -std=gnu11 and -Wmaybe-uninitialized. - -While host gcc version is 4.4.7 in centos6, it -did not recognize -std=gnu11, -Wmaybe-uninitialized, -and -flto. - -For native build, use -std=gnu99 to replace -std=gnu11, -and directly remove -Wmaybe-uninitialized and -flto. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - gcc.specs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc.specs b/gcc.specs -index 45d43d1..f1c6944 100644 ---- a/gcc.specs -+++ b/gcc.specs -@@ -2,13 +2,13 @@ - + -D_GNU_SOURCE - - *efivar_cpp_options: -- -Werror -Wall -std=gnu11 -Wextra -+ -Werror -Wall -std=gnu99 -Wextra - - *cpp_options: - + %(efivar_cpp_options) - - *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} -++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} - - *self_spec: - + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb index 8a56e7adc..4b458dedd 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb @@ -19,8 +19,6 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git \ SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ " -SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ - " S = "${WORKDIR}/git" @@ -42,4 +40,4 @@ do_install_class-native() { BBCLASSEXTEND = "native" -RRECOMMENDS_${PN} = "kernel-module-efivarfs" +RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs" diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch new file mode 100644 index 000000000..75bf2b4f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch @@ -0,0 +1,43 @@ +From 2ee8796db5019341b774bcb4f7d0944d89e1845b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 9 Apr 2019 21:26:55 -0700 +Subject: [PATCH 2/2] include sys/select.h and sys/types.h + +sys/select.h is needed to provide fd_set definition +sys/types.h is needed for ssize_t + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dellssd.c | 1 + + src/utils.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/dellssd.c b/src/dellssd.c +index 7b8d431..e97fe45 100644 +--- a/src/dellssd.c ++++ b/src/dellssd.c +@@ -27,6 +27,7 @@ + #include <unistd.h> + + #include <sys/ioctl.h> ++#include <sys/select.h> + #include <linux/ipmi.h> + + #if _HAVE_DMALLOC_H +diff --git a/src/utils.h b/src/utils.h +index 720447a..c106529 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -21,6 +21,7 @@ + #define _UTILS_H_INCLUDED_ + + #include <getopt.h> ++#include <sys/types.h> + #include "config_file.h" + #include "stdlib.h" + #include "stdint.h" +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb new file mode 100644 index 000000000..74ae56c67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Intel(R) Enclosure LED Utilities" + +DESCRIPTION = "The utilities are designed primarily to be used on storage servers \ + utilizing MD devices (aka Linux Software RAID) for RAID arrays.\ +" +HOMEPAGE = "https://github.com/intel/ledmon" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ +" + +DEPENDS = "sg3-utils udev" + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "ledmon.service" + +SRC_URI = "git://github.com/intel/ledmon;branch=master \ + file://0002-include-sys-select.h-and-sys-types.h.patch \ + " + +SRCREV = "ad1304ca1363d727425a1f23703c523e21feae4f" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" +COMPATIBLE_HOST_libc-musl = "null" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" + +do_install_append() { + install -d ${D}/${systemd_unitdir}/system + oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D}${systemd_unitdir}/system install-systemd +} |