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 <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
similarity index 73%
rename from meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
index 037ce06..24df750 100644
--- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
@@ -4,12 +4,12 @@
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI = "https://github.com/wertarbyte/triggerhappy/archive/debian/0.5.0-1.tar.gz"
+# 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"
-SRC_URI[md5sum] = "77f90a18c775e47c4c5e9e08987ca32f"
-SRC_URI[sha256sum] = "9150bafbf7f2de7d57e6cc154676c33da98dc11ac6442e1ca57e5dce82bd4292"
-
-S = "${WORKDIR}/${PN}-debian-${PV}-1"
+S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig update-rc.d systemd
@@ -21,12 +21,12 @@
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 \
+ ${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"