Two fixes for fontconfig and iptables
cover Two fixes for fontconfig and iptables
From: Kai Kang <[email protected]>
The following changes since commit 4bc3f0994e68b3302a0523a3156dd0dca0cac7a0:
bitbake: toaster: move clones into subdirectory (2015-09-29 14:11:39 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib kangkai/fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/fixes
Kai Kang (2):
iptables: only check libnetfilter-conntrack when libnfnetlink is
enabled
fontconfig: fix buildpaths QA check
...check-conntrack-when-libnfnetlink-enabled.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/iptables/iptables_1.4.21.bb | 3 +- .../fontconfig/fontconfig_2.11.94.bb | 4 +++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
Signature · 1 line
2.6.0.rc2.10.gf4d9753
PATCH 1/2 iptables: only check libnetfilter-conntrack when libnfnetlink is enabled
From: Kai Kang <[email protected]>
Package libnetfilter-conntrack depends on package libnfnetlink. iptables checks package libnetfilter-conntrack whatever its package config libnfnetlink is enabled or not. When libnfnetlink is disabled but package libnetfilter-conntrack exists, it fails randomly with:
| In file included from .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: | .../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory | compilation terminated. | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed
Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it.
--- ...check-conntrack-when-libnfnetlink-enabled.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/iptables/iptables_1.4.21.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch new file +34 -0
@@ -0,0 +1,34 @@ +Package libnetfilter-conntrack depends on package libnfnetlink. iptables +checks package libnetfilter-conntrack whatever its package config +libnfnetlink is enabled or not. When libnfnetlink is disabled but +package libnetfilter-conntrack exists, it fails randomly with: + +| In file included from .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: +| .../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory +| compilation terminated. +| GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed + +Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <[email protected]> + +diff --git a/configure.ac b/configure.ac +index 5d7e62b..e331ee7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,8 +88,12 @@ if test "$ac_cv_header_linux_ip_vs_h" != "yes"; then + blacklist_modules="$blacklist_modules ipvs"; + fi; + +-PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], ++nfconntrack=0 ++AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ ++ PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], + [nfconntrack=1], [nfconntrack=0]) ++ ]) ++ + AM_CONDITIONAL([HAVE_LIBNETFILTER_CONNTRACK], [test "$nfconntrack" = 1]) + + if test "$nfconntrack" -ne 1; then
meta/recipes-extended/iptables/iptables_1.4.21.bb +2 -1
@@ -23,6 +23,7 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://types.h-add-defines-that-are-required-for-if_packet.patch \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0001-fix-build-with-musl.patch \ + file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ " SRC_URI[md5sum] = "536d048c8e8eeebcd9757d0863ebb0c0"
@@ -38,7 +39,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d) PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # libnfnetlink recipe is in meta-networking layer -PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink" +PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" do_configure_prepend() { # Remove some libtool m4 files
Signature · 1 line
2.6.0.rc2.10.gf4d9753
PATCH 2/2 fontconfig: fix buildpaths QA check
In reply to [email protected]From: Kai Kang <[email protected]>
Variable Libs.private contains build path in file fontconfig.pc. It is not right and fails buildpaths check.
Remove build path from fontconfig.pc to fix this issue.
--- meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb +4 -0
@@ -43,3 +43,7 @@ FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}" BBCLASSEXTEND = "native" + +do_install_append() { + sed -i 's,${STAGING_DIR_HOST},,g' ${D}${libdir}/pkgconfig/fontconfig.pc +}
Signature · 1 line
2.6.0.rc2.10.gf4d9753