| Message ID | 1418246696-27658-1-git-send-email-romain.naour@openwide.fr |
|---|---|
| State | Accepted |
| Headers | show |
Dear Romain Naour, On Wed, 10 Dec 2014 22:24:54 +0100, Romain Naour wrote: > Remove upstream commit > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > --- > v2: First bump the vertion to avoid to rename the existing patch. > --- > ...-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch | 28 ---------------------- > package/openpowerlink/openpowerlink.mk | 2 +- > 2 files changed, 1 insertion(+), 29 deletions(-) > delete mode 100644 package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch Applied, thanks. I don't know if it's related to the bump, but it's showing here a message that might be worth investigating: CMake Warning at /home/thomas/projets/buildroot/output/host/usr/share/cmake-3.0/Modules/FindQt4.cmake:616 (message): /usr/bin/qmake reported QT_INSTALL_LIBS as "/usr/lib/x86_64-linux-gnu" but QtCore could not be found there. Qt is NOT installed correctly for the target build environment. Call Stack (most recent call first): CMakeLists.txt:72 (FIND_PACKAGE) Thanks, Thomas
Hi Thomas, Le 11/12/2014 00:18, Thomas Petazzoni a écrit : > Dear Romain Naour, > > On Wed, 10 Dec 2014 22:24:54 +0100, Romain Naour wrote: >> Remove upstream commit >> >> Signed-off-by: Romain Naour <romain.naour@openwide.fr> >> --- >> v2: First bump the vertion to avoid to rename the existing patch. >> --- >> ...-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch | 28 ---------------------- >> package/openpowerlink/openpowerlink.mk | 2 +- >> 2 files changed, 1 insertion(+), 29 deletions(-) >> delete mode 100644 package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch > > Applied, thanks. I don't know if it's related to the bump, but it's > showing here a message that might be worth investigating: > > CMake Warning at /home/thomas/projets/buildroot/output/host/usr/share/cmake-3.0/Modules/FindQt4.cmake:616 (message): > /usr/bin/qmake reported QT_INSTALL_LIBS as "/usr/lib/x86_64-linux-gnu" but > QtCore could not be found there. Qt is NOT installed correctly for the > target build environment. > Call Stack (most recent call first): > CMakeLists.txt:72 (FIND_PACKAGE) > Qt is only needed for the demo named "demo_mn_qt", but Qt is always checked even if this demo is disabled. Ok, it's an annoying warning, I'll send a patch upstream. For real Openpowerlink use case, Qt is not needed. Best regards,
diff --git a/package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch b/package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch deleted file mode 100644 index bed878e..0000000 --- a/package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cb6c4ff053e72f7fe5954894aebe2c0d94120b2d Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@openwide.fr> -Date: Thu, 3 Oct 2013 23:22:17 +0200 -Subject: [PATCH 5/5] [FIX] Linux Powerlink user lib: add INSTALL - -Signed-off-by: Romain Naour <romain.naour@openwide.fr> ---- - Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt -index e67d573..40b7756 100644 ---- a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt -+++ b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt -@@ -329,7 +329,9 @@ ENDIF () - # - # Installation - # --IF (WIN32) -+IF (UNIX) -+ INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib) -+ELSEIF (WIN32) - IF (CFG_X86_WINDOWS_DLL) - INSTALL(TARGETS openPOWERLINK RUNTIME DESTINATION bin) - ENDIF (CFG_X86_WINDOWS_DLL) --- -1.8.4 - diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk index 7ad3eca..dcaf386 100644 --- a/package/openpowerlink/openpowerlink.mk +++ b/package/openpowerlink/openpowerlink.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWERLINK_VERSION = V1.08.4 +OPENPOWERLINK_VERSION = V1.08.5 OPENPOWERLINK_SITE = http://git.code.sf.net/p/openpowerlink/code OPENPOWERLINK_SITE_METHOD = git OPENPOWERLINK_LICENSE = BSD-2c, GPLv2
Remove upstream commit Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- v2: First bump the vertion to avoid to rename the existing patch. --- ...-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch | 28 ---------------------- package/openpowerlink/openpowerlink.mk | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch