diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch b/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch deleted file mode 100644 index bbfed0fd82..0000000000 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 13 Apr 2022 20:57:38 -0700 -Subject: [PATCH] utils: Use name of the first prerequisite in rule - -Use $< instead of $^ because the latter will specify both pre-requisite -inputattach.c serio-ids.h files on same compiler cmdline and clang does -not like that and errors out like below - -clang-14: error: cannot specify -o when generating multiple output files - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - utils/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index 1fc51ab..a7434a9 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -46,10 +46,10 @@ endif - evdev-joystick: evdev-joystick.c - - inputattach: inputattach.c serio-ids.h -- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ - - ffcfstress: ffcfstress.c bitmaskros.h -- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) -lm -o $@ - - ffmvforce.o: ffmvforce.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `$(PKG_CONFIG) --cflags sdl2` --- -2.35.2 - diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.8.1.bb similarity index 95% rename from meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb rename to meta-oe/recipes-extended/linuxconsole/linuxconsole_1.8.1.bb index 7ad8549420..24b2c58b6a 100644 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb +++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.8.1.bb @@ -12,14 +12,13 @@ DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ - file://0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch \ file://51-these-are-not-joysticks-rm.rules \ file://60-joystick.rules \ file://inputattachctl \ file://inputattach.service \ " -SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547" +SRC_URI[sha256sum] = "4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/linuxconsole/files/" UPSTREAM_CHECK_REGEX = "linuxconsoletools-(?P\d+(\.\d+)+)\.tar"