aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Thoma <a.thoma@rational-online.com>2021-10-11 08:10:37 +0200
committerArmin Kuster <akuster808@gmail.com>2021-10-23 07:58:18 -0700
commit80ab48eaa75c9acde1b876f22e82dd5b7d7ef795 (patch)
tree8ab9dddecfe50ea06483b9662425f8e75443c325
parent4b3a6bec0c9b4eb870a1cd7df7e07f67f9b31f1c (diff)
downloadmeta-openembedded-contrib-80ab48eaa75c9acde1b876f22e82dd5b7d7ef795.tar.gz
meta-openembedded-contrib-80ab48eaa75c9acde1b876f22e82dd5b7d7ef795.tar.bz2
meta-openembedded-contrib-80ab48eaa75c9acde1b876f22e82dd5b7d7ef795.zip
keyutils: fix install path
Signed-off-by: Alexander Thoma a.thoma@rational-online.com Signed-off-by: Florian Wühr f.wuehr@rational-online.com Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 953f6a227406fde2c2228f94c39107826af1d3b0) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb15
1 files changed, 3 insertions, 12 deletions
diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb
index 00cca53b5a..6273edd7ed 100644
--- a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb
+++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb
@@ -31,6 +31,9 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \
LIBDIR=${libdir} \
USRLIBDIR=${libdir} \
INCLUDEDIR=${includedir} \
+ ETCDIR=${sysconfdir} \
+ SHAREDIR=${datadir}/keyutils \
+ MANDIR=${datadir}/man \
BUILDFOR=${SITEINFO_BITS}-bit \
NO_GLIBC_KEYERR=1 \
"
@@ -40,18 +43,6 @@ do_install () {
oe_runmake DESTDIR=${D} install
}
-do_install:append:class-nativesdk() {
- install -d ${D}${datadir}
- src_dir="${D}${target_datadir}"
- mv $src_dir/* ${D}${datadir}
- par_dir=`dirname $src_dir`
- rmdir $src_dir $par_dir
-
- install -d ${D}${sysconfdir}
- mv ${D}/etc/* ${D}${sysconfdir}/
- rmdir ${D}/etc
-}
-
do_install_ptest () {
cp -r ${S}/tests ${D}${PTEST_PATH}/
sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh