dediprog-flasher: upgrade 1.14.20 -> 1.14.21

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 <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gyorgy Sarvari 2026-01-29 12:17:03 +01:00 committed by Khem Raj
parent d30eb4156b
commit c7ec976a3c
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 2 additions and 67 deletions

View File

@ -1,21 +0,0 @@
Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
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 <maciej.pijanowski@3mdeb.com>
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

View File

@ -1,39 +0,0 @@
From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
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 <tymoteusz.burak@3mdeb.com>
---
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

View File

@ -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
}