mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

libsolv: fix installed-vs-shipped for nativesdk

Browse Source 
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.

(From OE-Core rev: fc4d721e047989a3521267e26de123759741ffa3)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2016-04-07 00:34:30 -07:00
committed by Richard Purdie
parent c88c894fa8
commit 12ca8dff49
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch
+37
View File
@@ -0,0 +1,37 @@
From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
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 <liezhi.yang@windriver.com>
---
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
View File
@@ -9,7 +9,9 @@ DEPENDS = "expat zlib"
PV = "0.6.19" 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" SRCREV = "4c5af401a89858d4cebbfe40c59a0031ff9db5b0"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"