aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-24 06:51:47 +0000
committerKhem Raj <raj.khem@gmail.com>2018-08-24 08:58:13 -0700
commit6782e58cd66b80b980105be542097b2a1faf86b3 (patch)
tree3e2a0636face312048b1271b399f42083b7972f8 /meta-networking
parent8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b (diff)
downloadmeta-openembedded-6782e58cd66b80b980105be542097b2a1faf86b3.tar.gz
meta-openembedded-6782e58cd66b80b980105be542097b2a1faf86b3.tar.bz2
meta-openembedded-6782e58cd66b80b980105be542097b2a1faf86b3.zip
autofs: Do not use pkg.m4 from build host
When build host does not have this macro file the build fails, we therefore make sure that the file is used from native sysroot Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch28
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs_5.1.4.bb2
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch
new file mode 100644
index 000000000..f3f25f461
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch
@@ -0,0 +1,28 @@
+From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 24 Aug 2018 06:24:36 +0000
+Subject: [PATCH] Do not hardcode path for pkg.m4
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 50aed15..f81767c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
+ AC_INIT(.autofs-5.1.4)
+
+ # for pkg-config macros
+-m4_include([/usr/share/aclocal/pkg.m4])
++m4_include([pkg.m4])
+
+ #
+ # autofs installs by default in /usr
+--
+1.9.1
+
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.4.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.4.bb
index e4ef5bb08..8a1bcad28 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.1.4.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.4.bb
@@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \
file://pkgconfig-libnsl.patch \
file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \
+ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \
"
SRC_URI[md5sum] = "17bc9d371cf39d99f400ebadfc2289bb"
SRC_URI[sha256sum] = "8d1c9964c8286ccb08262ad47c60bb6343492902def5399fd36d79a0ccb0e718"
@@ -57,6 +58,7 @@ do_configure_prepend () {
if [ ! -e ${S}/acinclude.m4 ]; then
cp ${S}/aclocal.m4 ${S}/acinclude.m4
fi
+ cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 .
}
do_install_append () {