summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc2
-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.patch2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch17
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch6
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb)5
7 files changed, 20 insertions, 65 deletions
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 \
17 file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ 17 file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
18 file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" 18 file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
19SECTION = "base" 19SECTION = "base"
20DEPENDS = "util-linux attr" 20DEPENDS = "util-linux attr autoconf-archive"
21 21
22SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" 22SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
23S = "${WORKDIR}/git" 23S = "${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 @@
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
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 @@
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 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 @@
1From b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001 1From 9263b8764702f2b26ddaaf80808ebab31a1dba3b 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.
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 @@
1e2fsprogs: expand @mkdir_p@ 1From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com>
3Date: Tue, 7 Mar 2017 14:53:19 -0800
4Subject: [PATCH] e2fsprogs: expand @mkdir_p@
2 5
3Add AC_SUBST to configure.ac. @mkdir_p@ is currently 6Add AC_SUBST to configure.ac. @mkdir_p@ is currently
4not expanded so no locale data is written into usr/share/locale. 7not expanded so no locale data is written into usr/share/locale.
5 8
6Upstream-Status: Pending 9Upstream-Status: Pending
7 10
8Signed-off-by: Joe Slater <jslater@windriver.com> 11Signed-off-by: Joe Slater <jslater@windriver.com>
9 12
13---
14 configure.ac | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index 4c4b5523..3475c707 100644
10--- a/configure.ac 19--- a/configure.ac
11+++ b/configure.ac 20+++ b/configure.ac
12@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE) 21@@ -919,6 +919,8 @@ AC_SUBST(PACKAGE)
13 AC_SUBST(VERSION) 22 AC_SUBST(VERSION)
14 23
15 AM_GNU_GETTEXT 24 AM_GNU_GETTEXT([external])
16+dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT 25+dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
17+AC_SUBST([mkdir_p],['$(MKDIR_P)']) 26+AC_SUBST([mkdir_p],['$(MKDIR_P)'])
18 dnl 27 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 @@
1From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001 1From 6e4c1644a3a8cacf7c1f5953cc378589bb046d5a Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 23 Dec 2013 13:38:34 +0000 3Date: Mon, 23 Dec 2013 13:38:34 +0000
4Subject: [PATCH] e2fsprogs: silence debugfs 4Subject: [PATCH] e2fsprogs: silence debugfs
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c 16diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
17index 15b01214..15164df2 100644 17index 132c5f9d..98063727 100644
18--- a/debugfs/debugfs.c 18--- a/debugfs/debugfs.c
19+++ b/debugfs/debugfs.c 19+++ b/debugfs/debugfs.c
20@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx) 20@@ -2510,7 +2510,7 @@ static int source_file(const char *cmd_file, int ss_idx)
21 cp = strchr(buf, '\r'); 21 cp = strchr(buf, '\r');
22 if (cp) 22 if (cp)
23 *cp = 0; 23 *cp = 0;
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb b/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 \
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-configure.ac-correct-AM_GNU_GETTEXT.patch \
8 file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
9 " 7 "
10 8
11SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ 9SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
12 file://quiet-debugfs.patch \ 10 file://quiet-debugfs.patch \
13" 11"
14 12
15SRCREV = "5403970e44241cec26f98aaa0124b9881b4bbf4f" 13
14SRCREV = "3114c623f56b0d61f5f34b85f7b23d28f6c848c0"
16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" 15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
17 16
18EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 17EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \