From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 06/24] e2fsprogs: update 1.45.7 -> 1.46.1
Date: Sun, 28 Feb 2021 16:36:44 +0100 [thread overview]
Message-ID: <20210228153702.498275-6-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20210228153702.498275-1-alex.kanavin@gmail.com>
Drop gettext patches; upstream has fixed the issues.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
...-configure.ac-correct-AM_GNU_GETTEXT.patch | 26 ------------------
...to-use-gettext-defines-that-no-longe.patch | 27 -------------------
...-missing-check-for-permission-denied.patch | 2 +-
.../e2fsprogs/e2fsprogs/mkdir_p.patch | 17 +++++++++---
.../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 6 ++---
...2fsprogs_1.45.7.bb => e2fsprogs_1.46.1.bb} | 5 ++--
7 files changed, 20 insertions(+), 65 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.7.bb => e2fsprogs_1.46.1.bb} (96%)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 009f5ed807..2f113c5e8d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
SECTION = "base"
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr autoconf-archive"
SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
S = "${WORKDIR}/git"
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
deleted file mode 100644
index 2719594c2f..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
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
deleted file mode 100644
index 31b585fc9a..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
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 284ac90196..d7c07c3b0f 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 b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001
+From 9263b8764702f2b26ddaaf80808ebab31a1dba3b 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.
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
index b0fa4b8cc5..f6916a1112 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
@@ -1,18 +1,27 @@
-e2fsprogs: expand @mkdir_p@
+From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001
+From: Joe Slater <jslater@windriver.com>
+Date: Tue, 7 Mar 2017 14:53:19 -0800
+Subject: [PATCH] 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.
+not expanded so no locale data is written into usr/share/locale.
Upstream-Status: Pending
Signed-off-by: Joe Slater <jslater@windriver.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4c4b5523..3475c707 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE)
+@@ -919,6 +919,8 @@ 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/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
index aac88eed98..88d0ae77c9 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
@@ -1,4 +1,4 @@
-From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001
+From 6e4c1644a3a8cacf7c1f5953cc378589bb046d5a 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
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 15b01214..15164df2 100644
+index 132c5f9d..98063727 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
-@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+@@ -2510,7 +2510,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.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb
similarity index 96%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb
index 1a00807757..be8b67c35d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb
@@ -4,15 +4,14 @@ SRC_URI += "file://remove.ldconfig.call.patch \
file://run-ptest \
file://ptest.patch \
file://mkdir_p.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 \
"
-SRCREV = "5403970e44241cec26f98aaa0124b9881b4bbf4f"
+
+SRCREV = "3114c623f56b0d61f5f34b85f7b23d28f6c848c0"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--
2.29.2
next prev parent reply other threads:[~2021-02-28 15:37 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 15:36 [PATCH 01/24] webkit/wpe: only check even versions Alexander Kanavin
2021-02-28 15:36 ` [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6 Alexander Kanavin
2021-02-28 18:35 ` [OE-core] " Khem Raj
2021-02-28 19:08 ` Alexander Kanavin
2021-02-28 19:20 ` Khem Raj
2021-02-28 19:23 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 03/24] dnf: upgrade 4.5.2 -> 4.6.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 04/24] ccache: update 4.1 -> 4.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 05/24] dosfstools: " Alexander Kanavin
2021-02-28 18:40 ` [OE-core] " Khem Raj
2021-02-28 19:10 ` Alexander Kanavin
2021-02-28 19:20 ` Khem Raj
2021-03-01 14:32 ` Colin Finck
2021-03-01 16:57 ` [OE-core] " Alexander Kanavin
2021-03-02 13:25 ` Colin Finck
2021-03-02 13:36 ` [OE-core] " Alexander Kanavin
2021-03-03 16:16 ` Martin Jansa
2021-03-03 16:34 ` Khem Raj
2021-03-03 16:58 ` Martin Jansa
2021-03-03 17:09 ` Colin Finck
2021-03-03 17:01 ` Colin Finck
2021-03-03 16:28 ` Steve Sakoman
2021-02-28 15:36 ` Alexander Kanavin [this message]
2021-02-28 15:36 ` [PATCH 07/24] elfutils: update 0.182 -> 0.183 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0 Alexander Kanavin
2021-02-28 19:04 ` [OE-core] " Khem Raj
2021-02-28 19:07 ` Alexander Kanavin
2021-02-28 19:30 ` Khem Raj
2021-03-01 11:53 ` Alexander Kanavin
2021-03-08 22:29 ` Richard Purdie
2021-03-09 19:50 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 09/24] librepo: update 1.12.1 -> 1.13.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 10/24] meson: update 0.56.2 -> 0.57.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 11/24] perl: update 5.32.0 -> 5.32.1 Alexander Kanavin
2021-03-01 8:03 ` [OE-core] " Khem Raj
2021-03-01 22:40 ` Khem Raj
2021-03-02 9:19 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 12/24] pango: update 1.48.0 -> 1.48.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 13/24] vulkan-samples: update to latest revision Alexander Kanavin
2021-02-28 15:36 ` [PATCH 14/24] webkitgtk: update 2.30.4 -> 2.30.5 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 15/24] libgcrypt: update 1.8.7 -> 1.9.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 16/24] libical: update 3.0.8 -> 3.0.9 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 17/24] pinentry: update 1.1.0 -> 1.1.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 18/24] procps: update 3.3.16 -> 3.3.17 Alexander Kanavin
2021-02-28 19:10 ` [OE-core] " Khem Raj
2021-03-08 22:47 ` Richard Purdie
2021-03-09 12:04 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 19/24] libmd: add a recipe Alexander Kanavin
2021-02-28 15:36 ` [PATCH 20/24] libbsd: udpate 0.10.0 -> 0.11.3 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 21/24] syslinux: use NO_INLINE_FUNCS in CFLAGS Alexander Kanavin
2021-02-28 15:37 ` [PATCH 22/24] scripts/lib/wic/partition.py: do not set FAT size Alexander Kanavin
2021-02-28 19:16 ` [OE-core] " Khem Raj
2021-02-28 19:21 ` Alexander Kanavin
2021-02-28 15:37 ` [PATCH 23/24] openssl: address ptest failures caused by perl 5.32.1 Alexander Kanavin
2021-02-28 15:37 ` [PATCH 24/24] ptest-perl/run-ptest: address " Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210228153702.498275-6-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox