summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2017-03-07 14:53:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-10 10:15:45 +0000
commit19b770d56d8a6db48723e0754e224aaf6de683a3 (patch)
tree3fe9fede87c80e3e4e39dc68cca4c5c0ea6475a2
parent991620f3962a9917fa99abb5582f4b72ebd42a3d (diff)
downloadopenembedded-core-19b770d56d8a6db48723e0754e224aaf6de683a3.tar.gz
openembedded-core-19b770d56d8a6db48723e0754e224aaf6de683a3.tar.bz2
openembedded-core-19b770d56d8a6db48723e0754e224aaf6de683a3.zip
e2fsprogs: expand @mkdir_p@ during configuration
If we do not do this, locale data will not be put into /usr/share/locale. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch20
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb1
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
new file mode 100644
index 0000000000..b0fa4b8cc5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
@@ -0,0 +1,20 @@
+e2fsprogs: expand @mkdir_p@
+
+Add AC_SUBST to configure.ac. @mkdir_p@ is currently
+not expanded so no locale data is written into usr/share/locale.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <jslater@windriver.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+
+ AM_GNU_GETTEXT
++dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
++AC_SUBST([mkdir_p],['$(MKDIR_P)'])
+ dnl
+ dnl End of configuration options
+ dnl
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
index 95ebc3a556..153b3a15ce 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://acinclude.m4 \
file://mkdir.patch \
file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
file://e2fsprogs-1.43-sysmacros.patch \
+ file://mkdir_p.patch \
"
SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"