meta: 3 fixes for nativesdk recipes

PATCH New Robert Yang 1 participant 4 messages Apr 7, 2016

lore

Share & tools

lore

Robert Yang

author

2016-04-07 07:34 UTC #0 lore raw

cover meta: 3 fixes for nativesdk recipes

The following changes since commit 5ebea1114d54120d5ff5d8a6cd148110d0fda23f:

build-appliance-image: Update to master head revision (2016-04-06 23:54:57 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/3fixes

Robert Yang (3):
libsolv: fix installed-vs-shipped for nativesdk
bdwgc: installed-vs-shipped for nativesdk
apr-util: fix path in rules.mk for nativesdk

 .../0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch  | 37 ++++++++++++++++++++++
 meta/recipes-extended/libsolv/libsolv_git.bb       |  4 ++-
 meta/recipes-support/apr/apr-util_1.5.4.bb         |  8 ++---
 meta/recipes-support/bdwgc/bdwgc_7.4.2.bb          |  2 +-
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch

Signature · 1 line

2.7.4

Robert Yang

author

2016-04-07 07:34 UTC #1 lore raw

PATCH 1/3 libsolv: fix installed-vs-shipped for nativesdk

Fixed:
ERROR: nativesdk-libsolv-0.6.19-r0 do_package: QA Issue: nativesdk-libsolv: Files/directories were installed but not shipped in any package:
/opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man1 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3/libsolv-constantids.3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3/libsolv.3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3/libsolv-history.3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3/libsolv-pool.3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man3/libsolv-bindings.3 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man1/mergesolv.1 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man1/testsolv.1 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man1/installcheck.1 /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/man/man1/dumpsolv.1

It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/", it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it doesn't exist, and the man dir would be set to "/usr/man" which is incorrect.

Signed-off-by Robert Yang <[email protected]>

---
 .../0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch  | 37 ++++++++++++++++++++++
 meta/recipes-extended/libsolv/libsolv_git.bb       |  4 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch

meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch new file +37 -0

new file mode 100644
index 0000000..972ecc9
@@ -0,0 +1,37 @@
+From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Wed, 6 Apr 2016 23:15:02 -0700
+Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR
+
+It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may
+not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/",
+it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it
+doesn't exist, and the man dir would be set to "/usr/man" which is
+incorrect.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd1426b..747db22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,10 +57,7 @@ else (DEFINED INCLUDE)
+ ENDIF (DEFINED  INCLUDE)
+ MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}")
+ SET (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+-SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man")
+-IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man"  AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
+-  SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+-ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man"  AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
++SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
+ 
+ ####################################################################
+-- 
+2.7.4
+

meta/recipes-extended/libsolv/libsolv_git.bb +3 -1

index c0b0120..fb81c8a 100644
@@ -9,7 +9,9 @@ DEPENDS = "expat zlib"
 
 PV = "0.6.19"
 
-SRC_URI = "git://github.com/openSUSE/libsolv.git"
+SRC_URI = "git://github.com/openSUSE/libsolv.git \
+           file://0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch \
+"
 SRCREV = "4c5af401a89858d4cebbfe40c59a0031ff9db5b0"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"

Signature · 1 line

2.7.4

Robert Yang

author

2016-04-07 07:34 UTC #2 lore raw

PATCH 2/3 bdwgc: installed-vs-shipped for nativesdk

In reply to Robert Yang

Fixed:
ERROR: nativesdk-bdwgc-7.4.2-r0 do_package: QA Issue: nativesdk-bdwgc: Files/directories were installed but not shipped in any package:
/opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/gc /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/gc/porting.html /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/gc/gcinterface.html /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/gc/gcdescr.html /opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/gc/README.solaris2

[snip]

This was caused by hardcode of datadir.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-support/bdwgc/bdwgc_7.4.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-support/bdwgc/bdwgc_7.4.2.bb +1 -1

index efa4632..8d4dab3 100644
@@ -28,7 +28,7 @@ SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_4 \
            file://0002-Altera-NIOS2-support.patch \
           "
 
-FILES_${PN}-doc = "/usr/share"
+FILES_${PN}-doc = "${datadir}"
 
 S = "${WORKDIR}/git"

Signature · 1 line

2.7.4

Robert Yang

author

2016-04-07 07:34 UTC #3 lore raw

PATCH 3/3 apr-util: fix path in rules.mk for nativesdk

In reply to Robert Yang

Fixed when build nativesdk-apr-util:
| gawk: fatal: can't open source file `/opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/build-1/make_exports.awk' for reading (No such file or directory)

The ${S} should be ${B}.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-support/apr/apr-util_1.5.4.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

meta/recipes-support/apr/apr-util_1.5.4.bb +4 -4

index 28962bd..2b8676f 100644
@@ -53,10 +53,10 @@ do_configure_prepend_class-nativesdk() {
 }
 
 do_configure_append_class-nativesdk() {
-	sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
-	sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
-	sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
-	sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${S}/build/rules.mk
+	sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk
+	sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk
+	sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk
+	sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk
 }
 
 do_install_append_class-target() {

Signature · 1 line

2.7.4