glibc 2.27 added function copy_file_range(), and e2fsprogs happens to
have a different function with the same name. The conflict made
e2fsprogs-native build fail.
Here's a backport of a fix from upstream, the fix was released in
e2fsprogs 1.43.8.
The master branch doesn't need this fix, since it has new enough
e2fsprogs version. At least rocko, pyro and morty need this, I haven't
checked older stable branches. Apparently the problematic function was
introduced in e2fsprogs version 1.43.
(From OE-Core rev: 350f2a4ad6e21acf1d357a90ba37b2c149ec7864)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fix hardcoded path for ptest script which would cause failure on
mulitilib:
ls: cannot access '/usr/lib/e2fsprogs/ptest/test/[a-zA-Z]_*': No such file or directory
./test_script: line 54: /usr/lib/e2fsprogs/ptest/test/test_post: No such file or directory
* Add missing '$' for shell variable reference
(From OE-Core rev: 82d244a9225bd1fa512e696aae917febe051fcf9)
(From OE-Core rev: d2fc87e074ed41d265667383827c36ceb0302693)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fsck.ext will return an error code of 1 if a file systems was checked
and successfully repaired. Even when an optimization was performed it
will return this error code.
This patch will change the error code to 0 if only optimizations had
changed the file systems.
The reason for this patch is a question I asked at the ext4 ML:
http://www.spinics.net/lists/linux-ext4/msg55700.html
Backport from git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
Based on commit bf9f3b6d5b10d19218b4ed904c12b22e36ec57dd
(From OE-Core rev: 8341ee45d721cf07b19d50c249bb3a77ef1bf100)
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we do not do this, locale data will not be put
into /usr/share/locale.
(From OE-Core rev: 19b770d56d8a6db48723e0754e224aaf6de683a3)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Rebased Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch.
* The mkfs.ext4dev is gone.
(From OE-Core rev: 54a012bff9430a8e973ddef61d14ac10d9ec9ed3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
e2fsprogs builds fine with or without attr but it's possible to
end up with this sequence:
* e2fsprogs configure finds attr/xattr.h (coming from sstate)
* attr starts rebuild, attr/xattr.h is removed from sysroot
* e2fsprogs compile fails: "attr/xattr.h: No such file or directory"
Depend on attr to ensure reproducible build.
(From OE-Core rev: 8b9668cc70348600ba281291b567485302af9666)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While comparing what were supposed to be similar
filesystems from different build machines, some issues
have been noticed in the e2fsprogs recipe, in
particular with the compile_et and mk_cmds utilities.
1) target:
move compile_et and mk_cmds into the -dev package
Both are development tools, from the man pages:
compile_et - error table compiler
compile_et converts a table listing error-code names
and associated messages into a C source file suitable
for use with the com_err(3) library.
mk_cmds - error table compiler
mk_cmds converts a table listing command names and
associated help messages into a C source file suitable
for use with the ss(3) library.
2) native/nativesdk
Also apply cleaning of host path (build directory) here,
so that only the sysroot directory remains, which is
properly adjusted by the sstate handling.
3) make cleaning of host path actually work
The existing sed command wasn't working, in particular
for compile_et; we fix up the sed command so that
removal of references to the local build directory
really works. Do the same changes for mk_cmds, for
consistency.
(From OE-Core rev: 3982b57e179872eb119ecb75237981beec398cb6)
Signed-off-by: André Draszik <git@andred.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the path to "ROOT_SYSCONFDIR /mke2fs.conf" has a permission denied problem,
then the get_dirlist() call will return EACCES. But the code in profile_init
will treat that as a fatal error and all executions will fail with:
Couldn't init profile successfully (error: 13).
But the problem should not really be visible for the target package as the path
then will be "/etc/mke2fs.conf", and it is not likely that a user have no
permission to read /etc.
(From OE-Core rev: 9d7c32a88e0670a09e5e1097ff8bca58e9a7943f)
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While e2fsprogs upgraded to 1.43, it dropped the patch
Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch,
we get it back and rebase for 1.43 to fix invoking grub-probe
failed.
Without the fix:
...
root@localhost:~# mkfs.ext4 /dev/sda3
[skip]
root@localhost:~# grub-probe --target=fs -d /dev/sda3
grub-probe: error: unknown filesystem.
...
After apply the fix:
...
root@localhost:~# mkfs.ext4 /dev/sda3
[skip]
root@localhost:~# grub-probe --target=fs -d /dev/sda3
ext2
...
(From OE-Core rev: a96ad733cf80716e26882889a130c87a78e5f576)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Removed patches already in the source:
- Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
- xattr_ordering.patch
* COPYING -> NOTICE, the md5sum is the same.
* e2fsprogs_git.bb -> e2fsprogs_1.43..bb
(From OE-Core rev: e0531174119bff21e9014b95ed1bbd0e1c01af26)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 092984669d8590627cfb188a0aa00244e22c4671)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Switch to the upstream version of the xattr patch.
(From OE-Core rev: 631217cc3cb15a7ec4f3cdf6e8d1ff67de2a72b3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is an ordering issue when adding multiple xattr values to
an ext filesystem build using the -d option to mkfs. This patch
fixes that issue. Its been posted for discussion with the upstream
community.
(From OE-Core rev: 4b579c1f13ba20198a390629cd099d8ad470ba32)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we don't do this, we can use an mke2fs.conf from a different path which
may contain incompatible flags and lead to obtuse build failures such as:
Invalid filesystem option set: has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
To fix this, wrap the mke2fs binary and its hardlinks and point at the
correct configuration file.
In particular this fixes conflicts between master and jethro builds
affecting the main autobuilder.
(From OE-Core rev: 11a6227759515da433230eb44eca1a4cb2ac3b14)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both e2fsprogs and util-linux can build blkid, but we want to always use
util-linux's for consistency.
(blkid was enabled again in a1f235)
(From OE-Core rev: eaff837048bc4fba0ed64fd612634682fe254d7f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As Martin and Ross suggested.
(From OE-Core rev: 33fb5629c8a306b00d84f564df2faa81501deadd)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We had upgraded e2fsprogs from 1.42.9 to 1.43 (WIP), and used:
PV = "1.42+1.43-git${SRCPV}"
But:
$ dpkg --compare-versions 1.42+1.43 gt 1.42.9 && echo greater || echo less
less
It shows that 1.42+1.43 is less than 1.42.9, so this is a downgraded. Use
PV = "1.42.13+git${SRCPV}"
to fix the problem. 1.42.13 is the latest e2fsprogs 1.42 version.
(From OE-Core rev: aafe22fb5f2f58e1e7206a34f410e9cae0d3cfe3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed:
e2fsprogs-1.42+1.43-gitAUTOINC+0f26747167: e2fsprogs rdepends on fuse, but it isn't a build dependency? [build-deps]
The fuse is in meta-filesystems layer.
(From OE-Core rev: 4612448ee7e26601694e4ab3d41a92982712c8a5)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to 1.43 (master) 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 -f" shows the image is OK, and also can boot.
[YOCTO #8622]
(From OE-Core rev: a1f235ad736d322bb50eb4a4293b6b2f4e5200aa)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The currnet patches in OE-core doesn't have the "CVE:"
tag, now part of the policy of the patches.
This is patch add this tag to several patches. There might
be patches that I miss; the tag can be added in the future.
(From OE-Core rev: 065ebeb3e15311d0d45385e15bf557b1c95b1669)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch to fix hardlinks filetype:
IMAGE_INSTALL_append = " e2fsprogs"
$ ./tmp/sysroots/x86_64-linux/sbin/fsck.ext4 tmp/deploy/images/qemux86/core-image-minimal-qemux86.ext4 -f
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Setting filetype for entry 'fsck.ext2' in /sbin (80) to 1.
Setting filetype for entry 'mkfs.ext4' in /sbin (80) to 1.
Setting filetype for entry 'fsck.ext4' in /sbin (80) to 1.
Setting filetype for entry 'mkfs.ext4dev' in /sbin (80) to 1.
Setting filetype for entry 'fsck.ext3' in /sbin (80) to 1.
Setting filetype for entry 'mkfs.ext2' in /sbin (80) to 1.
Setting filetype for entry 'mkfs.ext3' in /sbin (80) to 1.
Setting filetype for entry 'e2fsck' in /sbin (80) to 1.
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
test.img: ***** FILE SYSTEM WAS MODIFIED *****
test.img: 799/65536 files (0.1% non-contiguous), 14652/262144 blocks
Now when run it again, we may get:
[snip]
Pass 3A: Optimizing directories
[snip]
test.img: ***** FILE SYSTEM WAS MODIFIED *****
test.img: 799/65536 files (0.1% non-contiguous), 14652/262144 blocks
This is fine since it is optimizing, from "man e2fsck":
e2fsck may sometimes optimize a few directories --- for example, if
directory indexing is enabled and a directory is not indexed and would
benefit from being indexed, or if the index structures are corrupted
and need to be rebuilt.
[YOCTO #8544]
(From OE-Core rev: 02ad8e3c32656a74fa82284105706ae67e5108f3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.
(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update alternatives of man pages in several packages.
(From OE-Core rev: 2cff20f423fb9e82b44c68504be605c223bd74fb)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch to fix CVE-2015-1572
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1572
(From OE-Core rev: 203e1024cc7517cad28423cc04f641376cc8f2f5)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* install populate-extfs.sh from contrib, be aware that in order
to use it you need to set DEBUGFS shell variable, otherwise it will
try to use debugfs from relative path which is almost always
incorrect:
CONTRIB_DIR=$(dirname $(readlink -f $0))
DEBUGFS="$CONTRIB_DIR/../debugfs/debugfs"
(From OE-Core rev: 525b7b587a00466e4322450c171d920b47201e56)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 3047160d04dfa1846db52b58d77f6380ea3dfb6e)
Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes a heap buffer overflow in lib/ext2fs/openfs.c which allows
a trivial arbitrary memory write under certain conditions.
References
http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/?id=f66e6ce4http://www.ocert.org/advisories/ocert-2015-002.html
(From OE-Core rev: 572437720b6698a3a10627fcd9654ef10f827836)
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
See the patch description, this adds a tweak to an algorithm to improve
core-image-sato-sdk mkfs time from over 8 minutes to about 35s.
Needs discussion upstream but seems reasonable for our uses of it.
(From OE-Core rev: 468fa9a7fac86bb0fcd3cbd18dc1492b57ca25f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some macros have been added upstream and were not being executed, so refresh our
fork of this file.
(From OE-Core rev: 6988baed623c507aa44164801c5359411f462d84)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The build system uses BUILD_CC itself now, so we don't need to do it manually.
(From OE-Core rev: 32ddff201eb00b1ffa244904251ad0ad39760b62)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This chmod doesn't appear to be needed, and history fades away in 2005.
(From OE-Core rev: bade04d62468acbec2b54f38b5071a3b1070ab9a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both of these fixes have been applied upstream and improve general code
correctness. They are needed when building with TCLIBC=musl but shouldn't cause
any harm with other libc implementations.
(From OE-Core rev: 23a533908355b7bb37ce34b073ac91aa20c5776d)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both busybox and e2fsprogs provide chattr, ensure that they are delivered
to the same location and use update-alternatives to ensure the correct
links are there.
[YOCTO #6407]
(From OE-Core rev: 23f1dddbf9cf783d90040b67978d1291b16a13de)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The class itself currently does nothing. The idea is to mark all recipes that
make use of the texinfo utilities. In the future, this class could be used to
suppress the generation/formatting of documentation for performance,
explicitly track dependencies on these utilities, and eliminate Yocto's
current dependency on the host system's texinfo utilities.
(From OE-Core rev: e6fb2f9afe2ba6b676c46d1eb297ca9cc532d405)
Signed-off-by: Max Eliaser <max.eliaser@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ext2_types.h conflicts between 32-bit and 64-bit versions.
(From OE-Core rev: e5bae3426856f9d2fdb604278154b6242011d103)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The mke2fs and e2fsck commands are regular tools of e2fsprogs, so they
should be installed.
(From OE-Core rev: a2b6610dceb0c27484d3958d84d7f491aa759a04)
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need return retval when "mke2fs -d" failed, otherwise the "$?" would
be 0 which is misleading.
[YOCTO #6011]
(From OE-Core rev: 46896b601c1c93e276954b674aa30b8b4dc4f611)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When compiling e2fsprogs for qemumips64, we got compilation errors.
The root cause is that parse-types.sh script would fail for mips64.
However, the type size checking in parse-types.sh doesn't make much
sense in case of cross compilation. This is because that the typedef
statements in asm_types.h are for the target machine while the generated
binary in parse-types.sh script is executed on build machine.
This patch fixes such problem.
(From OE-Core rev: 45877518e2d277c63d5a561408fbfcd4cb5a2a76)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove it since we don't need it anymore, and there is one inside the
e2fsprogs.
[YOCTO #4083]
(From OE-Core rev: f3a95ca6886b55e5819b068bdbd2cceb882d91a6)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These patches should be enabled at the same time, so enable them in a
single commit, and thus we can disable it easily.
[YOCTO #4083]
(From OE-Core rev: 671bf47101b8f7bd2e6e8b7920615f9e7837ea81)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tanu Kaskinen
Yi Zhao
Daniel Schultz
Joe Slater
Martin Jansa
Robert Yang
Zheng Ruoqin
Jussi Kukkonen
André Draszik
Jackie Huang
Hongxu Jia
Richard Purdie
Alexander Kanavin
Jonathan Liu
Ross Burton
Mariano Lopez
Kai Kang
Roy Li
Dmitry Eremin-Solenikov
Alex J Lennon
Sona Sarmadi
Shiqun Lin
Paul Barker
Saul Wold
Max Eliaser
Ming Liu
Yue Tao
Chen Qi