mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-11 15:00:34 +00:00
Code Issues Projects Releases Wiki Activity

sssd: Make manpages buildable

Browse Source 
Some XML related fixes are needed to make the sssd manpages buildable

Signed-off-by: Jonatan Pålsson <jonatan.p@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Jonatan Pålsson
2020-08-25 14:01:18 +02:00
committed by Armin Kuster
parent 55cbb63634
commit 5efa53b2b2
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
recipes-security/sssd/files/0001-build-Don-t-use-AC_CHECK_FILE-when-building-manpages.patch Normal file
View File

@@ -0,0 +1,34 @@
From d54aa109600bcd02bf72cfe64c01935890a102a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= <jonatan.p@gmail.com>
Date: Fri, 21 Aug 2020 14:45:10 +0200
Subject: [PATCH] build: Don't use AC_CHECK_FILE when building manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
AC_CHECK_FILE does not support cross-compilation, and will only check
the host rootfs. Replace AC_CHECK_FILE with a 'test -f <FILE>' instead,
to allow building manpages when cross-compiling.
Upstream-status: Submitted [https://github.com/SSSD/sssd/pull/5289]
Signed-off-by: Jonatan Pålsson <jonatan.p@gmail.com>
---
src/external/docbook.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/external/docbook.m4 b/src/external/docbook.m4
index deb8632fa..acdc89a68 100644
--- a/src/external/docbook.m4
+++ b/src/external/docbook.m4
@@ -18,7 +18,7 @@ dnl Checks if the XML catalog given by FILE exists and
dnl if a particular URI appears in the XML catalog
AC_DEFUN([CHECK_STYLESHEET],
[
- AC_CHECK_FILE($1, [], [AC_MSG_ERROR([could not find XML catalog])])
+ AS_IF([test -f "$1"], [], [AC_MSG_ERROR([could not find XML catalog])])
AC_MSG_CHECKING([for ifelse([$3],,[$2],[$3]) in XML catalog])
if AC_RUN_LOG([$XSLTPROC --catalogs --nonet --noout "$2" >&2]); then
--
2.26.1

4
recipes-security/sssd/sssd_1.16.4.bb
View File

@@ -17,6 +17,7 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz \
file://sssd.conf \ file://sssd.conf \
file://volatiles.99_sssd \ file://volatiles.99_sssd \
file://fix-ldblibdir.patch \ file://fix-ldblibdir.patch \
file://0001-build-Don-t-use-AC_CHECK_FILE-when-building-manpages.patch \
" "
SRC_URI[md5sum] = "757bbb6f15409d8d075f4f06cb678d50" SRC_URI[md5sum] = "757bbb6f15409d8d075f4f06cb678d50"
@@ -41,7 +42,7 @@ PACKAGECONFIG[autofs] = "--with-autofs, --with-autofs=no"
PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto" PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto"
PACKAGECONFIG[curl] = "--with-kcm, --without-kcm, curl jansson" PACKAGECONFIG[curl] = "--with-kcm, --without-kcm, curl jansson"
PACKAGECONFIG[infopipe] = "--with-infopipe, --with-infopipe=no, " PACKAGECONFIG[infopipe] = "--with-infopipe, --with-infopipe=no, "
PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no, libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[nl] = "--with-libnl, --with-libnl=no, libnl" PACKAGECONFIG[nl] = "--with-libnl, --with-libnl=no, libnl"
PACKAGECONFIG[nscd] = "--with-nscd=${sbindir}, --with-nscd=no " PACKAGECONFIG[nscd] = "--with-nscd=${sbindir}, --with-nscd=no "
PACKAGECONFIG[nss] = "--with-crypto=nss, ,nss," PACKAGECONFIG[nss] = "--with-crypto=nss, ,nss,"
@@ -60,6 +61,7 @@ EXTRA_OECONF += " \
--enable-pammoddir=${base_libdir}/security \ --enable-pammoddir=${base_libdir}/security \
--without-python2-bindings \ --without-python2-bindings \
--without-secrets \ --without-secrets \
--with-xml-catalog-path=${STAGING_ETCDIR_NATIVE}/xml/catalog \
" "
do_configure_prepend() { do_configure_prepend() {