OSDN Git Service
Jin Qian [Tue, 3 Jan 2017 20:59:58 +0000 (20:59 +0000)]
e2fsdroid: use absolute path for product_out am:
bc02ac42b2 am:
b7a39c5443 am:
b22693a64f
am:
85267f0452
Change-Id: I61939b6dde1b0dd13f3eeb484f362ccb308fe95d
Jin Qian [Tue, 3 Jan 2017 20:59:55 +0000 (20:59 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file am:
6ef6efab23 am:
4059037c17 am:
a6dc5be0ea
am:
8cad9ea0dd
Change-Id: I1b3452c50d0a6ebeb362e4471ddccf7ddfd7873e
Jin Qian [Tue, 3 Jan 2017 20:59:54 +0000 (20:59 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/" am:
7fe49140ef am:
a0ca66bb4d am:
c71f3b11a1
am:
9645a95660
Change-Id: I4abc9f09723ce7271ce11634e22d411c321dd2ad
Jin Qian [Tue, 3 Jan 2017 20:51:29 +0000 (20:51 +0000)]
e2fsdroid: use absolute path for product_out am:
bc02ac42b2 am:
b7a39c5443
am:
b22693a64f
Change-Id: Ia046e04ed9fce21efcc68611aad0d9d5e3888c20
Jin Qian [Tue, 3 Jan 2017 20:51:26 +0000 (20:51 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file am:
6ef6efab23 am:
4059037c17
am:
a6dc5be0ea
Change-Id: I5c9ab5d7fa00ed2fc1cc135f48a47f93dfe2d19f
Jin Qian [Tue, 3 Jan 2017 20:51:23 +0000 (20:51 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/" am:
7fe49140ef am:
a0ca66bb4d
am:
c71f3b11a1
Change-Id: Id302fde4eb450b64dcbd3ca102253613dfd5ca17
Jin Qian [Tue, 3 Jan 2017 20:43:58 +0000 (20:43 +0000)]
e2fsdroid: use absolute path for product_out am:
bc02ac42b2
am:
b7a39c5443
Change-Id: I06917969f807e283409c516e25f8643844c9c8c9
Jin Qian [Tue, 3 Jan 2017 20:43:54 +0000 (20:43 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file am:
6ef6efab23
am:
4059037c17
Change-Id: Id545cb1245532699024aee376b9c80f1d253ef2e
Jin Qian [Tue, 3 Jan 2017 20:43:52 +0000 (20:43 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/" am:
7fe49140ef
am:
a0ca66bb4d
Change-Id: I81465ccb4c3c56e8429d2cb22c9b447d74f655db
Jin Qian [Tue, 3 Jan 2017 20:35:57 +0000 (20:35 +0000)]
e2fsdroid: use absolute path for product_out
am:
bc02ac42b2
Change-Id: I81da9836e33c56d440896896ffe5519ca12ff63c
Jin Qian [Tue, 3 Jan 2017 20:35:54 +0000 (20:35 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file
am:
6ef6efab23
Change-Id: I656014574f8f3fe1441ea73bb9fa59dbeb03a522
Jin Qian [Tue, 3 Jan 2017 20:35:52 +0000 (20:35 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/"
am:
7fe49140ef
Change-Id: Ic79e0f5cb35e6611a9d4d11cfdf839aec8093033
Jin Qian [Mon, 19 Dec 2016 19:02:15 +0000 (11:02 -0800)]
e2fsdroid: use absolute path for product_out
Android build runs e2fsdroid in a tmp directory. Use absolute path
to access files in product_out.
Change-Id: Ic238d93ff68f03bd82245bda127d269972f5ef63
Jin Qian [Mon, 19 Dec 2016 18:53:20 +0000 (10:53 -0800)]
libext2fs: merge contiguous data blocks when writing to sparse file
Sparse IO manager allocates one block at a time. This creates many
blocks in sparse file even though most of them are contiguous. As a
result, fastboot is extremely slow writing that many blocks. Merging
contiguous blocks reduces block count and flash time significantly.
Change-Id: I211312d24d7423c7f160ee501fe8b62ddf14a847
Jin Qian [Thu, 15 Dec 2016 20:15:28 +0000 (12:15 -0800)]
e2fsdroid: remove extra "/" when mountpoint is "/"
Extra "/" causes problem when matching entries in fs_config.
Change-Id: Ie1659b98db3d599cdd1a832d2dfb3036d399a6e3
Elliott Hughes [Thu, 8 Dec 2016 18:44:57 +0000 (18:44 +0000)]
Merge "_GNU_SOURCE must be defined before any #include." am:
983c39cf7d am:
63c8d4c2eb am:
9f7363370e
am:
4d2230fb0c
Change-Id: Id820763421a20911774aa62682804686211fe03b
Elliott Hughes [Thu, 8 Dec 2016 17:36:45 +0000 (17:36 +0000)]
Merge "_GNU_SOURCE must be defined before any #include." am:
983c39cf7d am:
63c8d4c2eb
am:
9f7363370e
Change-Id: I4a3dad2e0c350090383ddcf0d10bb14679929446
Elliott Hughes [Thu, 8 Dec 2016 17:28:02 +0000 (17:28 +0000)]
Merge "_GNU_SOURCE must be defined before any #include." am:
983c39cf7d
am:
63c8d4c2eb
Change-Id: Ifb48d09d96f66e5daea543eca1f1bba5a6bc4894
Elliott Hughes [Thu, 8 Dec 2016 17:24:02 +0000 (17:24 +0000)]
Merge "_GNU_SOURCE must be defined before any #include."
am:
983c39cf7d
Change-Id: I5badee4a611541b0026647cd326cf4501e251462
Treehugger Robot [Thu, 8 Dec 2016 17:15:16 +0000 (17:15 +0000)]
Merge "_GNU_SOURCE must be defined before any #include."
Adrien Schildknecht [Tue, 6 Dec 2016 21:13:08 +0000 (21:13 +0000)]
Merge changes from topic 'e2fs_build' am:
f34a7af0eb am:
be957e0e0f am:
fa2d571910
am:
4f2c820856
Change-Id: I80c9da518c9faefce4c281ea4e200527a78d81f8
Adrien Schildknecht [Tue, 6 Dec 2016 21:13:06 +0000 (21:13 +0000)]
Update generated files for Android am:
b298f7e8a3 am:
1bd197eaa8 am:
156910529c
am:
f4cbb54596
Change-Id: Ibae59d8cd0d6ed7793f86fd40bd0baa818007267
Adrien Schildknecht [Tue, 6 Dec 2016 21:13:04 +0000 (21:13 +0000)]
android: libext2fs and com_err for windows am:
1538eb4c58 am:
fe9f74066f am:
43c5fa2f49
am:
3c26cf6415
Change-Id: I8ef06ebbddf99bfbeea37341b2b92be07a421c4b
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:39 +0000 (21:09 +0000)]
Merge changes from topic 'e2fs_build' am:
f34a7af0eb am:
be957e0e0f
am:
fa2d571910
Change-Id: I6969880bc02acaf716874d4e6c0f74fc03603839
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:36 +0000 (21:09 +0000)]
Update generated files for Android am:
b298f7e8a3 am:
1bd197eaa8
am:
156910529c
Change-Id: I20152643c14182c78e621dccb9c99169b5b673e8
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:34 +0000 (21:09 +0000)]
android: libext2fs and com_err for windows am:
1538eb4c58 am:
fe9f74066f
am:
43c5fa2f49
Change-Id: I8af19b5991c067ba4265ae3e4c8e6774eff234be
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:38 +0000 (21:02 +0000)]
Merge changes from topic 'e2fs_build' am:
f34a7af0eb
am:
be957e0e0f
Change-Id: Id320ac1dae351c58a683b879d85aacf62f5e20a9
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:36 +0000 (21:02 +0000)]
Update generated files for Android am:
b298f7e8a3
am:
1bd197eaa8
Change-Id: Ib5d9be6d3d95c456dd5576016717f620fa6f39c1
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:34 +0000 (21:02 +0000)]
android: libext2fs and com_err for windows am:
1538eb4c58
am:
fe9f74066f
Change-Id: I74f64502d90994afd18163e7d6b5a4e5dd9077cc
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:37 +0000 (20:59 +0000)]
Merge changes from topic 'e2fs_build'
am:
f34a7af0eb
Change-Id: I33657126afe0092195a80fc8de813bb80712b951
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:36 +0000 (20:59 +0000)]
Update generated files for Android
am:
b298f7e8a3
Change-Id: Icfe6212adbd3f90ff9970dde136166374d0f1945
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:34 +0000 (20:59 +0000)]
android: libext2fs and com_err for windows
am:
1538eb4c58
Change-Id: Icb4958aa1097d3c495d0534df2354185b1740c34
Treehugger Robot [Tue, 6 Dec 2016 20:56:53 +0000 (20:56 +0000)]
Merge changes from topic 'e2fs_build'
* changes:
Update generated files for Android
android: libext2fs and com_err for windows
Adrien Schildknecht [Fri, 2 Dec 2016 01:38:00 +0000 (17:38 -0800)]
Update generated files for Android
Test: cd external/e2fsprogs && mm
Change-Id: Iaa8ba84c55b7961947791c779d020cdb242a27fe
Adrien Schildknecht [Wed, 23 Nov 2016 18:21:42 +0000 (10:21 -0800)]
android: libext2fs and com_err for windows
Test: m libext2fs-host && m libext2_com_err-host
Change-Id: I92b6717b617a4f7f16182bf12af58cb22f20fa8f
Jin Qian [Tue, 6 Dec 2016 02:45:51 +0000 (02:45 +0000)]
Merge "Fix windows and mac build" am:
9276d7e941 am:
8ff0729e59 am:
ea593377b6
am:
9c917b107e
Change-Id: I6e5b936c83d31820730ce977ce2417c23e9104f0
Jin Qian [Tue, 6 Dec 2016 02:35:55 +0000 (02:35 +0000)]
Merge "Fix windows and mac build" am:
9276d7e941 am:
8ff0729e59
am:
ea593377b6
Change-Id: Iea939c9ba91bbe34557563c79c270b849040acdb
Jin Qian [Tue, 6 Dec 2016 02:31:57 +0000 (02:31 +0000)]
Merge "Fix windows and mac build" am:
9276d7e941
am:
8ff0729e59
Change-Id: I8ca8d09fec36ad405cfa697f222dd53888a38026
Jin Qian [Tue, 6 Dec 2016 02:28:27 +0000 (02:28 +0000)]
Merge "Fix windows and mac build"
am:
9276d7e941
Change-Id: Iaf167de42d4d907e59e01964bb9861d319515cb9
Jin Qian [Tue, 6 Dec 2016 02:19:07 +0000 (02:19 +0000)]
Merge "Fix windows and mac build"
Jin Qian [Tue, 6 Dec 2016 01:49:41 +0000 (17:49 -0800)]
Fix windows and mac build
malloc.h is not available on mac.
mntent.h and setmntent are not available on windows.
Test: cd external/e2fsprogs && mm
Change-Id: I3bc1b80156d3659f4d81975626a71f58d39ee61a
Elliott Hughes [Mon, 5 Dec 2016 23:20:44 +0000 (23:20 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am:
cf227fe795 am:
e67369eb91 am:
95460e4842
am:
b176ee9a9f
Change-Id: I6c7e8fcd44a8bc50f4b7f9cc7bdde47757cedfde
Elliott Hughes [Mon, 5 Dec 2016 23:17:13 +0000 (23:17 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am:
cf227fe795 am:
e67369eb91
am:
95460e4842
Change-Id: I0ba45dc98c047b6811c23f55e278957f29f08103
Elliott Hughes [Mon, 5 Dec 2016 23:13:14 +0000 (23:13 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am:
cf227fe795
am:
e67369eb91
Change-Id: I11ab52e83c3c30a2bfd86aa349aa76d5932ad5b5
Elliott Hughes [Mon, 5 Dec 2016 23:09:43 +0000 (23:09 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning."
am:
cf227fe795
Change-Id: I1cfc84ca959a07c6f641404c1cd88762fd00cee8
Treehugger Robot [Mon, 5 Dec 2016 23:06:52 +0000 (23:06 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning."
Elliott Hughes [Mon, 5 Dec 2016 21:33:29 +0000 (13:33 -0800)]
_GNU_SOURCE must be defined before any #include.
Fixes the "asprintf undeclared" warning in this code.
Bug: N/A
Test: builds
Change-Id: I42e1bfbdbc0391c5e5d7908204f9064ec858c84d
Elliott Hughes [Mon, 5 Dec 2016 21:29:49 +0000 (13:29 -0800)]
Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning.
We do have <mntent.h> and setmntent(3).
Also silence unused parameter warnings; C programmers don't care, so
upstream is unlikely to fix that.
Bug: N/A
Test: builds
Change-Id: I57db0cca68a617913e21c2ef7b6613cd1183d7c5
Jin Qian [Sat, 3 Dec 2016 04:19:58 +0000 (04:19 +0000)]
Manually merge commit '
398e284' into stage-aosp-master am:
e591ad15a0 am:
f39613a549
am:
24ee1d285e
Change-Id: I96e75e1cb394d2356fda0d6faf1b5e9962094ef8
Jin Qian [Sat, 3 Dec 2016 04:15:04 +0000 (04:15 +0000)]
Manually merge commit '
398e284' into stage-aosp-master am:
e591ad15a0
am:
f39613a549
Change-Id: I85e3ea26f9406a8852a2160a9ddcd761c1ac4ac2
Jin Qian [Sat, 3 Dec 2016 04:12:56 +0000 (04:12 +0000)]
Manually merge commit '
398e284' into stage-aosp-master
am:
e591ad15a0
Change-Id: Ic77a720ab6e9c335d67887641a80562ac95b3f42
The Android Automerger [Sat, 3 Dec 2016 04:06:47 +0000 (04:06 +0000)]
Manually merge commit '
398e284' into stage-aosp-master
* commit '
398e284':
Revert "Update generated files for Android"
Revert "android: libext2fs and com_err for windows"
Update generated files for Android
android: libext2fs and com_err for windows
android: add the ext2simg tool
android: add rules to build the static host libraries
e2fsdroid: create incremental images
e2fsdroid: read and enforce android's permissions
e2fsdroid: add an option to generate a base_fs file
e2fsdroid: a tool to create android compatible image
misc: add callbacks to populate_fs
libext2fs: add context to get_alloc_block
libext2fs: android sparse io manager
BUG:
33304034
Jin Qian [Sat, 3 Dec 2016 01:56:45 +0000 (01:56 +0000)]
Merge "Revert "Update generated files for Android""
Adrien Schildknecht [Sat, 3 Dec 2016 01:54:12 +0000 (01:54 +0000)]
Revert "Update generated files for Android"
This reverts commit
acf268bf6626ac8874816cd79b323a17648ad1e6.
Change-Id: I0268f1c2ad50304674d61b41410ca75a262f00a8
Ruchi Kandoi [Sat, 3 Dec 2016 00:43:22 +0000 (00:43 +0000)]
Merge "Revert "android: libext2fs and com_err for windows""
Adrien Schildknecht [Sat, 3 Dec 2016 00:37:00 +0000 (00:37 +0000)]
Revert "android: libext2fs and com_err for windows"
This reverts commit
7661be3a951d60f9181ab57011bfbe7e5ab5c80c.
Change-Id: I3eea5045606d15941ad3a0518292eaf8be801001
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge changes from topic 'e2fsprogs'
* changes:
Update generated files for Android
android: add the ext2simg tool
e2fsdroid: create incremental images
e2fsdroid: read and enforce android's permissions
e2fsdroid: add an option to generate a base_fs file
e2fsdroid: a tool to create android compatible image
misc: add callbacks to populate_fs
android: libext2fs and com_err for windows
android: add rules to build the static host libraries
libext2fs: add context to get_alloc_block
libext2fs: android sparse io manager
Adrien Schildknecht [Fri, 2 Dec 2016 01:38:00 +0000 (17:38 -0800)]
Update generated files for Android
Test: cd external/e2fsprogs && mm
Change-Id: I2013e511f72532db1c2c4961cd4e6199b8225347
Adrien Schildknecht [Wed, 23 Nov 2016 18:21:42 +0000 (10:21 -0800)]
android: libext2fs and com_err for windows
Test: m libext2fs-host && m libext2_com_err-host
Change-Id: Id4ad914f86c92ebe4e4b0fb14a75ccb88189daba
Adrien Schildknecht [Thu, 1 Dec 2016 23:05:06 +0000 (15:05 -0800)]
android: add the ext2simg tool
This tool converts ext images to android sparse images.
Test: ext2simg img.ext4 img.sparse
simg2img img.sparse img2.ext4
e2fsck -f img.ext; e2fsck -f img2.ext
cmp img{,2}.ext
Change-Id: I7ec6f126160dacafb0946ba99f07d4bb42a19c45
Adrien Schildknecht [Wed, 23 Nov 2016 08:46:47 +0000 (00:46 -0800)]
android: add rules to build the static host libraries
Test: m libext2fs-host
Change-Id: I0f8155bc37516a59cf0ae1545ba37d52025f7a36
Adrien Schildknecht [Wed, 30 Nov 2016 06:15:18 +0000 (22:15 -0800)]
e2fsdroid: create incremental images
Add an option to read a base_fs file and allocate the blocks according
to the mapping provided by the file.
Test: 1/ Create a normal image and an incremental one.
Compare the number of blocks that have changed.
2/ Create an image.
Create an incremantal image.
The basefs file and the block_list file are the same.
Change-Id: Ie000ca48cf000d95e7a45a9752699abfc7484b6c
Adrien Schildknecht [Wed, 30 Nov 2016 06:01:52 +0000 (22:01 -0800)]
e2fsdroid: read and enforce android's permissions
Set the permissions and the extended attributes as defined by fs_config
and selinux.
Test: create an image with make_ext4 and with mke2fs + e2fsdroid
Compare the output of:
for f in `find . | sort`; do
xattr -l "$f"; md5sum "$f" ls -lah "$f"
done
Change-Id: I64c97f81c7f5e2bcf3cee3431e410d064cf0735a
Adrien Schildknecht [Wed, 30 Nov 2016 05:45:03 +0000 (21:45 -0800)]
e2fsdroid: add an option to generate a base_fs file
Test: make_ext4 and e2fsdroid both generate the same list of file.
Change-Id: Idaf42b64b588824d453bc204562ccbe702de26a9
Adrien Schildknecht [Wed, 30 Nov 2016 05:36:43 +0000 (21:36 -0800)]
e2fsdroid: a tool to create android compatible image
Add an option to generate a block_list file from an existing ext4 or sparse
image.
Test: make_ext4 and e2fsdroid both generate the same list of file.
Change-Id: I5ecc6521797397102904bf510c283dfd50a72721
Adrien Schildknecht [Wed, 30 Nov 2016 05:20:29 +0000 (21:20 -0800)]
misc: add callbacks to populate_fs
This patch let the caller of populate_fs registers a set of callbacks that
will be called everytime an inode is created.
Test: mm
Change-Id: I28ae100c4cc81223192860c29366cbac3077fe21
Adrien Schildknecht [Wed, 23 Nov 2016 21:02:16 +0000 (13:02 -0800)]
libext2fs: add context to get_alloc_block
This patch add some contexts to the allocator about the block that is about
to be allocated.
The custom Android block allocator need a way to differentiate data block
and metadata block.
Test: cd external/e2fsprogs/lib && mma
Change-Id: I2899936a3a0043d26e062bf1e542483e9a6ac98f
Adrien Schildknecht [Fri, 11 Nov 2016 06:34:32 +0000 (22:34 -0800)]
libext2fs: android sparse io manager
Add a new io manager to directly output sparse images.
Test: mke2fs [...] -E sparse_file;
simg2img system.img system.ext4;
e2fsck system.ext4
Change-Id: I41cf8c1b33d359be4f104e03fb4041863214843c
Colin Cross [Sat, 22 Oct 2016 08:04:46 +0000 (08:04 +0000)]
Merge "Fix mac build" am:
058a64acf5 am:
c53581aea3
am:
a378587bcf
Change-Id: Ifd03b3bd71a554951155164fe8779b06ad72fc02
Colin Cross [Sat, 22 Oct 2016 08:01:46 +0000 (08:01 +0000)]
Merge "Fix mac build" am:
058a64acf5
am:
c53581aea3
Change-Id: Ic1df5a1e79e80a1db12a1775bf0977a0b03d4a49
Colin Cross [Sat, 22 Oct 2016 07:59:41 +0000 (07:59 +0000)]
Merge "Fix mac build"
am:
058a64acf5
Change-Id: Ia689c74ddf1eddb303194b7816f4bfd0956425ca
Treehugger Robot [Sat, 22 Oct 2016 07:54:41 +0000 (07:54 +0000)]
Merge "Fix mac build"
Colin Cross [Sat, 22 Oct 2016 06:13:42 +0000 (23:13 -0700)]
Fix mac build
Disable building debugfs and e4crypt on mac.
Add missing time.h include in ext2fs.h for time_t.
Test: mma -j
Change-Id: Iac9e09370eb45942c29ff8e3dc87a2ca4fec4981
Colin Cross [Sat, 22 Oct 2016 02:50:59 +0000 (02:50 +0000)]
Merge "Fix mac build" am:
dbd75ccf14 am:
a9b8ac8699
am:
2543f91cde
Change-Id: I639eb375e6f98efcafa425715c4d2408a4706260
Colin Cross [Sat, 22 Oct 2016 02:48:28 +0000 (02:48 +0000)]
Merge "Fix mac build" am:
dbd75ccf14
am:
a9b8ac8699
Change-Id: Ie8f1679ffd5124a28a7bdcef6ea15eb29423641d
Colin Cross [Sat, 22 Oct 2016 02:45:28 +0000 (02:45 +0000)]
Merge "Fix mac build"
am:
dbd75ccf14
Change-Id: Iffa545bd6010f5a77f5234e72355337566724e02
Treehugger Robot [Sat, 22 Oct 2016 02:40:39 +0000 (02:40 +0000)]
Merge "Fix mac build"
Colin Cross [Fri, 21 Oct 2016 23:41:10 +0000 (16:41 -0700)]
Fix mac build
Disable linux-only features in config.h
Fix one use of ino_t instead of ext2_ino_t.
Test: mma -j
Test: e2fsck -f -n $OUT/system.img
Bug:
27599744
Change-Id: I3291ae888ac28a49813365ab2431a3c266de9907
Jeff Sharkey [Fri, 21 Oct 2016 22:03:32 +0000 (22:03 +0000)]
Merge changes from topic 'e2up' am:
c5804e7277 am:
46138188e6
am:
055de5356a
Change-Id: I743338e8dbb4fec9451ae02b1423f40944edf683
Jeff Sharkey [Fri, 21 Oct 2016 22:03:30 +0000 (22:03 +0000)]
Bring back libext2_profile build rules. am:
80fcd5bb6d am:
437ede94b1
am:
5977dfa1e0
Change-Id: I9f3bdb1a74460a8d81df16db7d1d1a1b1e747931
Jeff Sharkey [Fri, 21 Oct 2016 22:03:28 +0000 (22:03 +0000)]
Update generated files for Android am:
0ce8844d68 am:
289d3e8aee
am:
b7ea54795d
Change-Id: I9487d86c0d6d5e2a89deff070ca34ed2407a8393
Jeff Sharkey [Fri, 21 Oct 2016 22:03:24 +0000 (22:03 +0000)]
Upgrade e2fsprogs to v1.43.3. am:
fbdfa0b41c am:
1c2cabf90d
am:
9ca5166c26
Change-Id: I0f8e8359dd95e4a850e58211da2f60815689dd64
Jeff Sharkey [Fri, 21 Oct 2016 22:00:49 +0000 (22:00 +0000)]
Merge changes from topic 'e2up' am:
c5804e7277
am:
46138188e6
Change-Id: Ided12d7eb0b82085de497238974c90d22c4fd811
Jeff Sharkey [Fri, 21 Oct 2016 22:00:46 +0000 (22:00 +0000)]
Bring back libext2_profile build rules. am:
80fcd5bb6d
am:
437ede94b1
Change-Id: I9c81cd214e93b7979417913481902fadce980c7f
Jeff Sharkey [Fri, 21 Oct 2016 22:00:44 +0000 (22:00 +0000)]
Update generated files for Android am:
0ce8844d68
am:
289d3e8aee
Change-Id: I75f7c551417e54b4a5253dddf85b1c146ca73b4a
Jeff Sharkey [Fri, 21 Oct 2016 22:00:41 +0000 (22:00 +0000)]
Upgrade e2fsprogs to v1.43.3. am:
fbdfa0b41c
am:
1c2cabf90d
Change-Id: Ib3609db26f851ae41865c57110e617efe5ec9739
Jeff Sharkey [Fri, 21 Oct 2016 21:58:18 +0000 (21:58 +0000)]
Merge changes from topic 'e2up'
am:
c5804e7277
Change-Id: I123aa8d38314241469af6c6cbc711334c0466f09
Jeff Sharkey [Fri, 21 Oct 2016 21:58:17 +0000 (21:58 +0000)]
Bring back libext2_profile build rules.
am:
80fcd5bb6d
Change-Id: I63e91a9cd7e4c0e2dd9ca03e1b98cdeee60675f7
Jeff Sharkey [Fri, 21 Oct 2016 21:58:14 +0000 (21:58 +0000)]
Update generated files for Android
am:
0ce8844d68
Change-Id: I2bbc70fecc471012b51c7aa3383d59f68c36b9a0
Jeff Sharkey [Fri, 21 Oct 2016 21:58:12 +0000 (21:58 +0000)]
Upgrade e2fsprogs to v1.43.3.
am:
fbdfa0b41c
Change-Id: I215f11d6d766f1957a65511b1b45de62ff1cfb02
Jeff Sharkey [Fri, 21 Oct 2016 21:51:58 +0000 (21:51 +0000)]
Merge changes from topic 'e2up'
* changes:
Bring back libext2_profile build rules.
Update generated files for Android
Upgrade e2fsprogs to v1.43.3.
Jeff Sharkey [Fri, 21 Oct 2016 18:44:14 +0000 (12:44 -0600)]
Bring back libext2_profile build rules.
Test: build, flash, run e2fsck
Bug:
27599744
Change-Id: I9445fc35b1c7d2ea915796781f6639b7f4446e5b
Jeff Sharkey [Fri, 21 Oct 2016 16:42:41 +0000 (10:42 -0600)]
Update generated files for Android
Test: build, flash, run e2fsck
Bug:
27599744
Change-Id: I08a4bb699ae781ba0a368ffac120194b87219c30
Jeff Sharkey [Fri, 21 Oct 2016 16:38:05 +0000 (10:38 -0600)]
Upgrade e2fsprogs to v1.43.3.
This is the latest tagged upstream version, and includes both
security fixes and new features.
$ repo start oct21e .
$ git merge -s ours
2cbf2dae0e542a436cf535dfbc7a8182cb580e86
$ git checkout --detach
2cbf2dae0e542a436cf535dfbc7a8182cb580e86
$ git reset --soft oct21e
$ git checkout oct21e
$ git commit --amend -C HEAD
Test: build, flash, run e2fsck
Bug:
27599744
Change-Id: I42756991c23f56203e3c35913541f19bb05bcfde
Theodore Ts'o [Mon, 5 Sep 2016 01:31:21 +0000 (21:31 -0400)]
Update release notes, etc., for 1.43.3 release
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Theodore Ts'o [Sun, 4 Sep 2016 21:31:07 +0000 (17:31 -0400)]
e2fsck: enforce that the extra isize fields in the superblock are sane
Invalid extra isize fields can cause crashes in e2fsprogs and possibly
in the kernel for some architectures due to unaligned accesses.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Theodore Ts'o [Sun, 4 Sep 2016 20:29:12 +0000 (16:29 -0400)]
e2fsck: enforce that extra_isize must be a multiple of four
We need to prevent unaligned accesses, so treat any extra_isize which
is not a multiple of four as an bug.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Theodore Ts'o [Sun, 4 Sep 2016 19:06:32 +0000 (15:06 -0400)]
Avoid crashing on unaligned pointers from corrupted file systems
On platforms that don't permit unaligned pointer dereferences,
corrupted file systems will as used by the regression test suite can
cause e2fsck and debugfs to crash. Avoid those crashes caused by
corrupted file systems. With this commit the full set of regression
test suites will pass on the sparc64 platform.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Theodore Ts'o [Sun, 4 Sep 2016 04:16:35 +0000 (00:16 -0400)]
Fix FreeBSD pmake support
Fix a typo in the @ifNotGNUmake@ case of MCONFIG.in.
Also allow the FORCE_NATIVE_MAKE to force the use of the non-GNU make
optimized Makefile. The resulting makefile will work with GNU Make
4.2.1, although "make V=1" won't be honored.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Theodore Ts'o [Sun, 4 Sep 2016 03:33:11 +0000 (23:33 -0400)]
e2fsck: fix timestamps logic for 32-bit systems
Commit
35a4e1b1c5cbb introduced a regression which caused e2fsck on
32-bit systems to think all timestamps were legacy pre-1970
timestamps. Fix the bug.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
OSDN Git Service
