summaryrefslogtreecommitdiffstats
path: root/meta
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 14:50:10 +0000
commitc33aa1e088f5df63f47f547cfe55a80523eccf66 (patch)
treee3b0b41086e8d9fcdadbf061ab8cb90cfcc57a95 /meta
parent070f3aa74fba79c7fb981291c7c5d9234739bb12 (diff)
downloadpoky-c33aa1e088f5df63f47f547cfe55a80523eccf66.tar.gz
e2fsprogs: expand @mkdir_p@ during configuration
If we do not do this, locale data will not be put into /usr/share/locale. (From OE-Core rev: 19b770d56d8a6db48723e0754e224aaf6de683a3) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
1e2fsprogs: expand @mkdir_p@
2
3Add AC_SUBST to configure.ac. @mkdir_p@ is currently
4not expanded so no locale data is written into usr/share/locale.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <jslater@windriver.com>
9
10--- a/configure.ac
11+++ b/configure.ac
12@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE)
13 AC_SUBST(VERSION)
14
15 AM_GNU_GETTEXT
16+dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
17+AC_SUBST([mkdir_p],['$(MKDIR_P)'])
18 dnl
19 dnl End of configuration options
20 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 \
8 file://mkdir.patch \ 8 file://mkdir.patch \
9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ 9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
10 file://e2fsprogs-1.43-sysmacros.patch \ 10 file://e2fsprogs-1.43-sysmacros.patch \
11 file://mkdir_p.patch \
11" 12"
12 13
13SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" 14SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"