merged.
On 11/16/21 10:28 AM, Jeremy A. Puhlman wrote:It packages all file in ${libdir} to package sssd, including the .sosymlink files. Then it causes QA issues:| ERROR: QA Issue: sssd rdepends on dbus-dev [dev-deps]| ERROR: QA Issue: sssd rdepends on ding-libs-dev [dev-deps]So re-package sssd then the .so symlink files and .pc files are packagedto sssd-dev which should be.File ${libdir}/libsss_sudo.so is not a symlink file but packaged tosssd-dev too. Then causes another QA issue:| ERROR: sssd-2.5.2-r0 do_package_qa: QA Issue: -dev package sssd-dev contains non-symlink .so '/usr/lib/libsss_sudo.so' [dev-elf]So create a new sub-package libsss-sudo to package file libsss_sudo.soand make sssd rdepends on it.JP: Updated for version differences.Signed-off-by: Kai Kang <kai.kang@...>Signed-off-by: Armin Kuster <akuster808@...>(cherry picked from commit e81c15f851ca5396c78c8737967ee38db0ebe0cd)Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>--- recipes-security/sssd/sssd_1.16.5.bb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)diff --git a/recipes-security/sssd/sssd_1.16.5.bb b/recipes-security/sssd/sssd_1.16.5.bbindex 02d0837..f13fc49 100644--- a/recipes-security/sssd/sssd_1.16.5.bb+++ b/recipes-security/sssd/sssd_1.16.5.bb@@ -120,10 +120,17 @@ SYSTEMD_SERVICE_${PN} = " \ " SYSTEMD_AUTO_ENABLE = "disable" -FILES_${PN} += "${libdir} ${datadir} ${base_libdir}/security/pam_sss.so"-FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la"--# The package contains symlinks that trip up insane-INSANE_SKIP_${PN} = "dev-so"--RDEPENDS_${PN} = "bind dbus libldb libpam"+PACKAGES =+ "libsss-sudo libsss-autofs"+ALLOW_EMPTY_libsss-sudo = "1"+ALLOW_EMPTY_libsss-autofs = "1"++FILES_${PN}-dev += "${libdir}/sssd/modules/lib*.so"+FILES_${PN} += "${base_libdir}/security/pam_sss*.so \+ ${datadir}/dbus-1/system-services/*.service \+ ${libdir}/krb5/* \+ ${libdir}/ldb/* \+ "+FILES_libsss-autofs = "${libdir}/sssd/modules/libsss_autofs.so"+FILES_libsss-sudo = "${libdir}/libsss_sudo.so"++RDEPENDS_${PN} = "bind dbus libldb libpam libsss-sudo libsss-autofs"
It packages all file in ${libdir} to package sssd, including the .sosymlink files. Then it causes QA issues:| ERROR: QA Issue: sssd rdepends on dbus-dev [dev-deps]| ERROR: QA Issue: sssd rdepends on ding-libs-dev [dev-deps]So re-package sssd then the .so symlink files and .pc files are packagedto sssd-dev which should be.File ${libdir}/libsss_sudo.so is not a symlink file but packaged tosssd-dev too. Then causes another QA issue:| ERROR: sssd-2.5.2-r0 do_package_qa: QA Issue: -dev package sssd-dev contains non-symlink .so '/usr/lib/libsss_sudo.so' [dev-elf]So create a new sub-package libsss-sudo to package file libsss_sudo.soand make sssd rdepends on it.JP: Updated for version differences.Signed-off-by: Kai Kang <kai.kang@...>Signed-off-by: Armin Kuster <akuster808@...>(cherry picked from commit e81c15f851ca5396c78c8737967ee38db0ebe0cd)Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>--- recipes-security/sssd/sssd_1.16.5.bb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)diff --git a/recipes-security/sssd/sssd_1.16.5.bb b/recipes-security/sssd/sssd_1.16.5.bbindex 02d0837..f13fc49 100644--- a/recipes-security/sssd/sssd_1.16.5.bb+++ b/recipes-security/sssd/sssd_1.16.5.bb@@ -120,10 +120,17 @@ SYSTEMD_SERVICE_${PN} = " \ " SYSTEMD_AUTO_ENABLE = "disable" -FILES_${PN} += "${libdir} ${datadir} ${base_libdir}/security/pam_sss.so"-FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la"--# The package contains symlinks that trip up insane-INSANE_SKIP_${PN} = "dev-so"--RDEPENDS_${PN} = "bind dbus libldb libpam"+PACKAGES =+ "libsss-sudo libsss-autofs"+ALLOW_EMPTY_libsss-sudo = "1"+ALLOW_EMPTY_libsss-autofs = "1"++FILES_${PN}-dev += "${libdir}/sssd/modules/lib*.so"+FILES_${PN} += "${base_libdir}/security/pam_sss*.so \+ ${datadir}/dbus-1/system-services/*.service \+ ${libdir}/krb5/* \+ ${libdir}/ldb/* \+ "+FILES_libsss-autofs = "${libdir}/sssd/modules/libsss_autofs.so"+FILES_libsss-sudo = "${libdir}/libsss_sudo.so"++RDEPENDS_${PN} = "bind dbus libldb libpam libsss-sudo libsss-autofs"
© 2022 Groups.io