mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
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>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
596cfc5b0a
commit
a78fca575d
+26
@@ -0,0 +1,26 @@
|
||||
From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
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 <alex.kanavin@gmail.com>
|
||||
---
|
||||
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
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
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 <alex.kanavin@gmail.com>
|
||||
---
|
||||
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
|
||||
+2
-5
@@ -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 <jackie.huang@windriver.com>
|
||||
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 <jackie.huang@windriver.com>
|
||||
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
|
||||
|
||||
|
||||
@@ -1,14 +1,23 @@
|
||||
From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
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 <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
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;
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user