diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-08-28 13:45:07 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-09-01 10:34:02 -0700 |
commit | 492b8b8f4ae8dae9cd93cf53b4c744499726e0ae (patch) | |
tree | 484a5a3dec3f7b4461e907c5012e4e91df1241c7 /recipes-security | |
parent | 46d81c4737d2631f04c93b7661d23e4102cef4a2 (diff) | |
download | meta-security-492b8b8f4ae8dae9cd93cf53b4c744499726e0ae.tar.gz |
ecryptfs-utils: fix usrmerge install path
Update rootsbindir from /sbin to ${base_sbindir}
to fix below do_install error when usrmerge
enabled in DISTRO_FEATURES
| chmod: cannot access '/poky-build/tmp-glibc/work/core2-64-wrs-linux/ecryptfs-utils/111-r0/image/usr/sbin/mount.ecryptfs_private': No such file or directory
And pass "--with-pamdir=${base_libdir}/security"
to configure script to fix below warning when
usrmerge enabled in DISTRO_FEATURES
| WARNING: ecryptfs-utils-111-r0 do_package: QA Issue: ecryptfs-utils: Files/directories were installed but not shipped in any package:
/lib64/security/pam_ecryptfs.so
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security')
-rw-r--r-- | recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb index f55b0c3..1f780f9 100644 --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | |||
@@ -29,6 +29,7 @@ EXTRA_OECONF = "\ | |||
29 | --libdir=${base_libdir} \ | 29 | --libdir=${base_libdir} \ |
30 | --disable-pywrap \ | 30 | --disable-pywrap \ |
31 | --disable-nls \ | 31 | --disable-nls \ |
32 | --with-pamdir=${base_libdir}/security \ | ||
32 | " | 33 | " |
33 | 34 | ||
34 | PACKAGECONFIG ??= "nss \ | 35 | PACKAGECONFIG ??= "nss \ |
@@ -43,12 +44,16 @@ do_configure_prepend() { | |||
43 | export NSS_LIBS="-L${STAGING_BASELIBDIR} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3" | 44 | export NSS_LIBS="-L${STAGING_BASELIBDIR} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3" |
44 | export KEYUTILS_CFLAGS="-I${STAGING_INCDIR}" | 45 | export KEYUTILS_CFLAGS="-I${STAGING_INCDIR}" |
45 | export KEYUTILS_LIBS="-L${STAGING_LIBDIR} -lkeyutils" | 46 | export KEYUTILS_LIBS="-L${STAGING_LIBDIR} -lkeyutils" |
47 | sed -i -e "s;rootsbindir=\"/sbin\";rootsbindir=\"\${base_sbindir}\";g" ${S}/configure.ac | ||
46 | } | 48 | } |
47 | 49 | ||
48 | do_install_append() { | 50 | do_install_append() { |
49 | chmod 4755 ${D}${base_sbindir}/mount.ecryptfs_private | 51 | chmod 4755 ${D}${base_sbindir}/mount.ecryptfs_private |
50 | mkdir -p ${D}/${libdir} | 52 | # ${base_libdir} is identical to ${libdir} when usrmerge enabled |
51 | mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir} | 53 | if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then |
54 | mkdir -p ${D}/${libdir} | ||
55 | mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir} | ||
56 | fi | ||
52 | sed -i -e 's:-I${STAGING_INCDIR}::' \ | 57 | sed -i -e 's:-I${STAGING_INCDIR}::' \ |
53 | -e 's:-L${STAGING_LIBDIR}::' ${D}/${libdir}/pkgconfig/libecryptfs.pc | 58 | -e 's:-L${STAGING_LIBDIR}::' ${D}/${libdir}/pkgconfig/libecryptfs.pc |
54 | sed -i -e "s: ${base_sbindir}/cryptsetup: ${sbindir}/cryptsetup:" ${D}${bindir}/ecryptfs-setup-swap | 59 | sed -i -e "s: ${base_sbindir}/cryptsetup: ${sbindir}/cryptsetup:" ${D}${bindir}/ecryptfs-setup-swap |