From 55134bc50193a53b659af9dd315bdc4d9b87da1c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 20 Nov 2019 14:44:50 +0100 Subject: e2fsprogs: fix build issues with the latest version of gettext Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../0001-configure.ac-correct-AM_GNU_GETTEXT.patch | 26 +++++++++++++++++++++ ...-try-to-use-gettext-defines-that-no-longe.patch | 27 ++++++++++++++++++++++ ...s-fix-missing-check-for-permission-denied.patch | 7 ++---- .../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 13 +++++++++-- .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 12 ++++++---- 5 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch 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 @@ +From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 19 Nov 2019 17:32:33 +0100 +Subject: [PATCH] configure.ac: correct AM_GNU_GETTEXT + +New version of gettext require the 'external' argument. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 654ff43d..4772b97b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE) + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + +-AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT + AC_SUBST([mkdir_p],['$(MKDIR_P)']) + 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 @@ +From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 19 Nov 2019 18:34:00 +0100 +Subject: [PATCH] intl: do not try to use gettext defines that no longer exist + +Newer version of gettext no longer define this in m4 files, +so patch it out until e2fsprogs upstream sorts the situation. + +Upstream-Status: Inappropriate [hardcodes a choice] +Signed-off-by: Alexander Kanavin +--- + intl/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/intl/Makefile.in b/intl/Makefile.in +index e037e23c..89a876b8 100644 +--- a/intl/Makefile.in ++++ b/intl/Makefile.in +@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc + DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ + COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h + +-all: all-@USE_INCLUDED_LIBINTL@ ++all: + all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed + all-no: all-no-@BUILD_INCLUDED_LIBINTL@ + 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 @@ -From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001 +From e8331a76983e839a3d193446ab8ae9c1b09daa07 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied. @@ -19,7 +19,7 @@ Signed-off-by: Jackie Huang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/support/profile.c b/lib/support/profile.c -index 9e96673b..32d83002 100644 +index 585ed595..810dd66b 100644 --- a/lib/support/profile.c +++ b/lib/support/profile.c @@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile) @@ -31,6 +31,3 @@ index 9e96673b..32d83002 100644 strcmp(*fs, default_filename)) goto errout; --- -2.16.1 - 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 @@ +From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 23 Dec 2013 13:38:34 +0000 +Subject: [PATCH] e2fsprogs: silence debugfs + When executing a script don't echo every command, as we do this for entire filesystems at rootfs time. Upstream-Status: Inappropriate Signed-off-by: Ross Burton +--- + debugfs/debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index 5590295..ac57292 100644 +index 15b01214..15164df2 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c -@@ -2378,7 +2378,7 @@ static int source_file(const char *cmd_file, int ss_idx) +@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx) cp = strchr(buf, '\r'); if (cp) *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 @@ require e2fsprogs.inc SRC_URI += "file://remove.ldconfig.call.patch \ - file://run-ptest \ - file://ptest.patch \ - file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ - " + file://run-ptest \ + file://ptest.patch \ + file://mkdir_p.patch \ + file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ + file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ + file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ + " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ -- cgit 1.2.3-korg