diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2021-05-11 01:48:57 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-05-11 08:27:27 -0700 |
| commit | f6b4cb02314d91f76b747e4bfbd2ccdee807e2ec (patch) | |
| tree | 6e5864cf006816c36513191dac199d9cf7b3e1f2 | |
| parent | c7f8fc0200157c9ae2c6a224089fc455151d6139 (diff) | |
| download | meta-openembedded-f6b4cb02314d91f76b747e4bfbd2ccdee807e2ec.tar.gz | |
cdrkit: add nativesdk support
- Fix an absolute path symlink issue, replace with a relative link
- Fix installed-vs-shipped QA Issue of nativesdk package
...
|ERROR: nativesdk-cdrkit-1.1.11-r0 do_package: QA Issue: nativesdk-cdrkit:
Files/directories were installed but not shipped in any package:
| /opt/windriver/wrlinux-graphics/21.18/sysroots/x86_64-wrlinuxsdk-linux/usr/sbin/netscsid
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 7 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch | 28 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3344821fa0..54d396343d 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -12,6 +12,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ file://0001-genisoimage-Add-missing-extern-definition.patch \ " +SRC_URI_append_class-nativesdk = " \ + file://0001-install-netscsid-to-bin-for-nativesdk.patch \ +" SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" @@ -51,7 +54,7 @@ FILES_wodim = " \ " do_install_append() { - ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs + ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch new file mode 100644 index 0000000000..fdf1563b38 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch @@ -0,0 +1,28 @@ +From 6b698b7c1045d279fe24818d45c67d9884d5fd81 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 7 May 2021 15:10:04 +0800 +Subject: [PATCH] install netscsid to bin for nativesdk + +For Yocto, the nativesdk does not have sbin dir, use bin to relpace + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + netscsid/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netscsid/CMakeLists.txt b/netscsid/CMakeLists.txt +index f6bddf1..cf23312 100644 +--- a/netscsid/CMakeLists.txt ++++ b/netscsid/CMakeLists.txt +@@ -9,5 +9,5 @@ ADD_EXECUTABLE (netscsid netscsid.c) + #SET_SOURCE_FILES_PROPERTIES(netscsid.c ) + TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} ) + #SET_TARGET_PROPERTIES(netscsid PROPERTIES SKIP_BUILD_RPATH TRUE) +-INSTALL(TARGETS netscsid DESTINATION sbin) ++INSTALL(TARGETS netscsid DESTINATION bin) + +-- +2.27.0 + |