diff options
Diffstat (limited to 'meta-oe/recipes-security')
| -rw-r--r-- | meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb | 15 | ||||
| -rw-r--r-- | meta-oe/recipes-security/softhsm/softhsm_git.bb | 2 |
2 files changed, 4 insertions, 13 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' \ 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 diff --git a/meta-oe/recipes-security/softhsm/softhsm_git.bb b/meta-oe/recipes-security/softhsm/softhsm_git.bb index 3236cb9a60..4ceda3d4b8 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_git.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" DEPENDS = "openssl" PV = "2.5.0" -SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master" +SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master;protocol=https" SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4" S = "${WORKDIR}/git" |