e2fsprogs: 1.42.9 -> 1.43-WIP

The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b:

update_font_cache: only scan system font directories (2016-01-11 23:23:18 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/e2fsprogs
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/e2fsprogs

Robert Yang (1):
e2fsprogs: 1.42.9 -> 1.43-WIP

 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc      |    8 +-
 ...1-e2fsprogs-fix-cross-compilation-problem.patch |   55 ---
 ...-fix-potential-buffer-overflow-in-closefs.patch |   59 ---
 ...the-ability-to-copy-files-from-a-given-di.patch |   98 ----
 ...isc-create_inode.c-copy-files-recursively.patch |  135 ------
 ...3-misc-create_inode.c-create-special-file.patch |  103 ----
 .../0004-misc-create_inode.c-create-symlink.patch  |   63 ---
 ...005-misc-create_inode.c-copy-regular-file.patch |  224 ---------
 ...0006-misc-create_inode.c-create-directory.patch |   62 ---
 ..._inode.c-set-owner-mode-time-for-the-inod.patch |   81 ----
 ...8-mke2fs.c-add-an-option-d-root-directory.patch |  168 -------
 ...0009-misc-create_inode.c-handle-hardlinks.patch |  210 ---------
 ...-use-the-functions-in-misc-create_inode.c.patch |  496 --------------------
 ...s.8.in-update-the-manual-for-the-d-option.patch |   43 --
 .../e2fsprogs/0012-Fix-musl-build-failures.patch   |   54 ---
 .../e2fsprogs/e2fsprogs/CVE-2015-0247.patch        |   58 ---
 .../e2fsprogs/e2fsprogs/cache_inode.patch          |   52 --
 ...ate-hardlinks-with-the-correct-directory-.patch |   81 ----
 .../e2fsprogs/e2fsprogs/fix-icache.patch           |   65 ---
 ...c-return-error-when-failed-to-populate-fs.patch |   37 --
 .../e2fsprogs/e2fsprogs/mkdir.patch                |   32 +-
 .../e2fsprogs/e2fsprogs/ptest.patch                |   35 +-
 .../{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb}      |   44 +-
 23 files changed, 43 insertions(+), 2220 deletions(-)
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb} (61%)

1.7.9.5

Upgrade to 1.43-WIP to make "mke2fs -d" support xattr, so that the layer which requires xattr such as meta-selinux can populate images easily.

* Remove the following patches since they are alredy in the source. 0001-e2fsprogs-fix-cross-compilation-problem.patch 0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch 0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch 0002-misc-create_inode.c-copy-files-recursively.patch 0003-misc-create_inode.c-create-special-file.patch 0004-misc-create_inode.c-create-symlink.patch 0005-misc-create_inode.c-copy-regular-file.patch 0006-misc-create_inode.c-create-directory.patch 0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch 0008-mke2fs.c-add-an-option-d-root-directory.patch 0009-misc-create_inode.c-handle-hardlinks.patch 0010-debugfs-use-the-functions-in-misc-create_inode.c.patch 0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch 0012-Fix-musl-build-failures.patch
CVE-2015-0247.patch copy-in-create-hardlinks-with-the-correct-directory-.patch fix-icache.patch misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch

* Remove cache_inode.patch since it is not needed any more

* Updated mkdir.patch and ptest.patch

* Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by default.

* Time of core-image-sato-sdk do_rootfs:
- Before upgrade

    real    3m18.508s
    user    7m42.088s
    sys     1m1.984s

- After upgrade

    real    3m21.552s
    user    7m38.496s
    sys     1m0.644s

The are nearly the same

* The "fsck -fn" shows the image is OK, and also can boot.

[YOCTO #8622]

---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc      |    8 +-
 ...1-e2fsprogs-fix-cross-compilation-problem.patch |   55 ---
 ...-fix-potential-buffer-overflow-in-closefs.patch |   59 ---
 ...the-ability-to-copy-files-from-a-given-di.patch |   98 ----
 ...isc-create_inode.c-copy-files-recursively.patch |  135 ------
 ...3-misc-create_inode.c-create-special-file.patch |  103 ----
 .../0004-misc-create_inode.c-create-symlink.patch  |   63 ---
 ...005-misc-create_inode.c-copy-regular-file.patch |  224 ---------
 ...0006-misc-create_inode.c-create-directory.patch |   62 ---
 ..._inode.c-set-owner-mode-time-for-the-inod.patch |   81 ----
 ...8-mke2fs.c-add-an-option-d-root-directory.patch |  168 -------
 ...0009-misc-create_inode.c-handle-hardlinks.patch |  210 ---------
 ...-use-the-functions-in-misc-create_inode.c.patch |  496 --------------------
 ...s.8.in-update-the-manual-for-the-d-option.patch |   43 --
 .../e2fsprogs/0012-Fix-musl-build-failures.patch   |   54 ---
 .../e2fsprogs/e2fsprogs/CVE-2015-0247.patch        |   58 ---
 .../e2fsprogs/e2fsprogs/cache_inode.patch          |   52 --
 ...ate-hardlinks-with-the-correct-directory-.patch |   81 ----
 .../e2fsprogs/e2fsprogs/fix-icache.patch           |   65 ---
 ...c-return-error-when-failed-to-populate-fs.patch |   37 --
 .../e2fsprogs/e2fsprogs/mkdir.patch                |   32 +-
 .../e2fsprogs/e2fsprogs/ptest.patch                |   35 +-
 .../{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb}      |   44 +-
 23 files changed, 43 insertions(+), 2220 deletions(-)
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb} (61%)

index bcd9ba7..09e4ea5 100644
@@ -19,7 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \
 SECTION = "base"
 DEPENDS = "util-linux"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-           file://mkdir.patch"
+SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
+S = "${WORKDIR}/git"
 
-inherit autotools gettext texinfo pkgconfig multilib_header
+inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest
+
+BBCLASSEXTEND = "native nativesdk"

deleted file mode 100644
index cba0ce0..0000000
@@ -1,37 +0,0 @@
-From e4ffd6fe975888d306b5f700ba54af18b59f6759 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Thu, 20 Mar 2014 11:10:21 +0800
-Subject: [PATCH] misc/mke2fs.c: return error when failed to populate filesystem
-
-We need return retval when "mke2fs -d" failed, otherwise the "$?" would
-be 0 which is misleading.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Robert Yang <[email protected]>
----
- misc/mke2fs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/misc/mke2fs.c b/misc/mke2fs.c
-index a63f0b7..846190e 100644
---- a/misc/mke2fs.c
-+++ b/misc/mke2fs.c
-@@ -2745,10 +2745,11 @@ no_journal:
- 		current_fs = fs;
- 		root = EXT2_ROOT_INO;
- 		retval = populate_fs(root, root_dir);
--		if (retval)
-+		if (retval) {
- 			fprintf(stderr, "%s",
--				_("\nError while populating file system"));
--		else if (!quiet)
-+				_("\nError while populating file system\n"));
-+			return retval;
-+		} else if (!quiet)
- 			printf("%s", _("done\n"));
- 	}
- 
--- 
-1.8.3.1
-

index aa7a298..2a3aeff 100644
@@ -2,29 +2,17 @@ Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Mei Lei <[email protected]>
 
-Index: e2fsprogs-1.41.5/po/Makefile.in.in
-===================================================================
---- e2fsprogs-1.41.5.orig/po/Makefile.in.in	2009-02-14 13:49:08.000000000 +0000
-+++ e2fsprogs-1.41.5/po/Makefile.in.in	2009-08-19 17:52:31.000000000 +0100
-@@ -30,7 +30,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+mkinstalldirs = $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
-Index: e2fsprogs-1.41.5/configure.in
-===================================================================
---- e2fsprogs-1.41.5.orig/configure.in	2009-08-19 17:53:50.000000000 +0100
-+++ e2fsprogs-1.41.5/configure.in	2009-08-19 17:48:38.000000000 +0100
-@@ -970,6 +970,8 @@
+diff --git a/configure.ac b/configure.ac
+index c1fe224..f5ac628 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1374,7 +1374,8 @@ if test -n "$WITH_DIET_LIBC" ; then
+ 	INCLUDES="$INCLUDES -D_REENTRANT"
  fi
- AC_SUBST(BUILD_CFLAGS)
- AC_SUBST(BUILD_LDFLAGS)
+ AC_SUBST(INCLUDES)
+-AM_MKINSTALLDIRS
 +MKINSTALLDIRS="mkdir -p"
 +AC_SUBST(MKINSTALLDIRS)
  dnl
- dnl Make our output files, being sure that we create the some miscellaneous 
- dnl directories
+ dnl Build CFLAGS
+ dnl

index b8a53e9..ef1ce58 100644
@@ -1,17 +1,17 @@
-Index: e2fsprogs-1.42.9/tests/Makefile.in
-===================================================================
---- e2fsprogs-1.42.9.orig/tests/Makefile.in
-+++ e2fsprogs-1.42.9/tests/Makefile.in
-@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 60cf655..ce220f1 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
  	@echo "#!/bin/sh" > test_one
- @HTREE_CMT@	@echo "HTREE=y" >> test_one
- @QUOTA_CMT@	@echo "QUOTA=y" >> test_one
+ 	@echo "HTREE=y" >> test_one
+ 	@echo "QUOTA=y" >> test_one
 -	@echo "SRCDIR=@srcdir@" >> test_one
 +	@echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one
  	@echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
  	@cat $(srcdir)/test_one.in >> test_one
  	@chmod +x test_one
-@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile
+@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
  test_script: test_one test_script.in Makefile mke2fs.conf
  	@echo "Creating test_script..."
  	@echo "#!/bin/sh" > test_script

@@ -20,11 +20,11 @@ Index: e2fsprogs-1.42.9/tests/Makefile.in
  	@cat $(srcdir)/test_script.in >> test_script
  	@chmod +x test_script
  
-Index: e2fsprogs-1.42.9/tests/test_config
-===================================================================
---- e2fsprogs-1.42.9.orig/tests/test_config
-+++ e2fsprogs-1.42.9/tests/test_config
-@@ -3,23 +3,23 @@
+diff --git a/tests/test_config b/tests/test_config
+index 7f39157..c815a44 100644
+--- a/tests/test_config
++++ b/tests/test_config
+@@ -3,24 +3,24 @@
  #
  
  unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER

@@ -54,13 +54,14 @@ Index: e2fsprogs-1.42.9/tests/test_config
 +RESIZE2FS_EXE="/sbin/resize2fs"
  RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"
 -E2UNDO_EXE="../misc/e2undo"
++E2UNDO_EXE="/sbin/e2undo"
+ E2UNDO="$USE_VALGRIND $E2UNDO_EXE"
 -TEST_REL=../tests/progs/test_rel
 -TEST_ICOUNT=../tests/progs/test_icount
 -CRCSUM=../tests/progs/crcsum
-+E2UNDO_EXE="/sbin/e2undo"
 +TEST_REL=./progs/test_rel
 +TEST_ICOUNT=./progs/test_icount
 +CRCSUM=./progs/crcsum
- LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss
- DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss
- export LD_LIBRARY_PATH
+ CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
+ LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
+ DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}

1.7.9.5

[...]

I've a branch somewhere which added test cases for each package manager to exercise the ~ codepaths in the package managers (where 1.42 < 1.43~git < 1.43) with "interesting" conclusions:

* dpkg works just fine
* opkg's version compare logic is reimplemented three times, differently, and the tool for comparing versions from the shell is one of those implementations, at best returns inverted results, and at worse is non-deterministic.
* rpm has no way to compare versions from the shell

Something else to chip away at during this cycle I guess. Maybe in 2.2 we'll be able to confidently use ~ in versions!

Ross

Thanks, good idea, updated in the repo:

git://git.openembedded.org/openembedded-core-contrib rbt/e2fsprogs

http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/e2fsprogs

Robert Yang (1):
e2fsprogs: 1.42.9 -> 1.43 (master)

* Changes:
- Use PV = "1.42+1.43-git${SRCPV}"

Another thing is that, though we use "1.42+1.43-git${SRCPV}", the rpm name is e2fsprogs-1.42+1.43+git0+0f26747167-r0.aarch64.rpm, note, no "-" in PV, the same to ipk.

// Robert

However, that is not a more recent version than the one that was in OE-core before:

$ dpkg --compare-versions 1.42+1.43 gt 1.42.9 && echo greater || echo less
less

As a result, the version upgrade (which is in OE-core master now) became a downgrade as far as distros with stable package feeds are concerned, didn't it?

The version for OE-core could have been: 1.42.9+1.43-git${SRCPV}

However, I've had a "1.42.9+git${SRCPV}" in meta-intel-iot-security for a while now, and 1.42.9+1.43-git${SRCPV} is considered older than that because of the embedded 1.43. While I understand that external layers should not be something that OE-core needs to be concerned about too much, some consistency still helps.

I believe the "1.42.9+git${SRCPV}" string goes back to Ross, so I'd assume that it is not too unusual. Can we perhaps use "1.42.9+git ${SRCPV}" also in OE-core? Then if I'm not mistaken, the magic behind ${SRCPV} will ensure that the final version number will be higher.

Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

Maybe use 1.42.13+git${SRCPV} ? Since 1.42.13 is the lastest 1.42 version.

// Robert

That would also work.

Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

*ahem*

commit fb8e776ea91c39d586b46400ad30aeea8dead1c4

Author: Richard Purdie <[email protected]>
Date:   Sat Aug 25 16:45:33 2012 +0100

e2fsprogs: Fully remove/disable blkid

We've removed libblkid from e2fsprogs as it was being provided by util-linux. The blkid binary is also provided there and providing it within e2fsprogs too, linked against a different and potentially incompatible library we're likely asking for trouble.

It also leads to inconsistencies in the native sysroot since we don't consistently get one given provider of blkid (but always the liblibid from util-linux).

To clean this up, fully remove/disable the blkid binary and package.

And the do_install in the recipe:

        # We use blkid from util-linux now so remove from here
        rm -f ${D}${base_libdir}/libblkid*
        rm -rf ${D}${includedir}/blkid
        rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
        rm -f ${D}${base_sbindir}/blkid
        rm -f ${D}${base_sbindir}/fsck
        rm -f ${D}${base_sbindir}/findfs