package/linuxconsoletools: bump version to 1.8.1

PATCH Applied Koen Martens 2 participants 2 messages Jun 5, 2022

Share & tools

Koen Martens

author

2022-06-05 16:17 UTC #0 lore raw

PATCH 1/1 package/linuxconsoletools: bump version to 1.8.1

Upstream has released a new version. In this version, they have chosen to copy the conditional compilation of tools, however they have chosen to use DISABLE_* flags instead of ENABLE_* flags. Therefore, the logic in our .mk file has been reversed: when an option is *NOT* selected, we set the corresponding DISABLE_* flag.

As a corollary, the patch to add conditional compilation in the upstream Makefile is no longer needed and is removed in this commit.

Tested compilation by running ./utils/test-pkg -a with a configuration that enables all options tools.

Signed-off-by Koen Martens <[email protected]>

Tested-by Koen Martens <[email protected]>

---
 .../0001-conditional-build.patch              | 58 -------------------
 .../linuxconsoletools/linuxconsoletools.hash  |  2 +-
 .../linuxconsoletools/linuxconsoletools.mk    | 18 +++---
 3 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 package/linuxconsoletools/0001-conditional-build.patch

package/linuxconsoletools/0001-conditional-build.patch deleted +0 ~~-58~~

deleted file mode 100644
index 9f462a6436..0000000000
@@ -1,58 +0,0 @@
-Selectively build groups of tools (inputattach,
-joystick tools and/or force-feedback tools).
-
-Signed-off-by: Koen Martens <[email protected]>
-
-diff -Naur a/utils/Makefile b/utils/Makefile
---- a/utils/Makefile	2016-04-19 23:28:36.000000000 +0200
-+++ b/utils/Makefile	2017-06-19 08:54:20.152184000 +0200
-@@ -27,8 +27,26 @@
- 
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
--		  ffcfstress jscal-restore jscal-store evdev-joystick
-+PROGRAMS    =
-+
-+ifdef ENABLE_INPUTATTACH
-+PROGRAMS	+= inputattach
-+endif
-+
-+ifdef ENABLE_JOYSTICK
-+PROGRAMS    += jstest
-+PROGRAMS    += jscal
-+PROGRAMS    += jscal-restore
-+PROGRAMS    += jscal-store
-+PROGRAMS    += evdev-joystick
-+endif
-+
-+ifdef ENABLE_FORCEFEEDBACK
-+PROGRAMS    += fftest
-+PROGRAMS    += ffmvforce
-+PROGRAMS    += ffset
-+PROGRAMS    += ffcfstress
-+endif
- 
- PREFIX          ?= /usr/local
- 
-@@ -79,13 +97,20 @@
- 80-stelladaptor-joystick.rules: 80-stelladaptor-joystick.rules.in
- 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
- 
-+INSTALL_DEP = compile
-+ifdef ENABLE_JOYSTICK
-+INSTALL_DEP +=  80-stelladaptor-joystick.rules
-+endif
-+
- install: compile 80-stelladaptor-joystick.rules
- 	install -d $(DESTDIR)$(PREFIX)/bin
- 	install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
-+ifdef ENABLE_JOYSTICK
- 	install -d $(DESTDIR)$(PREFIX)/share/joystick
- 	install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick
- 	install -d $(DESTDIR)/lib/udev/rules.d
- 	install js-set-enum-leds $(DESTDIR)/lib/udev
- 	install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d
-+endif
- 
- .PHONY: compile clean distclean install

package/linuxconsoletools/linuxconsoletools.hash +1 -1

index 889f6d1d6c..8e4099f163 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547  linuxconsoletools-1.7.1.tar.bz2
+sha256  4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456  linuxconsoletools-1.8.1.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING

package/linuxconsoletools/linuxconsoletools.mk +9 -9

index 306a5b1fa0..a97618c832 100644
@@ -4,24 +4,24 @@
 #
 ################################################################################
 
-LINUXCONSOLETOOLS_VERSION = 1.7.1
+LINUXCONSOLETOOLS_VERSION = 1.8.1
 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2
 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole
 LINUXCONSOLETOOLS_LICENSE = GPL-2.0+
 LINUXCONSOLETOOLS_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y)
-LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_INPUTATTACH=1
+ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_INPUTATTACH=1
 endif
 
-ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y)
-LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_JOYSTICK=1
+ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_JOYSTICK=1
 endif
 
-ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y)
-LINUXCONSOLETOOLS_MAKE_OPTS += \
-	ENABLE_FORCEFEEDBACK=1 \
-	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_FORCEFEEDBACK=1
+else
+LINUXCONSOLETOOLS_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf
 endif

Signature · 4 lines

2.25.1

-- 
https://www.koenmartens.nl/

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Thomas Petazzoni via buildroot

Applied

2022-06-05 20:21 UTC #1 lore raw

Quoted 14 lines · On Sun, 5 Jun 2022 18:09:02 +0200 Koen Martens <[email protected]> wrote:

Upstream has released a new version. In this version, they have chosen to copy the conditional compilation of tools, however they have chosen to use DISABLE_* flags instead of ENABLE_* flags. Therefore, the logic in our .mk file has been reversed: when an option is *NOT* selected, we set the corresponding DISABLE_* flag.
As a corollary, the patch to add conditional compilation in the upstream Makefile is no longer needed and is removed in this commit.
Tested compilation by running ./utils/test-pkg -a with a configuration that enables all options tools.

Quoted 8 lines

Signed-off-by Koen Martens <[email protected]>

Tested-by Koen Martens <[email protected]>

---
 .../0001-conditional-build.patch              | 58 -------------------
 .../linuxconsoletools/linuxconsoletools.hash  |  2 +-
 .../linuxconsoletools/linuxconsoletools.mk    | 18 +++---
 3 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 package/linuxconsoletools/0001-conditional-build.patch

Applied to next, thanks.

Thomas

Signature · 7 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot