From f0f0279187a243017c96f85135f717143db2ac37 Mon Sep 17 00:00:00 2001 From: wangmy Date: Sun, 10 Apr 2022 23:06:58 +0800 Subject: linuxconsole: upgrade 1.7.0 -> 1.7.1 Changelog: ========= * inputattach supports the Gunze protocol * Three missing dependencies were added in the Makefile * An overflow in ffcfstress was fixed Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../linuxconsole/linuxconsole_1.7.0.bb | 96 ---------------------- .../linuxconsole/linuxconsole_1.7.1.bb | 96 ++++++++++++++++++++++ 2 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb create mode 100644 meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb deleted file mode 100644 index b706f634ed..0000000000 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Linux Console Project" -DESCRIPTION = "This project maintains the Linux Console tools, which include \ -utilities to test and configure joysticks, connect legacy devices to the kernel's \ -input subsystem (providing support for serial mice, touchscreens etc.), and test \ -the input event layer." -HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ - file://51-these-are-not-joysticks-rm.rules \ - file://60-joystick.rules \ - file://inputattachctl \ - file://inputattach.service \ -" - -SRC_URI[sha256sum] = "95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34" - -S = "${WORKDIR}/linuxconsoletools-${PV}" - -inherit systemd pkgconfig - -EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" -EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" - -SYSTEMD_PACKAGES += "inputattach" -SYSTEMD_SERVICE:inputattach = "inputattach.service" -SYSTEMD_AUTO_ENABLE:inputattach = "enable" - -PROVIDES += "joystick" - -PACKAGECONFIG ??= "sdl" -PACKAGECONFIG[sdl] = ",,libsdl2" - -do_compile() { - if ! ${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'true', 'false', d)}; then - # drop ffmvforce so that we don't need libsdl2 - sed '/^PROGRAMS/s/ffmvforce *//g' -i ${S}/utils/Makefile - fi - # respect nonarch_base_libdir path to keep QA check happy - sed 's#DESTDIR)/lib/udev#DESTDIR)/${nonarch_base_libdir}/udev#g' -i ${S}/utils/Makefile - oe_runmake -} - -do_install() { - oe_runmake install - - install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules - install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules - - install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service - install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl -} - -PACKAGES += "inputattach joystick-jscal joystick" - -# We won't package any file here as we are following the same packaging schema -# Debian does and we are splitting it in 'inputattach' and 'joystick' packages. -FILES:${PN} = "" - -FILES:inputattach += "\ - ${bindir}/inputattach \ - ${bindir}/inputattachctl \ - ${systemd_system_unitdir}/inputattach.service \ -" - -FILES:joystick += "\ - ${bindir}/evdev-joystick \ - ${bindir}/ffcfstress \ - ${bindir}/ffmvforce \ - ${bindir}/ffset \ - ${bindir}/fftest \ - ${bindir}/jstest \ - ${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ - ${nonarch_base_libdir}/udev/js-set-enum-leds \ - ${nonarch_base_libdir}/udev/rules.d/60-joystick.rules \ - ${nonarch_base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ -" - -FILES:joystick-jscal = " \ - ${datadir}/joystick \ - ${bindir}/jscal \ - ${bindir}/jscal-restore \ - ${bindir}/jscal-store \ -" - -RDEPENDS:inputattach += "inputattach-config" - -RDEPENDS:joystick-jscal += "\ - bash \ - gawk \ -" diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb new file mode 100644 index 0000000000..f213b7859e --- /dev/null +++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb @@ -0,0 +1,96 @@ +SUMMARY = "Linux Console Project" +DESCRIPTION = "This project maintains the Linux Console tools, which include \ +utilities to test and configure joysticks, connect legacy devices to the kernel's \ +input subsystem (providing support for serial mice, touchscreens etc.), and test \ +the input event layer." +HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://51-these-are-not-joysticks-rm.rules \ + file://60-joystick.rules \ + file://inputattachctl \ + file://inputattach.service \ +" + +SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547" + +S = "${WORKDIR}/linuxconsoletools-${PV}" + +inherit systemd pkgconfig + +EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" +EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" + +SYSTEMD_PACKAGES += "inputattach" +SYSTEMD_SERVICE:inputattach = "inputattach.service" +SYSTEMD_AUTO_ENABLE:inputattach = "enable" + +PROVIDES += "joystick" + +PACKAGECONFIG ??= "sdl" +PACKAGECONFIG[sdl] = ",,libsdl2" + +do_compile() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'true', 'false', d)}; then + # drop ffmvforce so that we don't need libsdl2 + sed '/^PROGRAMS/s/ffmvforce *//g' -i ${S}/utils/Makefile + fi + # respect nonarch_base_libdir path to keep QA check happy + sed 's#DESTDIR)/lib/udev#DESTDIR)/${nonarch_base_libdir}/udev#g' -i ${S}/utils/Makefile + oe_runmake +} + +do_install() { + oe_runmake install + + install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules + install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules + + install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service + install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl +} + +PACKAGES += "inputattach joystick-jscal joystick" + +# We won't package any file here as we are following the same packaging schema +# Debian does and we are splitting it in 'inputattach' and 'joystick' packages. +FILES:${PN} = "" + +FILES:inputattach += "\ + ${bindir}/inputattach \ + ${bindir}/inputattachctl \ + ${systemd_system_unitdir}/inputattach.service \ +" + +FILES:joystick += "\ + ${bindir}/evdev-joystick \ + ${bindir}/ffcfstress \ + ${bindir}/ffmvforce \ + ${bindir}/ffset \ + ${bindir}/fftest \ + ${bindir}/jstest \ + ${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ + ${nonarch_base_libdir}/udev/js-set-enum-leds \ + ${nonarch_base_libdir}/udev/rules.d/60-joystick.rules \ + ${nonarch_base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ +" + +FILES:joystick-jscal = " \ + ${datadir}/joystick \ + ${bindir}/jscal \ + ${bindir}/jscal-restore \ + ${bindir}/jscal-store \ +" + +RDEPENDS:inputattach += "inputattach-config" + +RDEPENDS:joystick-jscal += "\ + bash \ + gawk \ +" -- cgit v1.2.3-54-g00ecf