From d776e6e353ba2f34b2fef6b83a887735e85b9f1f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 May 2019 21:49:19 +0000 Subject: triggerhappy: fix issues * using PN instead of BPN in S causes all tasks to fail: make: *** No targets specified and no makefile found. Stop. * using github archives is bad, because they are regenerated from time to time with different checksums * set PV, because this isn't exactly 0.5.0, because of the debian changes mostly the systemd support * fix indentation Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../triggerhappy/triggerhappy_0.5.0.bb | 47 ---------------------- .../triggerhappy/triggerhappy_git.bb | 47 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb create mode 100644 meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb deleted file mode 100644 index 037ce063e..000000000 --- a/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-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb new file mode 100644 index 000000000..24df750e0 --- /dev/null +++ b/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 +} -- cgit v1.2.3-54-g00ecf