Skip to contentSkip to conversation

dfu-util: fix .patch files

PATCH New Martin Jansa 1 participant 4 messages Mar 10, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 dfu-util: fix .patch files

* dfu-util-native was broken since last upgrade in:
commit c2652c90f726fa1728307afad73c3051ca7660f5
Author: Li xin <[email protected]>
Date: Sun Jan 3 18:07:17 2016 -0800

dfu-util: 0.7 -> 0.8

Upgrade dfu-util from 0.7 to 0.8.

Modify SRC_URI,since the original one can�t be opened.
Modify 0001-configure.ac-Don-t-check-for-usbpath.patch,since the datas has been changed.
because
0002-Revert-Makefile.am-Drop-static-dfu-util.patch
didn't apply anymore.
* update
0001-configure.ac-Don-t-check-for-usbpath.patch
to keep check for sysexits.h

---
 ...0001-configure.ac-Don-t-check-for-usbpath.patch | 10 ++++----
 ...2-Revert-Makefile.am-Drop-static-dfu-util.patch | 27 +++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)
meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch +5 -5
index 0d48a76..bab4a71 100644
@@ -1,11 +1,11 @@
-From 63f6f6882f3813ab22c62806feeab942579a2acf Mon Sep 17 00:00:00 2001
+From e1811274b61db0f5ca55c50ec96d799e2d85fa06 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sun, 3 Aug 2014 17:50:06 +0200
 Subject: [PATCH 1/2] configure.ac: Don't check for usbpath
 
 * otherwise it fails to build with -lusb
   | main.o: In function `resolve_device_path':
-  | dfu-util/0.8-r0/dfu-util-0.8/src/main.c:371: undefined reference to `usb_path2devnum'
+  | dfu-util/0.7-r0/dfu-util-0.7/src/main.c:371: undefined reference to `usb_path2devnum'
   | collect2: error: ld returned 1 exit status
 
 Signed-off-by: Martin Jansa <[email protected]>
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 700b556..fb58473 100644
+index 8622114..a1dcc7a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -20,14 +20,13 @@ AS_IF([test x$native_libusb = xno], [
@@ -29,10 +29,10 @@ index 700b556..fb58473 100644
  # Checks for header files.
  AC_HEADER_STDC
 -AC_CHECK_HEADERS([usbpath.h windows.h sysexits.h])
-+AC_CHECK_HEADERS([windows.h])
++AC_CHECK_HEADERS([windows.h sysexits.h])
  
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
 -- 
-2.0.2
+2.7.2
 
meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch +14 -13
index de17808..7bd965b 100644
@@ -1,4 +1,4 @@
-From 440a026379ff111aaa8314db1c29ffae8f482824 Mon Sep 17 00:00:00 2001
+From 7d613b28c1b48b5cc3a0882d24e0ac938faff4c2 Mon Sep 17 00:00:00 2001
 From: Martin JaMa Jansa <[email protected]>
 Date: Thu, 11 Aug 2011 11:19:52 +0200
 Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util"
@@ -6,17 +6,16 @@ Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util"
 This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071.
 
 Signed-off-by: Martin JaMa Jansa <[email protected]>
-Signed-off-by: Martin Jansa <[email protected]>
 ---
  configure.ac    |  2 +-
- src/Makefile.am | 20 +++++++++++++++++++-
- 2 files changed, 20 insertions(+), 2 deletions(-)
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index fb58473..09b9e5a 100644
+index a1dcc7a..bb71e02 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -23,7 +23,7 @@ AS_IF([test x$native_libusb = xno], [
+@@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [
          AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***]))
  ])
  
@@ -26,18 +25,18 @@ index fb58473..09b9e5a 100644
  
  # Checks for header files.
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 99df307..28d53f7 100644
+index 70179c4..e8736ee 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,6 +1,6 @@
- AM_CFLAGS = -Wall
+ AM_CFLAGS = -Wall -Wextra
  
--bin_PROGRAMS = dfu-util dfu-suffix
-+bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix
+-bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix
++bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix dfu-prefix
  dfu_util_SOURCES = main.c \
  		portable.h \
  		dfu_load.c \
-@@ -17,6 +17,24 @@ dfu_util_SOURCES = main.c \
+@@ -19,6 +19,26 @@ dfu_util_SOURCES = main.c \
  		quirks.c \
  		quirks.h
  
@@ -45,6 +44,8 @@ index 99df307..28d53f7 100644
 +		portable.h \
 +		dfu_load.c \
 +		dfu_load.h \
++		dfu_util.c \
++		dfu_util.h \
 +		dfuse.c \
 +		dfuse.h \
 +		dfuse_mem.c \
@@ -61,7 +62,7 @@ index 99df307..28d53f7 100644
 +
  dfu_suffix_SOURCES = suffix.c \
  		dfu_file.h \
- 		dfu_file.c \
+ 		dfu_file.c
 -- 
-2.0.2
+2.7.2
 
Signature · 1 line
2.7.2
#1 lore raw

PATCH 2/4 dfu-util: upgrade to 0.9

* drop
commit 0792623dfa8156fb0af3f3949c901665e2df3d04
Author: Stefan Sec Zehl <[email protected]>
Date: Wed Jul 29 01:39:11 2015 +0200

Fix/reimplement USBPATH support

Using libusb functions to retrieve port and bus numbers.

Thanks to Topi Kuutela for reviewing and testing the patch.

Also thanks to Timo Poikola and Topi Kuutela for having submitted alternative patches.

https://sourceforge.net/p/dfu-util/tickets/6/

---
 ...u-util-native_0.8.bb => dfu-util-native_0.9.bb} |  7 ++--
 ...-Revert-Makefile.am-Drop-static-dfu-util.patch} |  6 ++--
 ...0001-configure.ac-Don-t-check-for-usbpath.patch | 38 ----------------------
 meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb   | 17 ----------
 meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb   | 14 ++++++++
 5 files changed, 19 insertions(+), 63 deletions(-)
 rename meta-oe/recipes-support/dfu-util/{dfu-util-native_0.8.bb => dfu-util-native_0.9.bb} (78%)
 rename meta-oe/recipes-support/dfu-util/dfu-util/{0002-Revert-Makefile.am-Drop-static-dfu-util.patch => 0001-Revert-Makefile.am-Drop-static-dfu-util.patch} (90%)
 delete mode 100644 meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch
 delete mode 100644 meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb
 create mode 100644 meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb
meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb renamed from meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb +2 -5
similarity index 78%
rename from meta-oe/recipes-support/dfu-util/dfu-util-native_0.8.bb
rename to meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
index 8be9d85..7a7a662 100644
@@ -1,19 +1,16 @@
 require dfu-util_${PV}.bb
 
 inherit native deploy
-do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
 
 DEPENDS = "libusb1-native"
 
-FILESPATH =. "${FILE_DIRNAME}/${BPN}-${PV}:"
-SRC_URI += "file://0002-Revert-Makefile.am-Drop-static-dfu-util.patch"
+SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
 
+do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
 do_deploy() {
     install -d ${DEPLOY_DIR_TOOLS}
     install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
     rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
     ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
-
 }
-
 addtask deploy before do_package after do_install
meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch renamed from meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch +3 -3
similarity index 90%
rename from meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch
rename to meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch
index 7bd965b..1c6ad08 100644
@@ -1,7 +1,7 @@
-From 7d613b28c1b48b5cc3a0882d24e0ac938faff4c2 Mon Sep 17 00:00:00 2001
+From c2aab3b9ae1febcb6b4c6561a59df1930a57b394 Mon Sep 17 00:00:00 2001
 From: Martin JaMa Jansa <[email protected]>
 Date: Thu, 11 Aug 2011 11:19:52 +0200
-Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util"
+Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util"
 
 This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071.
 
@@ -12,7 +12,7 @@ Signed-off-by: Martin JaMa Jansa <[email protected]>
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a1dcc7a..bb71e02 100644
+index f5a43b8..6a3757e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [
meta-oe/recipes-support/dfu-util/dfu-util/0001-configure.ac-Don-t-check-for-usbpath.patch deleted +0 -38
deleted file mode 100644
index bab4a71..0000000
@@ -1,38 +0,0 @@
-From e1811274b61db0f5ca55c50ec96d799e2d85fa06 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Sun, 3 Aug 2014 17:50:06 +0200
-Subject: [PATCH 1/2] configure.ac: Don't check for usbpath
-
-* otherwise it fails to build with -lusb
-  | main.o: In function `resolve_device_path':
-  | dfu-util/0.7-r0/dfu-util-0.7/src/main.c:371: undefined reference to `usb_path2devnum'
-  | collect2: error: ld returned 1 exit status
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8622114..a1dcc7a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,14 +20,13 @@ AS_IF([test x$native_libusb = xno], [
-     PKG_CHECK_MODULES([USB], [libusb-1.0 >= 1.0.0],,
-         AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***]))
- ])
--AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
- 
- LIBS="$LIBS $USB_LIBS"
- CFLAGS="$CFLAGS $USB_CFLAGS"
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([usbpath.h windows.h sysexits.h])
-+AC_CHECK_HEADERS([windows.h sysexits.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
--- 
-2.7.2
-
meta-oe/recipes-support/dfu-util/dfu-util_0.8.bb deleted +0 -17
deleted file mode 100644
index 51f4ae1..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "USB Device Firmware Upgrade utility"
-SECTION = "devel"
-AUTHOR = "Harald Welte <[email protected]>"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-
-SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz \
-    file://0001-configure.ac-Don-t-check-for-usbpath.patch \
-"
-
-inherit autotools pkgconfig
-
-DEPENDS = "libusb1"
-
-SRC_URI[md5sum] = "fc6daf6b0ee57d7e40ffa3e8111023d1"
-SRC_URI[sha256sum] = "55cbde9be12a212bd84bce9d1e63941d9a16139ed0d4912401367eba1502f058"
meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb new file +14 -0
new file mode 100644
index 0000000..01bca22
@@ -0,0 +1,14 @@
+DESCRIPTION = "USB Device Firmware Upgrade utility"
+SECTION = "devel"
+AUTHOR = "Harald Welte <[email protected]>"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz"
+
+inherit autotools pkgconfig
+
+DEPENDS = "libusb1"
+
+SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6"
+SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833"
Signature · 1 line
2.7.2
#2 lore raw

PATCH 3/4 system-config-keyboard: inherit gettext and add dependency on intltool-native

In reply to Martin Jansa

* it actually depends on native intltool:
NOTE: recipe system-config-keyboard-1.4.0-r0: task do_compile: Started
ERROR: system-config-keyboard-1.4.0-r0 do_compile: oe_runmake failed
ERROR: system-config-keyboard-1.4.0-r0 do_compile: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/system-config-keyboard/1.4.0-r0/temp/log.do_compile.16052)
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/system-config-keyboard/1.4.0-r0/temp/log.do_compile.16052
Log data follows:

  | DEBUG: Executing shell function do_compile
  | NOTE: make -j 8 PYTHON=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/python-native/python PYTHON_SITELIB=/usr/lib/python2.7/site-packages
  | make: intltool-merge: Command not found
  | make: *** [system-config-keyboard.desktop] Error 127
  | ERROR: oe_runmake failed
  | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/system-config-keyboard/1.4.0-r0/temp/log.do_compile.16052)

NOTE: recipe system-config-keyboard-1.4.0-r0: task do_compile: Failed
* and it also used gettext:
| DEBUG: Executing shell function do_compile
| NOTE: make -j 8 PYTHON=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/python-native/python PYTHON_SITELIB=/usr/lib/python2.7/site-packages
| cd po && for i in *.po; do msgfmt $i -o $(echo $i |sed s/.po/.mo/) ||
exit 1; done
| echo -e "#!/bin/sh\nexec /usr/bin/pkexec
/usr/sbin/system-config-keyboard \"\$@\"" > "system-config-keyboard.sh"

  | chmod 755 "system-config-keyboard.sh"
  | /bin/sh: 1: msgfmt: not found
  | make: *** [gettext] Error 1
  | make: *** Waiting for unfinished jobs....
  | Merging translations into system-config-keyboard.desktop.
  | WARNING: exit code 1 from a shell command.
  | ERROR: oe_runmake failed
  | ERROR: Function failed: do_compile (log file is located at

/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/system-config-keyboard/1.4.0-r0/temp/log.do_compile.23230)

---
 .../system-config-keyboard/system-config-keyboard_1.4.0.bb            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb +3 -1
index eaca96d..078fcea 100644
@@ -6,7 +6,9 @@ SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2"
 SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72"
 SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284"
 inherit python-dir
-DEPENDS = "intltool"
+
+inherit python-dir gettext
+DEPENDS = "intltool-native"
 
 EXTRA_OEMAKE = " \
     PYTHON='${STAGING_BINDIR_NATIVE}'/python-native/python \
Signature · 1 line
2.7.2
#3 lore raw

PATCH 4/4 synergy: add dependency on unzip-native

In reply to Martin Jansa

* otherwise may fail with:
ERROR: synergy-1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0 do_unpack_extra: Function failed: do_unpack_extra (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/synergy/1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0/temp/log.do_unpack_extra.11874)
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/synergy/1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0/temp/log.do_unpack_extra.11874
Log data follows:

  | DEBUG: Executing shell function do_unpack_extra
  | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/synergy/1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0/temp/run.do_unpack_extra.11874: 105: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/synergy/1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0/temp/run.do_unpack_extra.11874: unzip: not found
  | WARNING: exit code 127 from a shell command.
  | ERROR: Function failed: do_unpack_extra (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/synergy/1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0/temp/log.do_unpack_extra.11874)

NOTE: recipe synergy-1.7.3+1.7.4-rc8+AUTOINC+588fb4b805-r0: task do_unpack_extra: Failed
ERROR: Task 0 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb, do_unpack_extra) failed with exit code '1'

---
 meta-oe/recipes-support/synergy/synergy_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/synergy/synergy_git.bb +1 -1
index cb842c8..9b4f22b 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f366945b209c5523e39889f636af00a"
 LICENSE = "GPL-2.0"
 SECTION = "x11/utils"
 
-DEPENDS = "virtual/libx11 libxtst libxinerama"
+DEPENDS = "virtual/libx11 libxtst libxinerama unzip-native"
 
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
Signature · 1 line
2.7.2