OSDN Git Service
Jin Qian [Tue, 1 Aug 2017 22:54:01 +0000 (22:54 +0000)]
build static version of mke2fs and e2fsdroid for host
am:
06bad82b60
Change-Id: I61e7a10eda490697f8cf21c9c6ae0c09ff76c38b
Jin Qian [Wed, 12 Jul 2017 20:29:38 +0000 (13:29 -0700)]
build static version of mke2fs and e2fsdroid for host
Statically link those two binaries for host build so that we can
package them with fastboot without including other library files.
Bug:
35219933
Change-Id: Ic4762ba5eda8ac61723a2c4137690d12a0aa57f2
(cherry picked from commit
42297fb01aa2a49ead938c1d24868941a39fd434)
(cherry picked from commit
2967b43fd18e5db50a93bb0a290141c66351427c)
TreeHugger Robot [Tue, 18 Jul 2017 20:36:26 +0000 (20:36 +0000)]
Merge "build static version of mke2fs and e2fsdroid for host"
Jin Qian [Wed, 12 Jul 2017 20:29:38 +0000 (13:29 -0700)]
build static version of mke2fs and e2fsdroid for host
Statically link those two binaries for host build so that we can
package them with fastboot without including other library files.
Bug:
35219933
Change-Id: Ic4762ba5eda8ac61723a2c4137690d12a0aa57f2
Jeff Sharkey [Mon, 10 Jul 2017 19:55:58 +0000 (19:55 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6 am:
68acc00e57 am:
4ef0afa563
am:
9abc85f05b
Change-Id: Iaf63db082453bebed08e364abe9c657bad7d4a41
Jeff Sharkey [Mon, 10 Jul 2017 19:51:58 +0000 (19:51 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6 am:
68acc00e57
am:
4ef0afa563
Change-Id: Ibfaba811291cce3bed86a812d403cf1f598a1cf8
Jeff Sharkey [Mon, 10 Jul 2017 19:47:57 +0000 (19:47 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6
am:
68acc00e57
Change-Id: Id7f4617e1695fc74f98da60d389adb747ab137d5
Jeff Sharkey [Mon, 10 Jul 2017 19:43:59 +0000 (19:43 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot."
am:
6eac3894a6
Change-Id: Ie0d9db21e79dad3ab6904b8934ea7facfeab3eff
Jeff Sharkey [Mon, 10 Jul 2017 19:34:11 +0000 (19:34 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot."
Android Build Merger (Role) [Thu, 6 Jul 2017 16:33:28 +0000 (16:33 +0000)]
Merge "Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp am:
bedbcad1de -s ours"
Jin Qian [Thu, 6 Jul 2017 16:33:14 +0000 (16:33 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
am:
bedbcad1de -s ours
Change-Id: Ia04208edf12ab5c6f6af09357d8be4545125fad5
Jin Qian [Thu, 6 Jul 2017 16:32:47 +0000 (16:32 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
am:
bedbcad1de -s ours
Change-Id: I1c33bc2650c4122ea7b0cc963a5558257433c6aa
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:43 +0000 (16:15 +0000)]
Merge "e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036 am:
58dd122671 -s ours"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)]
Merge changes from topic 'am-
02585df899244ddfb0b2ea27e62c017d'
* changes:
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036 am:
3ac608fd1b -s ours
Require mke2fs.conf when building mke2fs am:
778eaa84a0 am:
6243f2136f -s ours
Jin Qian [Thu, 6 Jul 2017 16:14:11 +0000 (16:14 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
58dd122671 -s ours
Change-Id: I859d0897f1fadd9e4357d2d7bb9a9e55f3746a89
Jin Qian [Thu, 6 Jul 2017 16:13:55 +0000 (16:13 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
3ac608fd1b -s ours
Change-Id: Ia3759f195c9c9df03dc86362327c078aadea6c28
Jin Qian [Thu, 6 Jul 2017 16:13:51 +0000 (16:13 +0000)]
Require mke2fs.conf when building mke2fs am:
778eaa84a0
am:
6243f2136f -s ours
Change-Id: I1a1d30259e12ef267d8a26c092aa4ead12bfe7b2
Jin Qian [Thu, 6 Jul 2017 16:12:04 +0000 (16:12 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
3ac608fd1b -s ours
Change-Id: Ia6535f6a8ba375bab3feea79342957e61503c677
Jin Qian [Thu, 6 Jul 2017 16:12:01 +0000 (16:12 +0000)]
Require mke2fs.conf when building mke2fs am:
778eaa84a0
am:
6243f2136f -s ours
Change-Id: I13166000fc980e1925c7f61bf9358128fbd1229d
Android Build Merger (Role) [Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
* changes:
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
Require mke2fs.conf when building mke2fs am:
778eaa84a0
Jin Qian [Thu, 6 Jul 2017 16:06:28 +0000 (16:06 +0000)]
e2fsdroid: use libselinux function to read file context on device
am:
2fff6fb036
Change-Id: I2a698ff8aa6ae1684b9634deb082bf7e1d32f490
Jin Qian [Thu, 6 Jul 2017 16:06:24 +0000 (16:06 +0000)]
Require mke2fs.conf when building mke2fs
am:
778eaa84a0
Change-Id: I945f211ccdf1bf111edab2717606c2379bd9c936
Jin Qian [Thu, 6 Jul 2017 16:06:07 +0000 (16:06 +0000)]
e2fsdroid: use libselinux function to read file context on device
am:
2fff6fb036
Change-Id: I2dd7351c28c20239e70796ce04eddf838587a08e
Jin Qian [Thu, 6 Jul 2017 16:06:02 +0000 (16:06 +0000)]
Require mke2fs.conf when building mke2fs
am:
778eaa84a0
Change-Id: I579087da2b2ce0f41ccb1581ade77b55cc23a039
Jin Qian [Wed, 5 Jul 2017 22:47:29 +0000 (22:47 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d" into oc-dr1-dev-plus-aosp
am:
1d718f1426 -s ours
Change-Id: I5733477e77b216072c1d38bea82578da7ecadcec
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:57 +0000 (22:46 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
82f83c86fa -s ours"
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:51 +0000 (22:46 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
82f83c86fa -s ours"
Jin Qian [Wed, 5 Jul 2017 22:45:43 +0000 (22:45 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
82f83c86fa -s ours
Change-Id: Iea72db3a67695ddb1b82b45c897e21190d974476
Jin Qian [Wed, 5 Jul 2017 22:45:37 +0000 (22:45 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
82f83c86fa -s ours
Change-Id: I81e457f78d718523fd83bb37e87f99c3b39e6d0e
Android Build Merger (Role) [Wed, 5 Jul 2017 22:45:11 +0000 (22:45 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
6ba274bec2 -s ours"
Jin Qian [Wed, 5 Jul 2017 22:44:05 +0000 (22:44 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
6ba274bec2 -s ours
Change-Id: I07609c788549125c39060f48c88738ccdddcecd6
Jin Qian [Wed, 5 Jul 2017 22:43:58 +0000 (22:43 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
6ba274bec2 -s ours
Change-Id: I76200dfbff8b4a3d826636360ff22943298c2654
Android Build Merger (Role) [Wed, 5 Jul 2017 22:41:55 +0000 (22:41 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d" into oc-dr1-dev-plus-aosp
Jin Qian [Wed, 5 Jul 2017 22:40:48 +0000 (22:40 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode
am:
05a31e2c5d
Change-Id: I25be6080b9d75f6205e69f14c87a98ab8bc11732
Jin Qian [Wed, 5 Jul 2017 22:40:29 +0000 (22:40 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode
am:
05a31e2c5d
Change-Id: I0f233278ba6f45003b77a0bb040a0c208ff4dd09
Jin Qian [Tue, 20 Jun 2017 20:49:53 +0000 (13:49 -0700)]
e2fsdroid: use libselinux function to read file context on device
When e2fsdroid runs on device, location of selinux file contexts
should be determined by libselinux instead of using arbitrary paths.
Bug:
35219933
Change-Id: I413b198422eddb212599498b532ba2c4d8bb36c6
Merged-In: I413b198422eddb212599498b532ba2c4d8bb36c6
Jin Qian [Wed, 7 Jun 2017 19:39:18 +0000 (12:39 -0700)]
Require mke2fs.conf when building mke2fs
make sure mke2fs.conf is copied to /etc so that mke2fs can find it
when running on device.
Bug:
35219933
Change-Id: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Merged-In: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Jin Qian [Fri, 9 Jun 2017 19:37:27 +0000 (12:37 -0700)]
build mke2fs and e2fsdroid as static executables for recovery mode
Bug:
35219933
Change-Id: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
Merged-In: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
liminghao [Mon, 10 Apr 2017 01:48:51 +0000 (09:48 +0800)]
blkid: Resolve to the exFAT uuid change on reboot.
The volume_serial into exFAT super block is uuid but
not standard uuid, it's just volume serial number.
Change-Id: I376ed9fe1ba1b7f3d367d78cc5e2bb8ea9cc2d13
Signed-off-by: liminghao <liminghao@xiaomi.com>
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:56:02 +0000 (07:56 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63 am:
22a19631dd am:
6e2cbd8ecd
am:
a7f19f9fa8
Change-Id: Ibc1455a417bcf4c81b8185502507a2667fdaaf8d
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:54:00 +0000 (07:54 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63 am:
22a19631dd
am:
6e2cbd8ecd
Change-Id: Ib9a8d1f77f88262be6f2623484f278cb2526062f
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:51:29 +0000 (07:51 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63
am:
22a19631dd
Change-Id: Iad9e424fd98270330d33edac17eddbdb9b42ffad
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:49:00 +0000 (07:49 +0000)]
Merge "Add OWNERS in external/e2fsprogs"
am:
7975672f63
Change-Id: I7bc8a819f7ab8c153c37b38b31019e09363c6080
Treehugger Robot [Wed, 21 Jun 2017 07:43:36 +0000 (07:43 +0000)]
Merge "Add OWNERS in external/e2fsprogs"
TreeHugger Robot [Wed, 21 Jun 2017 04:36:48 +0000 (04:36 +0000)]
Merge changes from topic 'e2fs_fsmgr'
* changes:
e2fsdroid: use libselinux function to read file context on device
Require mke2fs.conf when building mke2fs
Jin Qian [Tue, 20 Jun 2017 20:49:53 +0000 (13:49 -0700)]
e2fsdroid: use libselinux function to read file context on device
When e2fsdroid runs on device, location of selinux file contexts
should be determined by libselinux instead of using arbitrary paths.
Bug:
35219933
Change-Id: I413b198422eddb212599498b532ba2c4d8bb36c6
Martijn Coenen [Tue, 20 Jun 2017 02:22:40 +0000 (02:22 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119 am:
877324d98b am:
97b32319c0
am:
4df6170ff2
Change-Id: Ib16d92d1baa03e2e350e1e1dc6a6539fe839f8cf
Martijn Coenen [Tue, 20 Jun 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119 am:
877324d98b
am:
97b32319c0
Change-Id: I6e464baf2dec2c360f7195d53bb389da3fd9a963
Martijn Coenen [Tue, 20 Jun 2017 02:16:39 +0000 (02:16 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119
am:
877324d98b
Change-Id: I873ac41fd7e2b964b8cdf5cab83acbe377df5681
Martijn Coenen [Tue, 20 Jun 2017 02:15:09 +0000 (02:15 +0000)]
Merge "Revert "Mark e2fs libs vendor_available.""
am:
c91060c119
Change-Id: I887d4f8f9f476373d07f4846fb3945c00aa076e6
Treehugger Robot [Tue, 20 Jun 2017 02:12:12 +0000 (02:12 +0000)]
Merge "Revert "Mark e2fs libs vendor_available.""
Martijn Coenen [Tue, 20 Jun 2017 00:18:32 +0000 (00:18 +0000)]
Revert "Mark e2fs libs vendor_available." am:
43eff9d5fe
am:
88a3b953a2
Change-Id: I23d5e408b5f102e23673ff8448753682b38c8ebf
Martijn Coenen [Tue, 20 Jun 2017 00:12:14 +0000 (00:12 +0000)]
Revert "Mark e2fs libs vendor_available."
am:
43eff9d5fe
Change-Id: I9da9eec6b55aa00fe3d9fa84beffa09db9675127
Martijn Coenen [Wed, 7 Jun 2017 22:02:40 +0000 (15:02 -0700)]
Revert "Mark e2fs libs vendor_available."
Test: builds
Bug:
38244611
This reverts commit
611bef8fda6b295e20fa1a6649ddd427160b3491.
Merged-In: I9e4e31805323ca682b999ed7c2fc4aeed1ea58a0
Change-Id: I00bcba565f3b8a67cac1d82ade7e5fa474613c0b
Jin Qian [Wed, 7 Jun 2017 19:39:18 +0000 (12:39 -0700)]
Require mke2fs.conf when building mke2fs
make sure mke2fs.conf is copied to /etc so that mke2fs can find it
when running on device.
Bug:
35219933
Change-Id: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Jin Qian [Fri, 9 Jun 2017 19:37:27 +0000 (12:37 -0700)]
build mke2fs and e2fsdroid as static executables for recovery mode
Bug:
35219933
Change-Id: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
Chih-Hung Hsieh [Fri, 16 Jun 2017 22:55:14 +0000 (15:55 -0700)]
Add OWNERS in external/e2fsprogs
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9dd4696970b36c2b55fcfc2ec22431cb6aa46e5b
Martijn Coenen [Thu, 8 Jun 2017 00:18:44 +0000 (17:18 -0700)]
Revert "Mark e2fs libs vendor_available."
This reverts commit
611bef8fda6b295e20fa1a6649ddd427160b3491.
Test: mma -j32
Jayant Chowdhary [Thu, 25 May 2017 17:37:16 +0000 (17:37 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf am:
88cef96f45 am:
1d79e6fd74
am:
5e3717a438
Change-Id: Ic055fa473bb01c0c6ce59b0931b19c9bc57700c1
Jayant Chowdhary [Thu, 25 May 2017 17:28:17 +0000 (17:28 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf am:
88cef96f45
am:
1d79e6fd74
Change-Id: I8cfb004b3a0bbac80af26d8dcac6e2801b1bd709
Jayant Chowdhary [Thu, 25 May 2017 17:22:44 +0000 (17:22 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf
am:
88cef96f45
Change-Id: Iecd2b721cbe30f2a756ca8d3a98cfde7a55ac222
Jayant Chowdhary [Thu, 25 May 2017 17:16:51 +0000 (17:16 +0000)]
Merge "Mark e2fs libs vendor_available."
am:
e653ff4eaf
Change-Id: I3c679d7306e5709ca7b72ee4c5ecb68f17977cd2
Jayant Chowdhary [Thu, 25 May 2017 17:08:38 +0000 (17:08 +0000)]
Merge "Mark e2fs libs vendor_available."
Jayant Chowdhary [Wed, 17 May 2017 20:49:26 +0000 (13:49 -0700)]
Mark e2fs libs vendor_available.
libext2_blkid, libext2_com_err, libext2_e2p, libext2_uuid are libraries which
belong to vndk-cap. Mark them vendor_available to enable vndk abi stability
checks on them.
Details: https://android-review.googlesource.com/368372
Test: mm -j64
Bug:
38244611
Change-Id: I1931063b88b845a9a9d06188555c34f1fbc3e369
Elliott Hughes [Wed, 24 May 2017 00:35:47 +0000 (00:35 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601 am:
656008e0d4 am:
4f8e794825
am:
e58dc46380
Change-Id: I08d292ece8442f05749adce9b765fe2a1853ac7e
Elliott Hughes [Wed, 24 May 2017 00:33:47 +0000 (00:33 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601 am:
656008e0d4
am:
4f8e794825
Change-Id: I789466536d74d319b31549baafae0e06c798731e
Elliott Hughes [Wed, 24 May 2017 00:30:46 +0000 (00:30 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601
am:
656008e0d4
Change-Id: I9a3993b3ac793479410132d0e3bd17d14804248f
Elliott Hughes [Wed, 24 May 2017 00:28:47 +0000 (00:28 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android."
am:
9b9a786601
Change-Id: If88a981783f2e1ce7a6714a19738a585dafda5b6
Treehugger Robot [Wed, 24 May 2017 00:23:16 +0000 (00:23 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android."
Elliott Hughes [Fri, 19 May 2017 19:56:36 +0000 (19:56 +0000)]
Merge "include sys/sysmacros.h as needed" am:
105f5ecfd8 am:
9e0e531734 am:
01b3b9a574
am:
14a94052fd
Change-Id: I05286de7d243823d9cb7455ce98d3bd5b465a1d9
Elliott Hughes [Fri, 19 May 2017 19:54:36 +0000 (19:54 +0000)]
Merge "include sys/sysmacros.h as needed" am:
105f5ecfd8 am:
9e0e531734
am:
01b3b9a574
Change-Id: I0908520a62978609982d096ba0b30a74b589ad18
Elliott Hughes [Fri, 19 May 2017 19:53:06 +0000 (19:53 +0000)]
Merge "include sys/sysmacros.h as needed" am:
105f5ecfd8
am:
9e0e531734
Change-Id: I948773bb1b8c30342f089430b0a9f42c6a002eb0
Elliott Hughes [Fri, 19 May 2017 19:51:12 +0000 (19:51 +0000)]
Merge "include sys/sysmacros.h as needed"
am:
105f5ecfd8
Change-Id: I6e81118e4cb3c6a34752567d6c036c90820c884d
Elliott Hughes [Fri, 19 May 2017 19:49:54 +0000 (12:49 -0700)]
Define HAVE_SYS_SYSMACROS_H for Android.
Also remove a duplicate copy of misc/create_inode.c that isn't upstream.
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: Ibc475c82aa21f063673cb68bcf6e41ad9d821cd3
Elliott Hughes [Fri, 19 May 2017 19:47:22 +0000 (19:47 +0000)]
Merge "include sys/sysmacros.h as needed"
Mike Frysinger [Fri, 19 May 2017 17:25:59 +0000 (13:25 -0400)]
include sys/sysmacros.h as needed
The minor/major/makedev macros are not entirely standard. glibc has had
the definitions in sys/sysmacros.h since the start, and wants to move away
from always defining them implicitly via sys/types.h (as this pollutes the
namespace in violation of POSIX). Other C libraries have already dropped
them. Since the configure script already checks for this header, use that
to pull in the header in files that use these macros.
Change-Id: Ib7f441fe168c2ca72a274978fea422a0c3010e4f
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Jin Qian [Wed, 3 May 2017 23:56:29 +0000 (23:56 +0000)]
Merge "e2fsdroid: skip setting timestamp if src_dir is null" am:
930bc06448 am:
0b69bcaa40 am:
d984ad62fc
am:
2e3b787c06
Change-Id: I29891f1fb080dde06d754a8a5a5e8a656f367bac
Jin Qian [Wed, 3 May 2017 23:41:06 +0000 (23:41 +0000)]
Merge "e2fsdroid: skip setting timestamp if src_dir is null" am:
930bc06448 am:
0b69bcaa40
am:
d984ad62fc
Change-Id: I4859ca06cbb6930a77d0d4e5f8bd6186116aa628
Jin Qian [Wed, 3 May 2017 23:38:36 +0000 (23:38 +0000)]
Merge "e2fsdroid: skip setting timestamp if src_dir is null" am:
930bc06448
am:
0b69bcaa40
Change-Id: I80400e2b51b0b1f849cf72cb1fb6cfa83fec9ba6
Jin Qian [Wed, 3 May 2017 23:36:05 +0000 (23:36 +0000)]
Merge "e2fsdroid: skip setting timestamp if src_dir is null"
am:
930bc06448
Change-Id: Ied1e99d9729711e5b27ee690c2fff68243050fa7
Treehugger Robot [Wed, 3 May 2017 23:26:24 +0000 (23:26 +0000)]
Merge "e2fsdroid: skip setting timestamp if src_dir is null"
Jin Qian [Tue, 2 May 2017 20:20:27 +0000 (13:20 -0700)]
e2fsdroid: skip setting timestamp if src_dir is null
fs_mgr formats /data without src_dir.
Test: zero-out first 4096 bytes on /data partition and reboot
Bug:
35219933
Change-Id: I12f1eb1002fd96d18fc7a9ae5a529f673eb57273
Jin Qian [Wed, 3 May 2017 01:53:00 +0000 (01:53 +0000)]
Merge "e2fsdroid: support multiple selinux file contexts" am:
9b2f003f09 am:
42c649def2 am:
f1130df245
am:
2d54abec6f
Change-Id: Idf9b9356482c9185f79a9b4d284c37694b6e384c
Jin Qian [Wed, 3 May 2017 01:47:28 +0000 (01:47 +0000)]
Merge "e2fsdroid: support multiple selinux file contexts" am:
9b2f003f09 am:
42c649def2
am:
f1130df245
Change-Id: I77ec6074e86bd23692571365aafbf8dd9b817e3c
Jin Qian [Wed, 3 May 2017 01:41:40 +0000 (01:41 +0000)]
Merge "e2fsdroid: support multiple selinux file contexts" am:
9b2f003f09
am:
42c649def2
Change-Id: Ia276f1f7f87037fb4c61b53ba60cb5151fd1cc1d
Jin Qian [Wed, 3 May 2017 01:38:40 +0000 (01:38 +0000)]
Merge "e2fsdroid: support multiple selinux file contexts"
am:
9b2f003f09
Change-Id: Ic6344d8cc308a1ea35b095e5275c394133cd99a4
Treehugger Robot [Wed, 3 May 2017 01:31:26 +0000 (01:31 +0000)]
Merge "e2fsdroid: support multiple selinux file contexts"
Jin Qian [Fri, 21 Apr 2017 23:29:07 +0000 (16:29 -0700)]
e2fsdroid: support multiple selinux file contexts
Support passing a string of multiple selinux file contexts separated by
comma with -S option.
E.g. e2fsdroid -S ctx1,ctx2 output
Test: make systemimage
Bug:
35219933
Change-Id: Icc0f9d5d6180b5db7d68f7de45a1128f5a20be89
Theodore Ts'o [Thu, 27 Apr 2017 02:16:28 +0000 (02:16 +0000)]
e2fsck: update quota when optimizing the extent tree am:
16ffbacc8a
am:
65d65487af
Change-Id: I864e45ca5cb21040c6371ee1ae7fbe6b89196ffb
Theodore Ts'o [Thu, 27 Apr 2017 02:14:28 +0000 (02:14 +0000)]
e2fsck: update quota when optimizing the extent tree
am:
16ffbacc8a
Change-Id: I85cc193d75eb0635372491126d6a2318c1490120
Keun-young Park [Thu, 27 Apr 2017 00:17:25 +0000 (00:17 +0000)]
Merge "e2fsck: update quota when optimizing the extent tree" am:
2ed20fdc91 am:
93853df15e am:
ebe17556a6
am:
d288dded7f
Change-Id: I4f8e338f59b40f4070f9269c2b90609c07d1f78d
Theodore Ts'o [Sat, 15 Apr 2017 04:29:46 +0000 (00:29 -0400)]
e2fsck: update quota when optimizing the extent tree
If quota is enabled, optimizing the extent tree wouldn't update the
in-memory quota statistics, so that a subsequent e2fsck run would show
that the quota usage statistics on disk were incorrect.
Google-Bug-Id:
36391645
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit
96c8e668f7c780dccbc12b7ecc4cac9a5db2bc97)
Change-Id: I429a0ac64b1cc9e5a288f61ba3942e391e575013
Keun-young Park [Wed, 26 Apr 2017 23:52:02 +0000 (23:52 +0000)]
Merge "e2fsck: update quota when optimizing the extent tree" am:
2ed20fdc91 am:
93853df15e
am:
ebe17556a6
Change-Id: Idbaf9027d343b55c5d39c9e76def82b6b51c2a4f
Keun-young Park [Wed, 26 Apr 2017 23:50:01 +0000 (23:50 +0000)]
Merge "e2fsck: update quota when optimizing the extent tree" am:
2ed20fdc91
am:
93853df15e
Change-Id: Iae8a0cd530b63f2865c7a9bc50959dbd695c29f2
Keun-young Park [Wed, 26 Apr 2017 23:46:33 +0000 (23:46 +0000)]
Merge "e2fsck: update quota when optimizing the extent tree"
am:
2ed20fdc91
Change-Id: I8cc31a542e36907d0b5404e3c9975e4203df164e
Keun-young Park [Wed, 26 Apr 2017 23:41:06 +0000 (23:41 +0000)]
Merge "e2fsck: update quota when optimizing the extent tree"
Theodore Ts'o [Sat, 15 Apr 2017 04:29:46 +0000 (00:29 -0400)]
e2fsck: update quota when optimizing the extent tree
If quota is enabled, optimizing the extent tree wouldn't update the
in-memory quota statistics, so that a subsequent e2fsck run would show
that the quota usage statistics on disk were incorrect.
Google-Bug-Id:
36391645
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Jin Qian [Mon, 24 Apr 2017 19:42:06 +0000 (19:42 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name" am:
0474c47c22 am:
ff35b76641 am:
82452d8df8
am:
ee4bd9c793
Change-Id: I4833d1d4efc4e8783c87a1fc632cdd89038ce59c
Jin Qian [Mon, 24 Apr 2017 19:03:50 +0000 (19:03 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name" am:
0474c47c22 am:
ff35b76641
am:
82452d8df8
Change-Id: I164931b642abbc79725e780cbd400a6131c4c8cd
Jin Qian [Mon, 24 Apr 2017 18:51:19 +0000 (18:51 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name" am:
0474c47c22
am:
ff35b76641
Change-Id: I16fc2fe2ad37cec0fb7c20376d6bc285c0020eff
OSDN Git Service
