diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-25 17:35:37 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-25 09:48:19 -0700 |
commit | e1395afee340fe7f850ea92e4a88c50ac3a262b5 (patch) | |
tree | 73d6d1d0aefddee0bf806783e20b65a726341ed7 /meta-oe/recipes-security | |
parent | 69f234b65ea3cf80967360ec65c96881326bdc67 (diff) | |
download | meta-openembedded-e1395afee340fe7f850ea92e4a88c50ac3a262b5.tar.gz |
keyutils: Fix installed-vs-shipped for nativesdk
Fixed:
$ bitbake nativesdk-keyutils
ERROR: nativesdk-keyutils-1.6-r0 do_package: QA Issue: nativesdk-keyutils: Files/directories were installed but not shipped in any package:
/usr
/etc
/usr/share
/usr/share/man
/usr/share/keyutils
[snip]
/etc/request-key.conf
/etc/request-key.d
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-security')
-rw-r--r-- | meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb index dca86f3c62..572143a5ae 100644 --- a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb | |||
@@ -40,6 +40,18 @@ do_install () { | |||
40 | oe_runmake DESTDIR=${D} install | 40 | oe_runmake DESTDIR=${D} install |
41 | } | 41 | } |
42 | 42 | ||
43 | do_install_append_class-nativesdk() { | ||
44 | install -d ${D}${datadir} | ||
45 | src_dir="${D}${target_datadir}" | ||
46 | mv $src_dir/* ${D}${datadir} | ||
47 | par_dir=`dirname $src_dir` | ||
48 | rmdir $src_dir $par_dir | ||
49 | |||
50 | install -d ${D}${sysconfdir} | ||
51 | mv ${D}/etc/* ${D}${sysconfdir}/ | ||
52 | rmdir ${D}/etc | ||
53 | } | ||
54 | |||
43 | do_install_ptest () { | 55 | do_install_ptest () { |
44 | cp -r ${S}/tests ${D}${PTEST_PATH}/ | 56 | cp -r ${S}/tests ${D}${PTEST_PATH}/ |
45 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh | 57 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh |