Skip to contentSkip to conversation

iperf3: Drop redundant patch

PATCH New Khem Raj 2 participants 4 messages May 18, 2018 Arm STM32

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 iperf3: Drop redundant patch

Signed-off-by Khem Raj <[email protected]>
---
 ...dint.h-for-various-std-c99-int-types.patch | 25 -------------------
 .../recipes-benchmark/iperf3/iperf3_3.2.bb    |  1 -
 2 files changed, 26 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch
meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch deleted +0 -25
deleted file mode 100644
index 599ee1dfb7..0000000000
@@ -1,25 +0,0 @@
-From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 14 Jul 2017 12:59:42 -0700
-Subject: [PATCH 1/2] include stdint.h for various std c99 int types
-
-Signed-off-by: Khem Raj <[email protected]>
----
- src/timer.h | 1 +
- 1 file changed, 1 insertions(+)
-
-diff --git a/src/timer.h b/src/timer.h
-index 0f9c5eb..0b195be 100644
---- a/src/timer.h
-+++ b/src/timer.h
-@@ -31,6 +31,7 @@
- #define __TIMER_H
- 
- #include <sys/time.h>
-+#include <stdint.h>
- 
- /* TimerClientData is an opaque value that tags along with a timer.  The
- ** client can use it for whatever, and it gets passed to the callback when
--- 
-2.13.3
-
meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb +0 -1
index 4d1b0c4370..2ed08110f4 100644
@@ -15,7 +15,6 @@ DEPENDS = "openssl"
 
 SRC_URI = "git://github.com/esnet/iperf.git \
            file://automake-foreign.patch \
-           file://0001-include-stdint.h-for-various-std-c99-int-types.patch \
            file://0002-Remove-pg-from-profile_CFLAGS.patch \
            "
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 1/1 stm32flash: Fix packaging errors

Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +6 -6
index d401981ff9..59bd1b60e1 100644
@@ -1,16 +1,16 @@
 SUMMARY = "Open source flash program for STM32 using the ST serial bootloader"
 HOMEPAGE = "https://sourceforge.net/projects/stm32flash/"
 BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit autotools-brokensep
-
 S = "${WORKDIR}/${PN}"
 
-SRC_URI = "https://prdownloads.sourceforge.net/stm32flash/stm32flash-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
+
+do_install() {
+	oe_runmake install DESTDIR=${D} PREFIX=${prefix}
+}
 
 SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a"
 SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306"
-
-FILES_${PN} = "/usr/local/bin/stm32flash"
Signature · 1 line
2.17.0
#2 lore raw

Re: [meta-oe][PATCH] stm32flash: Fix packaging errors

Quoted 18 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: den 18 maj 2018 22:06
To: [email protected]
Subject: [oe] [meta-oe][PATCH] stm32flash: Fix packaging errors

Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +0 -0
index d401981ff9..59bd1b60e1 100644

meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb line 7

Quoted 10 lines
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +1 -3
@@ -1,16 +1,16 @@
 SUMMARY = "Open source flash program for STM32 using the ST serial bootloader"
 HOMEPAGE = "https://sourceforge.net/projects/stm32flash/"
 BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit autotools-brokensep
-
 S = "${WORKDIR}/${PN}"

I missed it in my comments, but Anuj had already pointed it out, That ${PN} above should be changed to ${BPN}.

Quoted 12 lines
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +5 -4
-SRC_URI = "https://prdownloads.sourceforge.net/stm32flash/stm32flash-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
+
+do_install() {
+	oe_runmake install DESTDIR=${D} PREFIX=${prefix}
+}
 
 SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a"
 SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306"
-
-FILES_${PN} = "/usr/local/bin/stm32flash"
--
Quoted 1 line

2.17.0

//Peter

author
#3 lore raw

Re: [meta-oe][PATCH] stm32flash: Fix packaging errors

Quoted 25 lines · Peter Kjellerstedt
Quoted 25 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: den 18 maj 2018 22:06
To: [email protected]
Subject: [oe] [meta-oe][PATCH] stm32flash: Fix packaging errors

Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +1 -1
index d401981ff9..59bd1b60e1 100644
@@ -1,16 +1,16 @@
 SUMMARY = "Open source flash program for STM32 using the ST serial bootloader"
 HOMEPAGE = "https://sourceforge.net/projects/stm32flash/"
 BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
Quoted 6 lines

meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb line 7

Quoted 3 lines
meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +0 -2
-inherit autotools-brokensep
-
 S = "${WORKDIR}/${PN}"

I missed it in my comments, but Anuj had already pointed it out, That ${PN} above should be changed to ${BPN}.

right, I will do that in v2