diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-bsp | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp')
17 files changed, 317 insertions, 160 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb b/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.16.bb index 9cc62a9591..6497e09230 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.16.bb @@ -10,7 +10,7 @@ DEPENDS = "pciutils zlib efivar" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "5c14da22802576a99ebb854f7aa174f796f7b031" +SRCREV = "a5103251a11663adddc85c86e0b8d3d3b73cbb4a" SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch deleted file mode 100644 index b4ce132a25..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 24 Aug 2017 15:54:47 -0700 -Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang - -change !dp check to a comparision against NULL to silent clang warning -nonnull parameter 'dp' will evaluate to 'true' on first encounter - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/include/efivar/efivar-dp.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/include/efivar/efivar-dp.h b/src/include/efivar/efivar-dp.h -index 3a509b7..c140e8d 100644 ---- a/src/include/efivar/efivar-dp.h -+++ b/src/include/efivar/efivar-dp.h -@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_efidp dp, const_efidp dpi, efidp *out); - * though older or other compilers might just ignore that attribute if they - * don't support it. Ugh. - */ -+#pragma GCC diagnostic push - #if defined(__GNUC__) && __GNUC__ >= 6 - #pragma GCC diagnostic ignored "-Wnonnull-compare" - #endif -+#if defined(__clang__) -+#pragma GCC diagnostic ignored "-Wunknown-attributes" -+#pragma GCC diagnostic ignored "-Wpointer-bool-conversion" -+#endif - - static inline int16_t - __attribute__((__artificial__)) diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch deleted file mode 100644 index 2a6eb065f3..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 00:29:42 -0700 -Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros - -not available on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/makeguids.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/makeguids.c b/src/makeguids.c -index da2f5f7..daf821a 100644 ---- a/src/makeguids.c -+++ b/src/makeguids.c -@@ -155,13 +155,13 @@ main(int argc, char *argv[]) - #if BYTE_ORDER == BIG_ENDIAN\n\ - #define cpu_to_be32(n) (n)\n\ - #define cpu_to_be16(n) (n)\n\ --#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #else\n\ - #define cpu_to_le32(n) (n)\n\ - #define cpu_to_le16(n) (n)\n\ --#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #endif\n\ - """); - diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 83105fe0d1..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sat, 7 May 2016 02:06:47 -0400 -Subject: [PATCH] Makefile: fix efivar.pc not found - -It fixes efivar.pc not found: -... -| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ -| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; -| install: cannot stat 'efivar.pc': No such file or directory -| install: cannot stat 'efiboot.pc': No such file or directory -| make[1]: *** [install] Error 1 -| make[1]: Leaving directory `efivar/0.23-r0/git/src' -| make: *** [install] Error 2 -| ERROR: oe_runmake failed -... - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - src/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index dcc7fc8..691aa8a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -94,7 +94,9 @@ install : all - ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\ - ) - $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) -- $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) -+ $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ -+ sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \ -+ $(DESTDIR)$(PCDIR)/$(x); ) - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar - $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch index f88af1fe17..043b07a655 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch @@ -1,6 +1,6 @@ -From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Wed, 10 Aug 2016 17:49:50 +0800 +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 @@ -14,12 +14,13 @@ 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 88b9aa7..799332f 100644 +index 042585b..257ba45 100644 --- a/Make.rules +++ b/Make.rules @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version @@ -28,5 +29,8 @@ index 88b9aa7..799332f 100644 -Wl,--version-script=$(MAP) \ + -Wl,-z,muldefs \ -o $@ $^ $(LDLIBS) + ln -vfs $@ $@.1 - %.abixml : %.so +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch deleted file mode 100644 index 5864ac63e4..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8000b9afc858472912aace985004b44f8eb467e0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 18 Aug 2017 09:49:49 -0700 -Subject: [PATCH] support musl - -Upstream-Status: Pending ---- - src/linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/linux.c b/src/linux.c -index 34ed479..1304f2b 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -40,6 +40,10 @@ - #include <efivar.h> - #include <efiboot.h> - -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - #include "dp.h" - #include "linux.h" - #include "util.h" diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb index 9d4cdc97be..20588ee974 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb @@ -12,15 +12,11 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" +SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea" SRC_URI = "git://github.com/rhinstaller/efivar.git \ file://allow-multi-definitions-for-native.patch \ - file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ - file://musl-strndupa.patch \ - file://0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch \ " SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ - file://0003-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 \ @@ -28,15 +24,12 @@ SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.pat S = "${WORKDIR}/git" -# Setting CROSS_COMPILE breaks pkgconfig, so just set AR -EXTRA_OEMAKE = "AR=${TARGET_PREFIX}gcc-ar" - do_compile_prepend() { sed -i -e s:-Werror::g ${S}/gcc.specs } do_compile_class-native() { - oe_runmake -C src makeguids + oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch new file mode 100644 index 0000000000..df8028627a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch @@ -0,0 +1,39 @@ +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/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb index 9eac876ba1..1c17246681 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb @@ -8,6 +8,7 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb index 454a69f40b..ffab5d6bf4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb @@ -16,6 +16,14 @@ SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ 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" + inherit update-rc.d systemd RDEPENDS_${PN}-dev = "" @@ -68,14 +76,16 @@ do_install() { fi } +RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" + # libsensors packages -PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dbg ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" +PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" # sensors command packages -PACKAGES =+ "${PN}-sensors ${PN}-sensors-dbg ${PN}-sensors-doc" +PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" # sensord logging daemon -PACKAGES =+ "${PN}-sensord ${PN}-sensord-dbg ${PN}-sensord-doc" +PACKAGES =+ "${PN}-sensord ${PN}-sensord-doc" # fancontrol script PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" @@ -90,11 +100,11 @@ PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc" PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" # isadump and isaset helper program -PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${PN}-isatools-doc" +PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" + # libsensors files FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dbg = "${libdir}/.debug ${prefix}/src/debug" FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" FILES_${PN}-libsensors-doc = "${mandir}/man3" @@ -102,13 +112,11 @@ RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" # sensors command files FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-dbg = "${bindir}/.debug/sensors" 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-dbg = "${bindir}/.debug/sensord" FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" @@ -136,5 +144,4 @@ RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol" # isadump and isaset helper program files FILES_${PN}-isatools = "${sbindir}/isa*" -FILES_${PN}-isatools-dbg = "${sbindir}/.debug/isa*" FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb index 4b8cbaf099..af34cdc483 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz" -SRC_URI[md5sum] = "4a39e3b09cd422e2cae3edbaf56b3176" -SRC_URI[sha256sum] = "025d009a1af42bc5b2fca664c44c9ecdfd754356e4a44f5c6aced2420afadd50" +SRC_URI[md5sum] = "298a700cd50bb4be1382d618f7b038f4" +SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15" inherit autotools + +S = "${WORKDIR}/lsscsi-030r154" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch new file mode 100644 index 0000000000..154e1401a3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch @@ -0,0 +1,33 @@ +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/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb new file mode 100644 index 0000000000..9b7e6cd4de --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb @@ -0,0 +1,21 @@ +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 +} diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch new file mode 100644 index 0000000000..d4c2bed15c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch @@ -0,0 +1,21 @@ +Include sys/types.h for u_long definition + +Fix errors like +In file included from src/lex_config.l:34:0: +src/yacc_config.y:45:5: error: unknown type name 'u_long' + u_long num; + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: pcmciautils-018/src/lex_config.l +=================================================================== +--- pcmciautils-018.orig/src/lex_config.l ++++ pcmciautils-018/src/lex_config.l +@@ -22,6 +22,7 @@ + #include <unistd.h> + #include <string.h> + #include <syslog.h> ++#include <sys/types.h> + + #ifdef HAS_WORDEXP + #include <wordexp.h> diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch new file mode 100644 index 0000000000..7b0ce21194 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch @@ -0,0 +1,101 @@ +Upstream-Status: Inappropriate [configuration] + +Hardcoded paths are bad... +This lets us use the install from OE's native sysroot +rebase the patch to 018, removing hardcoded path for true +as well. Removing of -D in install invocation is a little +questionable, is it some GNU extention? + +-Khem Raj <raj.khem@gmail.com> + +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin + mandir = ${prefix}/usr/share/man + udevdir = ${prefix}/lib/udev + +-INSTALL = /usr/bin/install -c ++INSTALL = install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} +@@ -180,7 +180,7 @@ endif + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) + CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE +- STRIPCMD = /bin/true -Since_we_are_debugging ++ STRIPCMD = true -Since_we_are_debugging + else + CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment +@@ -273,30 +273,32 @@ clean: + + install-hotplug: + $(INSTALL) -d $(DESTDIR)$(hotplugdir) +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc + + uninstall-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc + + install-socket-hotplug: +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + uninstall-socket-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + install-socket-tools: +- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) ++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) ++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + uninstall-socket-tools: + - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + install-tools: + $(INSTALL) -d $(DESTDIR)$(sbindir) +- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) ++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) ++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) + $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) +- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) ++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) + + uninstall-tools: + - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) +@@ -305,22 +307,24 @@ uninstall-tools: + + install-config: + $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) +- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts ++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + if [ -f config/config.opts.$(ARCH) ]; then \ +- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ ++ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ + fi + + uninstall-config: + # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts + + install-udev: +- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules ++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) ++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + uninstall-udev: + - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + install-man: +- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 ++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + + uninstall-man: diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch new file mode 100644 index 0000000000..4c5eba7951 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch @@ -0,0 +1,29 @@ +"make src/lex_config.o" + +results in: + +src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory + +so add missing dependency through a missing rule. Also remove a rule which +doesn't appear to do anything. + +RP +2016/1/31 + +Upstream-Status: Pending + +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +-yacc_config.o lex_config.o: %.o: %.c +- $(CC) -c -MD -O -pipe $(CPPFLAGS) $< ++src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv ++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + debugtools: ccdv $(CBDUMP) $(CISDUMP) + diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb new file mode 100644 index 0000000000..fc064550fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -0,0 +1,41 @@ +SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem" +HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/" +SECTION = "kernel/userland" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "udev sysfsutils flex-native bison-native" +RDEPENDS_${PN} = "udev module-init-tools" + +PR = "r1" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \ + file://makefile_fix.patch \ + file://makefile_race.patch \ + file://lex_sys_types.patch \ +" + +SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996" +SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558" + +inherit pkgconfig + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export sbindir = "${base_sbindir}" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +export udevdir = "`pkg-config --variable=udevdir udev`" +export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d" +export UDEV = "1" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" +CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" + +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" |