openpowerlink: new package
PATCH v3 1/1 openpowerlink: new package
---
v3:
- Add CPP depends
- Add build fix for kernels > 3.5
- Fix lib install
v2:
- Fix case
- Fix statements
v1:
- Move openpowerlink to hardware handling menu
- Add package sources url
- Add some help in menuconfig
- Fix typo
- Move openpowerlink demos in a submenu
- Fix patch name
- Fix debug default value
- Add build Release or Debug depending on BR2_ENABLE_DEBUG
v0: initial commit
- Add openpowerlink package.
package/Config.in | 1 + package/openpowerlink/Config.in | 112 +++++++++++++++++++++ .../openpowerlink-0001-fix-demo-mn-qt.patch | 22 ++++ ...002-Fix-compilation-issue-for-kernels-3.5.patch | 88 ++++++++++++++++ ...-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch | 28 ++++++ package/openpowerlink/openpowerlink.mk | 95 +++++++++++++++++ 6 files changed, 346 insertions(+) create mode 100644 package/openpowerlink/Config.in create mode 100644 package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch create mode 100644 package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch create mode 100644 package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch create mode 100644 package/openpowerlink/openpowerlink.mk
package/Config.in +1 -0
@@ -311,6 +311,7 @@ source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openocd/Config.in" +source "package/openpowerlink/Config.in" source "package/owl-linux/Config.in" source "package/parted/Config.in" source "package/pciutils/Config.in"
package/openpowerlink/Config.in new file +112 -0
112 lines not on this page · raw message
package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch new file +22 -0
@@ -0,0 +1,22 @@ +commit 8658075bd7c49a7481e8f6d0d7a13b0651e1dfd7 +Author: Romain Naour <[email protected]> +Date: Wed Sep 18 23:33:04 2013 +0200 + + [FIX] demo_mn_qt: add EplDebug.c in demo_sources list + + demo_mn_qt use EplGetEmergErrCodeStr() + + Signed-off-by: Romain Naour <[email protected]> + +diff --git a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt +index 9db2f7f..48ae9eb 100644 +--- a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt ++++ b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt +@@ -78,6 +78,7 @@ SET(DEMO_SOURCES src/EplApi.cpp + src/MainWindow.cpp + src/NodeState.cpp + ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/EplApiProcessImageSetup.c ++ ${POWERLINK_SOURCE_DIR}/EplStack/EplDebug.c + ) + + # The TRACE macros need trace.c on the Windows platform
(quoted diff) +0 -0
b/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch new file mode 100644
index 0000000..a200c9c
package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch new file +88 -0
88 lines not on this page · raw message
(quoted diff) +0 -0
b/package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch new file mode 100644
index 0000000..d706461
package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch new file +28 -0
@@ -0,0 +1,28 @@ +From cb6c4ff053e72f7fe5954894aebe2c0d94120b2d Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +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 <[email protected]> +--- + 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 +
package/openpowerlink/openpowerlink.mk new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
1.8.4
PATCH v3 1/1 openpowerlink: new package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Romain> Signed-off-by: Romain Naour <[email protected]> Romain> ---
Romain> v3:
Romain> - Add CPP depends Romain> - Add build fix for kernels > 3.5 Romain> - Fix lib install
[snip]
Romain> +++ b/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
[snip]
Romain> @@ -0,0 +1,88 @@
Romain> +From 9990e19bc554d11c4123986692c5e0572682467a Mon Sep 17 00:00:00 2001 Romain> +From: Josef Baumgartner <[email protected]> Romain> +Date: Wed, 14 Aug 2013 10:22:21 +0200
Romain> +Subject: [PATCH 1/1] [FIX] Fix compilation issue for kernels > 3.5 Romain> +
Romain> +@@ -1244,8 +1258,8 @@ tEplKernel Ret = kEplSuccessful;
Romain> + }
Romain> + #elif (TARGET_SYSTEM == _VXWORKS_)
Romain> + semDelete(pCopyJob_p->m_Event.m_semCompletion);
Romain> +-
Romain> +-#else
Romain> ++
Romain> ++#else
Romain> + #error "OS currently not supported by EplApiProcessImage!" Romain> + #endif
Romain> +
Romain> +--
Romain> +1.8.4
Something went wrong here (your mailer ate trailing spaces?):
Applying openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch using patch:
patching file EplStack/EplApiProcessImage.c
Hunk #4 FAILED at 1258.
1 out of 4 hunks FAILED -- saving rejects to file EplStack/EplApiProcessImage.c.rej Patch failed! Please fix openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch!
But as this last hunk was just white space changes, I simply dropped it.
Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard