summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-11-20 14:44:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-25 17:57:22 +0000
commita78fca575d71ee58529e3ba6f9d3739f9d2e4a08 (patch)
treebb304cd2c3fa3ebaaa3909fa7218ad53cddbd9b6
parent596cfc5b0aac2c73e2ad911a719404c665700417 (diff)
downloadpoky-a78fca575d71ee58529e3ba6f9d3739f9d2e4a08.tar.gz
e2fsprogs: fix build issues with the latest version of gettext
(From OE-Core rev: 55134bc50193a53b659af9dd315bdc4d9b87da1c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch26
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch27
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch7
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch13
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb12
5 files changed, 73 insertions, 12 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
new file mode 100644
index 0000000000..2719594c2f
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
@@ -0,0 +1,26 @@
1From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 19 Nov 2019 17:32:33 +0100
4Subject: [PATCH] configure.ac: correct AM_GNU_GETTEXT
5
6New version of gettext require the 'external' argument.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 654ff43d..4772b97b 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE)
19 AC_SUBST(PACKAGE)
20 AC_SUBST(VERSION)
21
22-AM_GNU_GETTEXT
23+AM_GNU_GETTEXT([external])
24 dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
25 AC_SUBST([mkdir_p],['$(MKDIR_P)'])
26 dnl
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
new file mode 100644
index 0000000000..31b585fc9a
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
@@ -0,0 +1,27 @@
1From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 19 Nov 2019 18:34:00 +0100
4Subject: [PATCH] intl: do not try to use gettext defines that no longer exist
5
6Newer version of gettext no longer define this in m4 files,
7so patch it out until e2fsprogs upstream sorts the situation.
8
9Upstream-Status: Inappropriate [hardcodes a choice]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 intl/Makefile.in | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/intl/Makefile.in b/intl/Makefile.in
16index e037e23c..89a876b8 100644
17--- a/intl/Makefile.in
18+++ b/intl/Makefile.in
19@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
20 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
21 COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
22
23-all: all-@USE_INCLUDED_LIBINTL@
24+all:
25 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
26 all-no: all-no-@BUILD_INCLUDED_LIBINTL@
27 all-no-yes: libgnuintl.$la
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
index 69c09bc1d7..4d335af4cf 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
@@ -1,4 +1,4 @@
1From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001 1From e8331a76983e839a3d193446ab8ae9c1b09daa07 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 10 Aug 2016 11:19:44 +0800 3Date: Wed, 10 Aug 2016 11:19:44 +0800
4Subject: [PATCH] Fix missing check for permission denied. 4Subject: [PATCH] Fix missing check for permission denied.
@@ -19,7 +19,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/lib/support/profile.c b/lib/support/profile.c 21diff --git a/lib/support/profile.c b/lib/support/profile.c
22index 9e96673b..32d83002 100644 22index 585ed595..810dd66b 100644
23--- a/lib/support/profile.c 23--- a/lib/support/profile.c
24+++ b/lib/support/profile.c 24+++ b/lib/support/profile.c
25@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile) 25@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile)
@@ -31,6 +31,3 @@ index 9e96673b..32d83002 100644
31 strcmp(*fs, default_filename)) 31 strcmp(*fs, default_filename))
32 goto errout; 32 goto errout;
33 33
34--
352.16.1
36
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
index 830e9d57a5..95e6a7a2d5 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
@@ -1,14 +1,23 @@
1From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 23 Dec 2013 13:38:34 +0000
4Subject: [PATCH] e2fsprogs: silence debugfs
5
1When executing a script don't echo every command, as we do this for entire 6When executing a script don't echo every command, as we do this for entire
2filesystems at rootfs time. 7filesystems at rootfs time.
3 8
4Upstream-Status: Inappropriate 9Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
6 11
12---
13 debugfs/debugfs.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
7diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c 16diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
8index 5590295..ac57292 100644 17index 15b01214..15164df2 100644
9--- a/debugfs/debugfs.c 18--- a/debugfs/debugfs.c
10+++ b/debugfs/debugfs.c 19+++ b/debugfs/debugfs.c
11@@ -2378,7 +2378,7 @@ static int source_file(const char *cmd_file, int ss_idx) 20@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx)
12 cp = strchr(buf, '\r'); 21 cp = strchr(buf, '\r');
13 if (cp) 22 if (cp)
14 *cp = 0; 23 *cp = 0;
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
index 90db71df00..ab44c28f2a 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
@@ -1,11 +1,13 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3SRC_URI += "file://remove.ldconfig.call.patch \ 3SRC_URI += "file://remove.ldconfig.call.patch \
4 file://run-ptest \ 4 file://run-ptest \
5 file://ptest.patch \ 5 file://ptest.patch \
6 file://mkdir_p.patch \ 6 file://mkdir_p.patch \
7 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ 7 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
8 " 8 file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \
9 file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
10 "
9 11
10SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ 12SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
11 file://quiet-debugfs.patch \ 13 file://quiet-debugfs.patch \