Drop the patches that are included in this release. Changelog: https://github.com/DediProgSW/SF100Linux/compare/V1.14.20.x...V1.14.21,x
Signed-off-by: Gyorgy Sarvari <[email protected]> --- ...01-add-support-for-cross-compilation.patch | 21 ---------- ...2-Makefile-add-conditional-stripping.patch | 39 ------------------- ...1.14.20.bb => dediprog-flasher_1.14.21.bb} | 9 +---- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch delete mode 100644 meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch rename meta-oe/recipes-bsp/dediprog-flasher/{dediprog-flasher_1.14.20.bb => dediprog-flasher_1.14.21.bb} (78%) diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch deleted file mode 100644 index fbc0f5a18e..0000000000 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch +++ /dev/null @@ -1,21 +0,0 @@ -Author: Maciej Pijanowski <[email protected]> -Date: Fri Jul 5 16:39:13 2024 +0200 -Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86] - - Makefile: allow overriding CC - - Signed-off-by: Maciej Pijanowski <[email protected]> - -diff --git a/Makefile b/Makefile -index 139e5c0c3c3c..226303a6921e 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ endif - endif - - PROGRAM = dpcmd --CC = gcc -+CC ?= gcc - PREFIX ?= /usr/local - - PKG_CONFIG ?= pkg-config diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch deleted file mode 100644 index 0fc8ac5bd2..0000000000 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001 -From: Tymoteusz Burak <[email protected]> -Date: Mon, 22 Jul 2024 13:02:59 +0000 -Subject: [PATCH] Makefile: add conditional stripping -Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88] - -This patch introduces a `NOSTRIP` conditional flag to the `install` -target in the Makefile. The purpose of this flag is to allow the -disabling of binary stripping during installation. This is -particularly useful in development environments, such as BitBake, -which handle stripping internally. - -When `NOSTRIP` is set to `1`, the `strip` command will be skipped -during the installation process, preventing potential conflicts or -redundant operations. - -Signed-off-by: Tymoteusz Burak <[email protected]> - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 139e5c0..8b33320 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,7 +58,9 @@ install: $(PROGRAM) - [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false) - install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg - echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) -+ifneq ($(NOSTRIP),1) - strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) -+endif - install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg - echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg - install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d --- -2.30.2 - diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb similarity index 78% rename from meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb rename to meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb index e0041b58e6..9f00d00ec3 100644 --- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb @@ -5,18 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" DEPENDS = "libusb" -SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" +SRCREV = "42edbcc60217f3fb39d5c6e5a68bedaa32844482" SRC_URI = " \ - git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ - file://0001-add-support-for-cross-compilation.patch \ - file://0002-Makefile-add-conditional-stripping.patch \ + git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master;tag=V${PV},x \ " EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}" -PV = "1.0+${SRCPV}" - - do_install() { oe_runmake install }
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#123990): https://lists.openembedded.org/g/openembedded-devel/message/123990 Mute This Topic: https://lists.openembedded.org/mt/117524336/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
