diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-bsp')
28 files changed, 598 insertions, 738 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/external/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 2c0914d3..b89fe677 100644 --- a/external/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -30,8 +30,13 @@ RDEPENDS_${PN}_arm = "dmidecode" RDEPENDS_${PN}_aarch64 = "dmidecode" RDEPENDS_${PN}_powerpc = "dmidecode" RDEPENDS_${PN}_powerpc64 = "dmidecode" +RDEPENDS_${PN}_powerpc64le = "dmidecode" RDEPENDS_${PN}_append = " \ - perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \ + perl \ + perl-module-file-basename \ + perl-module-file-find \ + perl-module-getopt-long \ + perl-module-posix \ perl-module-overload \ perl-module-overloading \ perl-module-file-glob \ diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.16.bb b/external/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.16.bb deleted file mode 100644 index 6497e092..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.16.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager." -SUMMARY = "EFI Boot Manager" -HOMEPAGE = "https://github.com/rhinstaller/efibootmgr" -SECTION = "base" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -DEPENDS = "pciutils zlib efivar" - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "a5103251a11663adddc85c86e0b8d3d3b73cbb4a" -SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ - " -S = "${WORKDIR}/git" - -inherit pkgconfig - -EXTRA_OEMAKE = "'EFIDIR=/' 'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar`'" - -CFLAGS_append_toolchain-clang = " -Wno-error" -do_install () { - install -D -p -m0755 ${B}/src/efibootmgr ${D}/${sbindir}/efibootmgr -} - -CLEANBROKEN = "1" diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 251e50c9..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9115d9e6f0f62d6bb735ce3698858d1f89f8d73 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Fri, 25 Sep 2015 18:14:31 +0800 -Subject: [PATCH] efivar: fix for cross compile - -It builds and calls elf file makeguids to generate a header file which -doesn't work for cross compile. Fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 0c16597..dcc7fc8 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -40,8 +40,8 @@ abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS)) - ./guid-symbols.c : include/efivar/efivar-guids.h - ./guids.bin : include/efivar/efivar-guids.h - ./names.bin : include/efivar/efivar-guids.h --include/efivar/efivar-guids.h : makeguids guids.txt -- ./makeguids guids.txt guids.bin names.bin \ -+include/efivar/efivar-guids.h : guids.txt -+ makeguids guids.txt guids.bin names.bin \ - guid-symbols.c include/efivar/efivar-guids.h - - makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch deleted file mode 100644 index 96d0c6b3..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b3d35e7dd27a755df5acbe050837885914dbb28b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 10 May 2016 11:34:50 -0400 -Subject: [PATCH] fix unknow option for gold linker - -- Revert the following patch, since oe-core work with gcc 5 -... -commit 3055a3797f16693dfdd855fa68bc57fd900dc408 -Author: Peter Jones <pjones@redhat.com> -Date: Mon Feb 15 14:15:40 2016 -0500 - - Make gcc.specs work with gcc 6 / binutils 2.26 - - Apparently binutils 2.26 gets real picky about "ld -PIC" vs "ld -fPIC". - - Signed-off-by: Peter Jones <pjones@redhat.com> -... - -- Remove unknown option '--add-needed' - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc.specs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/gcc.specs -=================================================================== ---- git.orig/gcc.specs -+++ git/gcc.specs -@@ -14,4 +14,4 @@ - + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} - - *link: --+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} -++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch deleted file mode 100644 index 043b07a6..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 14:18:35 +0800 -Subject: [PATCH] allow multi definitions for native - -Upstream-Status: Pending - -It fails to create .so file when build efivar-native: - -| lib.o:(*IND*+0x0): multiple definition of `efi_set_variable' -| lib.o:lib.c:(.text+0xa0): first defined here - -Add link option '-z muldefs' to fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Make.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Make.rules b/Make.rules -index 042585b..257ba45 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version - $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ - -Wl,-soname,$@.1 \ - -Wl,--version-script=$(MAP) \ -+ -Wl,-z,muldefs \ - -o $@ $^ $(LDLIBS) - ln -vfs $@ $@.1 - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch deleted file mode 100644 index dbc9a575..00000000 --- a/external/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/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb b/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb deleted file mode 100644 index 20588ee9..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Tools to manipulate UEFI variables" -DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" -HOMEPAGE = "https://github.com/rhinstaller/efivar" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" - -DEPENDS = "popt" -DEPENDS_append_class-target = " efivar-native" - -inherit pkgconfig - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea" -SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://allow-multi-definitions-for-native.patch \ - " -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" - -do_compile_prepend() { - sed -i -e s:-Werror::g ${S}/gcc.specs -} - -do_compile_class-native() { - oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - -do_install_class-native() { - install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids -} - -BBCLASSEXTEND = "native" diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch deleted file mode 100644 index df802862..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e5f68189ab3602b1042cc8423fd6a3a23abd5455 Mon Sep 17 00:00:00 2001 -From: Alex James <theracermaster@gmail.com> -Date: Sat, 14 Apr 2018 22:59:57 -0500 -Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions - -libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions -of libusb, use libusb_set_option instead. - -Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 -Signed-off-by: Alex James <theracermaster@gmail.com> -Reviewed-on: https://review.coreboot.org/25681 -Tested-by: Nico Huber <nico.h@gmx.de> -Reviewed-by: David Hendricks <david.hendricks@gmail.com> ---- -Upstream-Status: Backport - ch341a_spi.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ch341a_spi.c b/ch341a_spi.c -index 6eb2804..d880510 100644 ---- a/ch341a_spi.c -+++ b/ch341a_spi.c -@@ -444,7 +444,12 @@ int ch341a_spi_init(void) - return -1; - } - -- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). -+ /* Enable information, warning, and error messages (only). */ -+#if LIBUSB_API_VERSION < 0x01000106 -+ libusb_set_debug(NULL, 3); -+#else -+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -+#endif - - uint16_t vid = devs_ch341a_spi[0].vendor_id; - uint16_t pid = devs_ch341a_spi[0].device_id; --- -2.17.0 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch deleted file mode 100644 index 7ba69a91..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2a28dcdbd1051d2f48320e2eda3393581fe0519 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Mar 2018 23:08:29 -0700 -Subject: [PATCH] platform: Add riscv to known platforms - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://review.coreboot.org/#/c/flashrom/+/25260/] - platform.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/platform.h b/platform.h -index b2fdcd0..2cadbb3 100644 ---- a/platform.h -+++ b/platform.h -@@ -69,6 +69,9 @@ - #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" - #define IS_M68K 1 -+#elif defined (__riscv) -+ #define __FLASHROM_ARCH__ "riscv" -+ #define IS_RISCV 1 - #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" - #define IS_SH 1 -@@ -77,7 +80,7 @@ - #define IS_S390 1 - #endif - --#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) -+#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) - #error Unknown architecture - #endif - --- -2.16.2 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch new file mode 100644 index 00000000..7ac53650 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch @@ -0,0 +1,69 @@ +From 8a236330f2af56bde21e9f69208ea3e59f529f0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Mar 2020 17:02:30 -0700 +Subject: [PATCH] typecast enum conversions explicitly + +clang complains like below + +libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_boards[i].working = binfo[i].working; + ~ ~~~~~~~~~^~~~~~~ +libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_chipsets[i].status = chipset[i].status; + ~ ~~~~~~~~~~~^~~~~~ + +However these enums are exactly same so they can be typecasted + +libflashrom.h + +/** @ingroup flashrom-query */ +enum flashrom_test_state { + FLASHROM_TESTED_OK = 0, + FLASHROM_TESTED_NT = 1, + FLASHROM_TESTED_BAD = 2, + FLASHROM_TESTED_DEP = 3, + FLASHROM_TESTED_NA = 4, +}; + +flash.h + +enum test_state { + OK = 0, + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ + }; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libflashrom.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libflashrom.c b/libflashrom.c +index 0dec22e..7956685 100644 +--- a/libflashrom.c ++++ b/libflashrom.c +@@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void) + for (; i < boards_known_size; ++i) { + supported_boards[i].vendor = binfo[i].vendor; + supported_boards[i].name = binfo[i].name; +- supported_boards[i].working = binfo[i].working; ++ supported_boards[i].working = (enum flashrom_test_state)binfo[i].working; + } + } else { + msg_gerr("Memory allocation error!\n"); +@@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) + supported_chipsets[i].chipset = chipset[i].device_name; + supported_chipsets[i].vendor_id = chipset[i].vendor_id; + supported_chipsets[i].chipset_id = chipset[i].device_id; +- supported_chipsets[i].status = chipset[i].status; ++ supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status; + } + } else { + msg_gerr("Memory allocation error!\n"); +-- +2.25.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch deleted file mode 100644 index 46a01529..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- flashrom-0.9.9.orig/chipdrivers.h -+++ flashrom-0.9.9/chipdrivers.h -@@ -103,6 +103,7 @@ - int spi_prettyprint_status_register_sst25(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); - - /* sfdp.c */ - int probe_spi_sfdp(struct flashctx *flash); ---- flashrom-0.9.9.orig/flashchips.c -+++ flashrom-0.9.9/flashchips.c -@@ -12564,6 +12564,120 @@ - - { - .vendor = "SST", -+ .name = "SST26VF016B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF016B, -+ .total_size = 2048, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 512} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 30}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {2 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ { -+ .vendor = "SST", -+ .name = "SST26VF032B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF032B, -+ .total_size = 4096, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_UNTESTED, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 1024} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 62}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {4 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ -+ { -+ .vendor = "SST", -+ .name = "SST26VF064B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF064B, -+ .total_size = 8192, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 2048} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 126}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {8 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ { -+ .vendor = "SST", - .name = "SST25WF512", - .bustype = BUS_SPI, - .manufacture_id = SST_ID, ---- flashrom-0.9.9.orig/flashchips.h -+++ flashrom-0.9.9/flashchips.h -@@ -697,6 +697,8 @@ - #define SST_SST25VF064C 0x254B - #define SST_SST26VF016 0x2601 - #define SST_SST26VF032 0x2602 -+#define SST_SST26VF016B 0x2641 -+#define SST_SST26VF032B 0x2642 - #define SST_SST26VF064B 0x2643 - #define SST_SST27SF512 0xA4 - #define SST_SST27SF010 0xA5 ---- flashrom-0.9.9.orig/linux_spi.c -+++ flashrom-0.9.9/linux_spi.c -@@ -141,6 +141,16 @@ - return 0; - } - -+static void print_hex(const char *msg, const void *buf, size_t len) -+{ -+ size_t i; -+ msg_pspew("%s:\n", msg); -+ for (i = 0; i < len; i++) { -+ msg_pspew(" %02x", ((uint8_t *)buf)[i]); -+ } -+ msg_pspew("\n"); -+} -+ - static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, - unsigned int readcnt, - const unsigned char *txbuf, -@@ -172,10 +182,12 @@ - else - iocontrol_code = SPI_IOC_MESSAGE(2); - -+ print_hex("Write", txbuf, writecnt); - if (ioctl(fd, iocontrol_code, msg) == -1) { - msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); - return -1; - } -+ if (readcnt) print_hex("Got", rxbuf, readcnt); - return 0; - } - ---- flashrom-0.9.9.orig/spi25_statusreg.c -+++ flashrom-0.9.9/spi25_statusreg.c -@@ -196,6 +196,19 @@ - return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); - } - -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) -+{ -+ int result = spi_write_enable(flash); -+ if (result) -+ return result; -+ -+ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ -+ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); -+ if (result) -+ msg_cerr("ULBPR failed\n"); -+ return result; -+} -+ - /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and - * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ - int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb deleted file mode 100644 index 1c172466..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils libusb libusb-compat" - -SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://sst26.patch \ - file://0001-platform-Add-riscv-to-known-platforms.patch \ - file://0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch \ - " -SRC_URI[md5sum] = "42d999990c735d88653627cefcc13b9a" -SRC_URI[sha256sum] = "3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb new file mode 100644 index 00000000..642cec15 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + file://0001-typecast-enum-conversions-explicitly.patch \ + " +SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" +SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" + +S = "${WORKDIR}/flashrom-v${PV}" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init new file mode 100755 index 00000000..6f29e9c6 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init @@ -0,0 +1,78 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: irda +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Infrared port support +### END INIT INFO + +NAME="irattach" +test -x "$IRDA_DAEMON" || IRDA_DAEMON=/usr/sbin/irattach +test -z "$IRATTACH_PID" && IRATTACH_PID=/var/run/irattach.pid + +# Source function library. +. /etc/init.d/functions + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +if [ ! -f /etc/sysconfig/irda ]; then + case `module_id` in + "HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal") + IRDA=yes + DEVICE=/dev/ttyS2 + DONGLE= + DISCOVERY= + ;; + *) + IRDA=yes + DEVICE=/dev/ttyS1 + DONGLE= + DISCOVERY= + ;; + esac +else + . /etc/sysconfig/irda +fi + +# Check that irda is up. +[ ${IRDA} = "no" ] && exit 0 + +[ -f /usr/sbin/irattach ] || exit 0 + +ARGS= +if [ $DONGLE ]; then + ARGS="$ARGS -d $DONGLE" +fi +if [ "$DISCOVERY" = "yes" ];then + ARGS="$ARGS -s" +fi + +case "$1" in + start) + echo -n "Starting IrDA: $NAME" + start-stop-daemon --start --quiet --exec "$IRDA_DAEMON" ${DEVICE} ${ARGS} --pidfile "$IRATTACH_PID" + sleep 1 + [ -f /var/run/irattach.pid ] && echo " done" || echo " fail" + ;; + stop) + echo "Stopping IrDA: $NAME" + start-stop-daemon --stop --quiet --exec "$IRDA_DAEMON" --pidfile "$IRATTACH_PID" + ;; + restart|force-reload) + $0 stop + $0 start + ;; + status) + status irattach + exit $? + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch new file mode 100644 index 00000000..b246de8f --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch @@ -0,0 +1,87 @@ +Obey LDFLAGS + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Upstream-Status: Pending + +Index: irda-utils-0.9.18/findchip/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/findchip/Makefile ++++ irda-utils-0.9.18/findchip/Makefile +@@ -65,5 +65,5 @@ install: findchip + + gfindchip: gfindchip.c + $(prn_cc) +- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` + +Index: irda-utils-0.9.18/irattach/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irattach/Makefile ++++ irda-utils-0.9.18/irattach/Makefile +@@ -49,13 +49,13 @@ all: $(TARGETS) + + irattach: irattach.o util.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ + + + + dongle_attach: dongle_attach.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ + + + install: $(TARGETS) +Index: irda-utils-0.9.18/irdadump/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irdadump/Makefile ++++ irda-utils-0.9.18/irdadump/Makefile +@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + + .c.o: +Index: irda-utils-0.9.18/irdaping/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irdaping/Makefile ++++ irda-utils-0.9.18/irdaping/Makefile +@@ -56,7 +56,7 @@ all: $(TARGETS) + + irdaping: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: +Index: irda-utils-0.9.18/irnetd/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/irnetd/Makefile ++++ irda-utils-0.9.18/irnetd/Makefile +@@ -50,7 +50,7 @@ all: $(TARGETS) + + irnetd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + install: irnetd +Index: irda-utils-0.9.18/psion/Makefile +=================================================================== +--- irda-utils-0.9.18.orig/psion/Makefile ++++ irda-utils-0.9.18/psion/Makefile +@@ -25,4 +25,4 @@ install: $(PSION_TARGETS) + CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ +\ No newline at end of file ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@ +\ No newline at end of file diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch new file mode 100644 index 00000000..97eb9750 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch @@ -0,0 +1,29 @@ +Replace use of <net/if_packet.h> with <linux/if_packet.h>. + +kernel headers <linux/if_packet.h> already provides the +needed definitions, moreover not all libc implementations +provide if_packet.h e.g. musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: irda-utils-0.9.18/irdaping/irdaping.c +=================================================================== +--- irda-utils-0.9.18.orig/irdaping/irdaping.c ++++ irda-utils-0.9.18/irdaping/irdaping.c +@@ -33,7 +33,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + #include <net/if.h> /* For struct ifreq */ +-#include <net/if_packet.h> /* For struct sockaddr_pkt */ + #include <net/if_arp.h> /* For ARPHRD_IRDA */ + #include <netinet/if_ether.h> /* For ETH_P_ALL */ + #include <netinet/in.h> /* For htons */ +@@ -46,6 +45,7 @@ + #include <asm/byteorder.h> /* __cpu_to_le32 and co. */ + + #include <linux/types.h> /* For __u8 and co. */ ++#include <linux/if_packet.h> /* For struct sockaddr_pkt */ + #include <irda.h> + + #ifndef AF_IRDA diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb new file mode 100644 index 00000000..caffcb69 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb @@ -0,0 +1,64 @@ +SUMMARY = "Common files for IrDA" +DESCRIPTION = "Provides common files needed to use IrDA. \ +IrDA allows communication over Infrared with other devices \ +such as phones and laptops." +HOMEPAGE = "http://irda.sourceforge.net/" +BUGTRACKER = "http://sourceforge.net/p/irda/bugs/" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://smcinit/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://man/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178" + +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ + file://ldflags.patch \ + file://musl.patch \ + file://init" + +SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb" +SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6" + +inherit update-rc.d + +RRECOMMENDS_${PN} = "\ + kernel-module-pxaficp-ir \ + kernel-module-irda \ + kernel-module-ircomm \ + kernel-module-ircomm-tty \ + kernel-module-irlan \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ + kernel-module-irport \ + kernel-module-irtty \ + kernel-module-irtty-sir \ + kernel-module-sir-dev \ + ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " + +EXTRA_OEMAKE = "\ + 'CC=${CC}' \ + 'LD=${LD}' \ + 'CFLAGS=${CFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ + 'SYS_INCLUDES=' \ + 'V=1' \ +" + +INITSCRIPT_NAME = "irattach" +INITSCRIPT_PARAMS = "defaults 20" + +TARGETS ??= "irattach irdaping" +do_compile () { + for t in ${TARGETS}; do + oe_runmake -C $t + done +} + +do_install () { + install -d ${D}${sbindir} + for t in ${TARGETS}; do + oe_runmake -C $t ROOT="${D}" install + done + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} +} diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch new file mode 100644 index 00000000..09f4993a --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] Don't build with -Werror to fix compile error. + +| 550 | _dump_sgpio_amd(&amd_reg->amd); +| | ^~~~~~~~~~~~~ +| amd_sgpio.c: In function '_write_amd_register': +| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] + +Upstream-Status: Submitted +https://github.com/intel/ledmon/pull/48/commits + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7bc20f8..7e01bd5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1]) + AX_AM_CFLAGS_ADD([-Werror=shift-negative-value]) + AX_AM_CFLAGS_ADD([-Werror=alloca]) + AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers]) +-AX_AM_CFLAGS_ADD([-Werror]) + AX_AM_CFLAGS_ADD([-Werror=format-signedness]) + + AC_SUBST([AM_CFLAGS]) +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch b/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch new file mode 100644 index 00000000..75bf2b4f --- /dev/null +++ b/external/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/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb new file mode 100644 index 00000000..f9ae9aad --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -0,0 +1,41 @@ +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 autotools systemd + +SYSTEMD_SERVICE_${PN} = "ledmon.service" + +# 0.93 +SRC_URI = "git://github.com/intel/ledmon;branch=master \ + file://0002-include-sys-select.h-and-sys-types.h.patch \ + file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ + " + +SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" +COMPATIBLE_HOST_libc-musl = "null" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" + +# The ledmon sources include headers in ${S}/config to build but not in CFLAGS. +# We need to add this include path in CFLAGS. +CFLAGS += "-I${S}/config" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0755 ${S}/systemd/ledmon.service ${D}${systemd_unitdir}/system + fi +} diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index b0091d65..b55bd516 100644 --- a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -14,6 +14,9 @@ SRC_URI = "file://fancontrol \ " S = "${WORKDIR}" +PACKAGECONFIG ??= "sensord" +PACKAGECONFIG[sensord] = ",," + RDEPENDS_${PN}-dev = "" do_install() { @@ -25,27 +28,29 @@ do_install() { install -d ${D}${sysconfdir}/sensors.d install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d - # Install sensord configuration file - install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + # Install sensord configuration file + install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} - # Install sensord.cgi script and create world-writable - # web-accessible sensord directory - install -d ${D}/www/pages/cgi-bin - install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin - install -d -m a=rwxs ${D}/www/pages/sensord + # Install sensord.cgi script and create world-writable + # web-accessible sensord directory + install -d ${D}/www/pages/cgi-bin + install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin + install -d -m a=rwxs ${D}/www/pages/sensord + fi } # libsensors configuration PACKAGES =+ "${PN}-libsensors" # sensord logging daemon configuration -PACKAGES =+ "${PN}-sensord" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)}" # fancontrol script configuration PACKAGES =+ "${PN}-fancontrol" # sensord web cgi support -PACKAGES =+ "${PN}-cgi" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-cgi', '', d)}" RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" FILES_${PN}-cgi = "/www/*" diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch deleted file mode 100644 index abf6e752..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c4428260e7685ebaf5c26c6ecaae5a56849853e8 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Tue, 6 Sep 2016 14:04:29 +0800 -Subject: [PATCH] lmsensors: sensors-detect: print a special message when there - isn't enough cpu info - -When running sensors-detect, if there isn't enough information in -/proc/cpuinfo for this arch (e.g. ppc64), "Use of uninitialized value -in concatenation (.) or string at /usr/sbin/sensors-detect line 2867" -and incomplete "# Processor: (//)" will be printed. -Here print out a prompt for such a case. - -Upstream-Status: Pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - prog/detect/sensors-detect | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 3c2b44f..5f62405 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2864,7 +2864,12 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } -+ else { -+ print "# Processor: There isn't enough cpu info for this arch!!!\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus --- -1.9.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch deleted file mode 100644 index fb3878dc..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 727524453f115ddc05109e9bbb3d0e60a7db9185 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 15:05:50 -0700 -Subject: [PATCH] prog: Do not limit sys/io.h header include to just glibc - -musl provides it too. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - prog/dump/isadump.c | 6 ------ - prog/dump/isaset.c | 6 ------ - prog/dump/superio.c | 5 ----- - prog/dump/util.c | 5 ----- - 4 files changed, 22 deletions(-) - -diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c -index e0e6f00..8794537 100644 ---- a/prog/dump/isadump.c -+++ b/prog/dump/isadump.c -@@ -36,13 +36,7 @@ - #include "util.h" - #include "superio.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c -index e743755..85a4f64 100644 ---- a/prog/dump/isaset.c -+++ b/prog/dump/isaset.c -@@ -32,13 +32,7 @@ - #include <string.h> - #include "util.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/superio.c b/prog/dump/superio.c -index 64ef27b..906fe55 100644 ---- a/prog/dump/superio.c -+++ b/prog/dump/superio.c -@@ -20,12 +20,7 @@ - */ - - #include <stdlib.h> -- --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #include "superio.h" - -diff --git a/prog/dump/util.c b/prog/dump/util.c -index 874c1b9..197fa64 100644 ---- a/prog/dump/util.c -+++ b/prog/dump/util.c -@@ -11,12 +11,7 @@ - #include <stdio.h> - #include "util.h" - --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - /* Return 1 if we should continue, 0 if we should abort */ - int user_ack(int def) --- -2.13.3 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index ffab5d6b..890db55b 100644 --- a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -1,44 +1,48 @@ -SUMMARY = "lm_sensors" -DESCRIPTION = "Hardware health monitoring applications" -HOMEPAGE = "http://www.lm-sensors.org/" +SUMMARY = "Hardware health monitoring applications" +HOMEPAGE = "https://hwmon.wiki.kernel.org/" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool" +DEPENDS = " \ + bison-native \ + flex-native \ + virtual/libiconv \ +" -SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ +SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ file://fancontrol.init \ file://sensord.init \ - file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ - file://0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch \ " -SRC_URI[md5sum] = "1e9f117cbfa11be1955adc96df71eadb" -SRC_URI[sha256sum] = "e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e" - -# It is using '-' but not '.' as delimiter for the version in the releases page, -# which causes the version comparison unmatched. -#UPSTREAM_CHECK_URI = "https://github.com/groeck/lm-sensors/releases" - -RECIPE_UPSTREAM_VERSION = "3.4.0" -RECIPE_UPSTREAM_DATE = "Jun 25, 2015" -CHECK_DATE = "May 28, 2018" +SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" inherit update-rc.d systemd RDEPENDS_${PN}-dev = "" -INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord" +PACKAGECONFIG ??= "sensord" +PACKAGECONFIG[sensord] = "sensord,,rrdtool" + +INITSCRIPT_PACKAGES = "\ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" INITSCRIPT_NAME_${PN}-sensord = "sensord" INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" -SYSTEMD_PACKAGES = "${PN}-sensord" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service lm_sensors.service fancontrol.service" +SYSTEMD_PACKAGES = "\ + ${PN} \ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " +SYSTEMD_SERVICE_${PN} = "lm_sensors.service" +SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" +SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" SYSTEMD_AUTO_ENABLE = "disable" -S = "${WORKDIR}/lm-sensors-3-4-0" +S = "${WORKDIR}/git" EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ @@ -51,33 +55,49 @@ do_compile() { sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ ${S}/lib/Module.mk - oe_runmake user PROG_EXTRA="sensors sensord" + oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" } do_install() { oe_runmake user_install DESTDIR=${D} - install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} - install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} + install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + fi # Install directory - install -d ${D}${sysconfdir}/init.d + install -d ${D}${INIT_D_DIR} # Install fancontrol init script - install -m 0755 ${WORKDIR}/fancontrol.init \ - ${D}${sysconfdir}/init.d/fancontrol + install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol - # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + # Install sensord init script + install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord + fi # Insall sensord service script - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system + if ! ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + rm ${D}${systemd_system_unitdir}/sensord.service fi } RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" +ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN} += " \ + ${PN}-libsensors \ + ${PN}-sensors \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + ${PN}-fancontrol \ + ${PN}-sensorsdetect \ + ${PN}-sensorsconfconvert \ + ${PN}-pwmconfig \ + ${PN}-isatools \ +" + # libsensors packages PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" @@ -85,7 +105,7 @@ PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${ PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" # sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-doc" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord ${PN}-sensord-doc', '', d)}" # fancontrol script PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" @@ -116,13 +136,13 @@ FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" RDEPENDS_${PN}-sensors = "${PN}-libsensors" # sensord logging daemon -FILES_${PN}-sensord = "${sbindir}/sensord ${sysconfdir}/init.d/sensord ${systemd_unitdir}/system/sensord.service" +FILES_${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" # fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/init.d/fancontrol" +FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" RDEPENDS_${PN}-fancontrol = "bash" RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" @@ -140,7 +160,7 @@ RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" # pwmconfig script files FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol" +RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" # isadump and isaset helper program files FILES_${PN}-isatools = "${sbindir}/isa*" diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch deleted file mode 100644 index 154e1401..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef64032b34190079aab591c64a25f7535a977390 Mon Sep 17 00:00:00 2001 -From: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> -Date: Tue, 9 Oct 2018 11:26:34 +0200 -Subject: [PATCH] Makefile: fix bash completion install path - -Change path to bash-completion upstream recommendation used by most -distributions. - -Upstream-Status: Accepted - -Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index fa587dd..433bc41 100644 ---- a/Makefile -+++ b/Makefile -@@ -69,8 +69,8 @@ install-bin: default - $(INSTALL) -m 755 nvme $(DESTDIR)$(SBINDIR) - - install-bash-completion: -- $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash_completion.d -- $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash_completion.d/nvme -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions -+ $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/nvme - - install: install-bin install-man install-bash-completion - --- -1.9.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch new file mode 100644 index 00000000..be5d0dac --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch @@ -0,0 +1,26 @@ +From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 +From: Neel Chotai <neel@chot.ai> +Date: Fri, 14 Feb 2020 17:56:23 +0000 +Subject: [PATCH] fix musl compilation + +Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] +Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> +--- + plugins/micron/micron-nvme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c +index 8240887..165fcf0 100644 +--- a/plugins/micron/micron-nvme.c ++++ b/plugins/micron/micron-nvme.c +@@ -13,6 +13,7 @@ + #include "nvme-print.h" + #include "nvme-ioctl.h" + #include <sys/ioctl.h> ++#include <limits.h> + + #define CREATE_CMD + #include "micron-nvme.h" +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb new file mode 100644 index 00000000..4f4bb2df --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb @@ -0,0 +1,35 @@ +SUMMARY = "NVMe management command line interface" +AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" +HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" +DEPENDS = "util-linux" +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ + file://0001-fix-musl-compilation.patch \ +" +SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" + +S = "${WORKDIR}/git" + +inherit bash-completion systemd + +do_install() { + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ + UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} +} + +pkg_postinst_ontarget_${PN}() { + ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid +} + +PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb b/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb deleted file mode 100644 index 9b7e6cd4..00000000 --- a/external/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "NVMe management command line interface" -AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" -HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ - file://0001-Makefile-fix-bash-completion-install-path.patch \ - " -SRCREV = "642d426faf8a67ed01e90f7c35c0d967f8cc52a3" - -S = "${WORKDIR}/git" - -inherit bash-completion - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} |