diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-security')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb (renamed from meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.5.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.5.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb index 173c2cab11..2d75232b85 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ " S = "${WORKDIR}/git" -SRCREV = "c382a4925a7d0d1b332a2f4e689c71d71b0005a5" +SRCREV = "b1b2728ccd83eeb0dffe29c01a5c97e14e6a0d8a" inherit autotools python3native update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb b/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb index 00cca53b5a..6273edd7ed 100644 --- a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb +++ b/meta-openembedded/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 |