diff options
| -rw-r--r-- | meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb | 15 |
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 0a8c2e4834..879dbe5cae 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' \ | |||
| 31 | LIBDIR=${libdir} \ | 31 | LIBDIR=${libdir} \ |
| 32 | USRLIBDIR=${libdir} \ | 32 | USRLIBDIR=${libdir} \ |
| 33 | INCLUDEDIR=${includedir} \ | 33 | INCLUDEDIR=${includedir} \ |
| 34 | ETCDIR=${sysconfdir} \ | ||
| 35 | SHAREDIR=${datadir}/keyutils \ | ||
| 36 | MANDIR=${datadir}/man \ | ||
| 34 | BUILDFOR=${SITEINFO_BITS}-bit \ | 37 | BUILDFOR=${SITEINFO_BITS}-bit \ |
| 35 | NO_GLIBC_KEYERR=1 \ | 38 | NO_GLIBC_KEYERR=1 \ |
| 36 | " | 39 | " |
| @@ -40,18 +43,6 @@ do_install () { | |||
| 40 | oe_runmake DESTDIR=${D} install | 43 | oe_runmake DESTDIR=${D} install |
| 41 | } | 44 | } |
| 42 | 45 | ||
| 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 | |||
| 55 | do_install_ptest () { | 46 | do_install_ptest () { |
| 56 | cp -r ${S}/tests ${D}${PTEST_PATH}/ | 47 | cp -r ${S}/tests ${D}${PTEST_PATH}/ |
| 57 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh | 48 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh |
