From ba6de43c25453413491a8bac2d6f7f7011c9b326 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 21 May 2019 08:07:33 -0400 Subject: meta-openembedded: subtree update:1ecd8b4364..f3018013ff Adrian Bunk (1): Add irda-utils Khem Raj (1): openocd: Upgrade to latest git version Martin Jansa (8): gtkwave: add distro_features_check ndctl: make MACHINE_ARCH and ignore from libblockdev oprofile: make MACHINE_ARCH umip: make MACHINE_ARCH mscgen: fix SRC_URI for multilib python-cassandra-driver.inc: fix DEPENDS triggerhappy: fix issues opencv: use the same package name in PACKAGES and RDEPENDS Oleksandr Kravchuk (4): znc: update to 1.7.3 pure-ftpd: update to 1.0.47 xl2tpd: update to 1.3.14 ell: remove recipe Scott Ellis (1): wireguard: Upgrade 20190123 -> 20190406 Tom Rini (1): toybox: Re-order inherit location so we can override do_configure Zang Ruochen (8): python-pyparsing: upgrade 2.2.0 -> 2.4.0 python-six: upgrade 1.11.0 -> 1.12.0 python-typing: upgrade 3.6.4 -> 3.6.6 python-urllib3: upgrade 1.23 -> 1.25.2 python-wrapt: upgrade 1.10.11 -> 1.11.1 python-mako:upgrade 1.0.9 -> 1.0.10 python-pip: upgrade 19.1 -> 19.1.1 python-pysocks: upgrade 1.6.8 -> 1.7.0 Change-Id: I9a4d8fb60195b1cfd0f39cebf8b113b3bb63808d Signed-off-by: Brad Bishop --- meta-openembedded/meta-oe/conf/layer.conf | 6 ++ .../recipes-bsp/irda-utils/irda-utils-0.9.18/init | 78 +++++++++++++++++++ .../irda-utils/irda-utils-0.9.18/ldflags.patch | 87 ++++++++++++++++++++++ .../irda-utils/irda-utils-0.9.18/musl.patch | 29 ++++++++ .../recipes-bsp/irda-utils/irda-utils_0.9.18.bb | 64 ++++++++++++++++ .../meta-oe/recipes-core/ell/ell_0.17.bb | 17 ----- .../meta-oe/recipes-core/ndctl/ndctl_v63.bb | 3 + .../meta-oe/recipes-core/toybox/toybox_0.7.5.bb | 4 +- ...1.0.22-deprecated-libusb_set_debug-with-l.patch | 39 ---------- .../recipes-devtools/openocd/openocd_git.bb | 3 +- .../triggerhappy/triggerhappy_0.5.0.bb | 47 ------------ .../triggerhappy/triggerhappy_git.bb | 47 ++++++++++++ .../recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 + .../recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 + .../meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 +- .../meta-oe/recipes-support/opencv/opencv_3.4.5.bb | 2 +- 16 files changed, 326 insertions(+), 109 deletions(-) create mode 100755 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb (limited to 'meta-openembedded/meta-oe') diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 31f2f17fc..507ac50ec 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -51,6 +51,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->php \ " +# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel +# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs +# would be MACHINE_ARCH as well +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + libblockdev->ndctl \ +" # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/init new file mode 100755 index 000000000..6f29e9c6e --- /dev/null +++ b/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 } ' &2 + exit 1 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/ldflags.patch new file mode 100644 index 000000000..b246de8f5 --- /dev/null +++ b/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 +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/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch new file mode 100644 index 000000000..97eb97502 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils-0.9.18/musl.patch @@ -0,0 +1,29 @@ +Replace use of with . + +kernel headers already provides the +needed definitions, moreover not all libc implementations +provide if_packet.h e.g. musl + +Signed-off-by: Khem Raj +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 + #include + #include /* For struct ifreq */ +-#include /* For struct sockaddr_pkt */ + #include /* For ARPHRD_IRDA */ + #include /* For ETH_P_ALL */ + #include /* For htons */ +@@ -46,6 +45,7 @@ + #include /* __cpu_to_le32 and co. */ + + #include /* For __u8 and co. */ ++#include /* For struct sockaddr_pkt */ + #include + + #ifndef AF_IRDA diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb new file mode 100644 index 000000000..caffcb696 --- /dev/null +++ b/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/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb deleted file mode 100644 index 27f11cfbe..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Embedded Linux Library" -DESCRIPTION = "ELL is a DBUS library which provides DBUS bindings." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -SECTION = "libs" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "ebc021cee3b2d20ca2af5e3ed02495da616b2fd3" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -DEPENDS = "dbus" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb index 1f3abf514..61e53029b 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb @@ -19,6 +19,9 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" +# Depends on MACHINE_ARCH kernel +PACKAGE_ARCH = "${MACHINE_ARCH}" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb index 614136e27..069f0471c 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb @@ -5,6 +5,8 @@ DEPENDS = "attr virtual/crypt" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" +inherit cml1 update-alternatives + SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ file://OE-path-changes.patch \ " @@ -48,8 +50,6 @@ do_install() { install -m 0644 ${B}/toybox.links ${D}${sysconfdir} } -inherit cml1 update-alternatives - # If you've chosen to install toybox you probably want it to take precedence # over busybox where possible but not over other packages ALTERNATIVE_PRIORITY = "60" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch deleted file mode 100644 index c5b9083dc..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 31 May 2018 21:06:46 -0700 -Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with - libusb_set_option - -libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace -with equivalent libusb_set_option() API - -see libusb commit for more details - -https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] - src/jtag/drivers/xds110.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c -index 90b699027..9bfe02ea8 100644 ---- a/src/jtag/drivers/xds110.c -+++ b/src/jtag/drivers/xds110.c -@@ -367,8 +367,11 @@ static bool usb_connect(void) - - /* Set libusb to auto detach kernel and disable debug messages */ - (void)libusb_set_auto_detach_kernel_driver(dev, 1); -+#if LIBUSB_API_VERSION >= 0x01000106 -+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); -+#else - libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); -- -+#endif - /* Claim the debug interface on the XDS110 */ - result = libusb_claim_interface(dev, INTERFACE_DEBUG); - } else { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 4377e88e4..9a8a09a91 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,11 +9,10 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "cdf1e826eb23c29de1019ce64125f644f01b0afe" +SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb deleted file mode 100644 index 037ce063e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A lightweight hotkey daemon" -HOMEPAGE = "https://github.com/wertarbyte/triggerhappy" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "https://github.com/wertarbyte/triggerhappy/archive/debian/0.5.0-1.tar.gz" - -SRC_URI[md5sum] = "77f90a18c775e47c4c5e9e08987ca32f" -SRC_URI[sha256sum] = "9150bafbf7f2de7d57e6cc154676c33da98dc11ac6442e1ca57e5dce82bd4292" - -S = "${WORKDIR}/${PN}-debian-${PV}-1" - -inherit autotools-brokensep pkgconfig update-rc.d systemd - -PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = ",,systemd" - -INITSCRIPT_NAME = "triggerhappy" -INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" - -FILES_${PN} = "\ -${sbindir}/thd \ -${sbindir}/th-cmd \ -${sysconfdir}/triggerhappy/triggers.d \ -${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ -${sysconfdir}/init.d/triggerhappy \ -${systemd_unitdir}/system \ -" -CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" - -do_install_append() { - install -d ${D}${sysconfdir}/triggerhappy/triggers.d - - install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${S}/udev/triggerhappy-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/triggerhappy - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${S}/systemd/triggerhappy.socket ${D}${systemd_unitdir}/system - install -m 0644 ${S}/systemd/triggerhappy.service ${D}${systemd_unitdir}/system - fi -} diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb new file mode 100644 index 000000000..24df750e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -0,0 +1,47 @@ +SUMMARY = "A lightweight hotkey daemon" +HOMEPAGE = "https://github.com/wertarbyte/triggerhappy" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# matches debian/0.5.0-1 tag +SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" +PV = "0.5.0+git${SRCPV}" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig update-rc.d systemd + +PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +INITSCRIPT_NAME = "triggerhappy" +INITSCRIPT_PARAMS = "defaults" +SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" + +FILES_${PN} = "\ + ${sbindir}/thd \ + ${sbindir}/th-cmd \ + ${sysconfdir}/triggerhappy/triggers.d \ + ${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ + ${sysconfdir}/init.d/triggerhappy \ + ${systemd_unitdir}/system \ +" +CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" + +do_install_append() { + install -d ${D}${sysconfdir}/triggerhappy/triggers.d + + install -d ${D}${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${S}/udev/triggerhappy-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/triggerhappy + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${S}/systemd/triggerhappy.socket ${D}${systemd_unitdir}/system + install -m 0644 ${S}/systemd/triggerhappy.service ${D}${systemd_unitdir}/system + fi +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb index 60df6f773..b9aae0f6c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb @@ -14,6 +14,10 @@ inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" RDEPENDS_${PN} = "tk-lib" +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb index 1dc535ed8..8d706e4a5 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb @@ -3,6 +3,9 @@ require oprofile.inc DEPENDS += "virtual/kernel" DEPENDS_append_powerpc64 = " libpfm4" +# Depends on MACHINE_ARCH kernel +PACKAGE_ARCH = "${MACHINE_ARCH}" + SRC_URI[md5sum] = "bd998df5521ebedae31e71cd3fb6200b" SRC_URI[sha256sum] = "95ded8bde1ec39922f0af015981a67aec63e025a501e4dc04cd65d38f73647e6" diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 6ead015f8..276ad201f 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" -SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${PN}-src-${PV}.tar.gz" +SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb index fa6e06a25..ce60698b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb @@ -176,7 +176,7 @@ SUMMARY_python3-opencv = "Python bindings to opencv" FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-opencv = "python3-core python3-numpy" -RDEPENDS_opencv-apps = "bash" +RDEPENDS_${PN}-apps = "bash" do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ -- cgit v1.2.3