Message ID | 20240719151141.477978-1-tymoteusz.burak@3mdeb.com |
---|---|
State | New |
Headers | show |
Series | [meta-oe] dediprog-flasher: Add recipe | expand |
Thanks for the patch a few comments inline below On Fri, Jul 19, 2024 at 8:12 AM Tymoteusz Burak via lists.openembedded.org <tymoteusz.burak=3mdeb.com@lists.openembedded.org> wrote: > --- > ...01-add-support-for-cross-compilation.patch | 21 +++++++++++++ > .../0002-Makefile-remove-stripping.patch | 30 +++++++++++++++++++ > .../dediprog-flasher_1.14.20.bb | 25 ++++++++++++++++ > 3 files changed, 76 insertions(+) > create mode 100644 > meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch > create mode 100644 > meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch > create mode 100644 meta-oe/recipes-bsp/dediprog-flasher/ > dediprog-flasher_1.14.20.bb > > 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 > new file mode 100644 > index 000000000000..fbc0f5a18e1d > --- /dev/null > +++ > b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch > @@ -0,0 +1,21 @@ > +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 > diff --git > a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch > b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch > new file mode 100644 > index 000000000000..5e7d7fc5fe89 > --- /dev/null > +++ > b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch > @@ -0,0 +1,30 @@ > +From 96d8849c3c482f21ad04f1dad45bf59f453e43d6 Mon Sep 17 00:00:00 2001 > +From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> > +Date: Mon, 8 Jul 2024 10:58:45 +0000 > +Subject: [PATCH] Makefile: remove stripping > +Upstream-Status: Inappropriate [oe specific] > + > +This patch modifies the install process to disable stripping of binaries > by the > +Makefile and allow the stripping to be handled by bitbake to integrate > +it seamlessly into the bitbake workflow. > + > + Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> > +--- > + Makefile | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 139e5c0..aa6eba5 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -58,7 +58,6 @@ 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) > +- strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) Can we turn this into a conditional make step which is skipped when the given make variable is set something like NOSTRIP=1 that way this patch can be upstreamed and we do not have to carry it here forever > > + 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.20.bb > new file mode 100644 > index 000000000000..5d0e4e856f82 > --- /dev/null > +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb > @@ -0,0 +1,25 @@ > +DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash > programmers" > +SECTION = "devel" > +LICENSE = "GPL-2.0-or-later" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" > + > +DEPENDS = "libusb" > + > +SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" > +SRC_URI = " \ > + git:// > github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ > + file://0001-add-support-for-cross-compilation.patch \ > + file://0002-Makefile-remove-stripping.patch \ > + " > + > +S = "${WORKDIR}/git" > + > +do_install () { > + oe_runmake DESTDIR=${D} PREFIX=/usr install Let’s use bitbake variable prefix instead of hardcoding /usr here > > +} > + > +FILES:${PN} += " \ > + ${datadir}/DediProg \ > +" > + > +inherit pkgconfig > -- > 2.45.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#111417): > https://lists.openembedded.org/g/openembedded-devel/message/111417 > Mute This Topic: https://lists.openembedded.org/mt/107436605/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
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 new file mode 100644 index 000000000000..fbc0f5a18e1d --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch @@ -0,0 +1,21 @@ +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 diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch new file mode 100644 index 000000000000..5e7d7fc5fe89 --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-remove-stripping.patch @@ -0,0 +1,30 @@ +From 96d8849c3c482f21ad04f1dad45bf59f453e43d6 Mon Sep 17 00:00:00 2001 +From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> +Date: Mon, 8 Jul 2024 10:58:45 +0000 +Subject: [PATCH] Makefile: remove stripping +Upstream-Status: Inappropriate [oe specific] + +This patch modifies the install process to disable stripping of binaries by the +Makefile and allow the stripping to be handled by bitbake to integrate +it seamlessly into the bitbake workflow. + + Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 139e5c0..aa6eba5 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,6 @@ 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) +- strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) + 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.20.bb new file mode 100644 index 000000000000..5d0e4e856f82 --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash programmers" +SECTION = "devel" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" + +DEPENDS = "libusb" + +SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" +SRC_URI = " \ + git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ + file://0001-add-support-for-cross-compilation.patch \ + file://0002-Makefile-remove-stripping.patch \ + " + +S = "${WORKDIR}/git" + +do_install () { + oe_runmake DESTDIR=${D} PREFIX=/usr install +} + +FILES:${PN} += " \ + ${datadir}/DediProg \ +" + +inherit pkgconfig