OSDN Git Service
Alex Deymo [Thu, 10 Sep 2015 20:56:08 +0000 (20:56 +0000)]
am
eaa2aa7d: am
5dc7c070: Merge "Sync libext2fs sources in Android.mk with Makefile.in"
* commit '
eaa2aa7dc47e7b4554078756671b6fa6517b92f4':
Sync libext2fs sources in Android.mk with Makefile.in
Alex Deymo [Thu, 10 Sep 2015 20:27:36 +0000 (20:27 +0000)]
am
5dc7c070: Merge "Sync libext2fs sources in Android.mk with Makefile.in"
* commit '
5dc7c070f778b8ea5033d441dedf58abb5e3d444':
Sync libext2fs sources in Android.mk with Makefile.in
Alex Deymo [Thu, 10 Sep 2015 20:20:04 +0000 (20:20 +0000)]
Merge "Sync libext2fs sources in Android.mk with Makefile.in"
Alex Deymo [Wed, 9 Sep 2015 04:18:58 +0000 (21:18 -0700)]
Sync libext2fs sources in Android.mk with Makefile.in
The Makefile.in lists all the objects included in the libext2fs library
by default and includes some additional objects based on the configure
time flags. This patch syncs the list of source files in Android.mk
with the list of object files in Makefile.in with the addition of
dumpfs.c (included when configured with --enable-resizer) and leaving
out crc32c.c since it relies on generated tables that depend on the
endianness of the target.
Bug:
23084776
Change-Id: If2cce9749932eae6ec63a6ae5565255b00f9611d
Test: mmma external/e2fsprogs; mmma system/update_engine
Alex Deymo [Fri, 4 Sep 2015 05:40:23 +0000 (05:40 +0000)]
am
f803ed09: am
edd6f7f0: Merge "libext2fs: Export the library include path."
* commit '
f803ed099b40b596ade9351ea61fbb9a1838f7e0':
libext2fs: Export the library include path.
Alex Deymo [Fri, 4 Sep 2015 05:31:41 +0000 (05:31 +0000)]
am
edd6f7f0: Merge "libext2fs: Export the library include path."
* commit '
edd6f7f06f05d972b52486a7bb1bec90a0f06d78':
libext2fs: Export the library include path.
Alex Deymo [Fri, 4 Sep 2015 05:23:39 +0000 (05:23 +0000)]
Merge "libext2fs: Export the library include path."
Alex Deymo [Thu, 3 Sep 2015 02:07:46 +0000 (19:07 -0700)]
libext2fs: Export the library include path.
When adding 'libext2fs' as a library dependency from any other binary,
the binary needs to find the library headers. Users of this library
should not hard-code the include path themselves. This patch exports the
library headers on all three version of the libext2fs library and
removes the redundant include path from executables in e2fsprogs.
Bug: b/
23084776
TEST=mma
Change-Id: I652a71fafed6705cfa3ab3c6c5a89082087ef055
Mohamad Ayyash [Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)]
am
d7da78a6: (-s ours) am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
d7da78a6e99e85783d5965cd947e9cc7338e9e37':
Tao Bao [Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)]
am
f589444e: (-s ours) am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
f589444efd60b90e11a60a548c0dc1b3787bc4e1':
Theodore Ts'o [Sun, 19 Jul 2015 03:01:05 +0000 (03:01 +0000)]
am
07a7be75: Add bare-bones encryption support to e2fsck
* commit '
07a7be75a7442ef6c6e84f12492382a4d8aeb735':
Add bare-bones encryption support to e2fsck
Theodore Ts'o [Wed, 15 Jul 2015 02:50:51 +0000 (22:50 -0400)]
Add bare-bones encryption support to e2fsck
Bug:
22483407
Change-Id: I4e9c4e4c855454c7458c85afba47b01eb0111b20
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Mohamad Ayyash [Thu, 16 Jul 2015 19:36:10 +0000 (19:36 +0000)]
am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
Add bare-bones encryption support to e2fsck
Mohamad Ayyash [Thu, 16 Jul 2015 19:35:17 +0000 (19:35 +0000)]
am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
Add bare-bones encryption support to e2fsck
Mohamad Ayyash [Thu, 16 Jul 2015 19:07:04 +0000 (19:07 +0000)]
Merge "Add bare-bones encryption support to e2fsck"
Theodore Ts'o [Wed, 15 Jul 2015 02:50:51 +0000 (22:50 -0400)]
Add bare-bones encryption support to e2fsck
Bug:
22483407
Change-Id: I4e9c4e4c855454c7458c85afba47b01eb0111b20
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Tao Bao [Tue, 14 Jul 2015 22:52:26 +0000 (22:52 +0000)]
am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
5841da45b9274ff2934ebce99c59e87fea05cc21':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 20:26:48 +0000 (20:26 +0000)]
am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
5841da45b9274ff2934ebce99c59e87fea05cc21':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 00:58:04 +0000 (00:58 +0000)]
Merge "Wrap tune2fs.h to be C++ compatible."
Tao Bao [Tue, 14 Jul 2015 00:14:21 +0000 (17:14 -0700)]
Wrap tune2fs.h to be C++ compatible.
Change-Id: I14dc12797f1aac89b3422a4fbfcecfa7ac9dee09
Jeff Sharkey [Thu, 28 May 2015 22:34:45 +0000 (22:34 +0000)]
am
b2cc45fe: Add f2fs to blkid.
* commit '
b2cc45fe711dc42c8c0444584b2513ac59b3ad3b':
Add f2fs to blkid.
Jeff Sharkey [Sun, 24 May 2015 03:36:50 +0000 (20:36 -0700)]
Add f2fs to blkid.
We can now identify f2fs filesystems and extract the UUID.
Bug:
20275581
Change-Id: I55f7b8aa6647913bd45f02a8e9eea18ca3c53939
Colin Cross [Tue, 28 Apr 2015 22:39:10 +0000 (22:39 +0000)]
am
443a5631: Merge "Export include details from libuuid."
* commit '
443a5631f34b4ad4e4f47a0f260655e5a39be870':
Export include details from libuuid.
Colin Cross [Tue, 28 Apr 2015 22:13:47 +0000 (22:13 +0000)]
Merge "Export include details from libuuid."
Jeff Sharkey [Fri, 20 Feb 2015 22:45:03 +0000 (14:45 -0800)]
Export include details from libuuid.
(cherry-picked from
ce5b6554b9d44e081e7c1f80d430188c23d86835)
Change-Id: I682e38c9710dcd91b20b8cba3bb2e32b2dbc61c4
Jeff Sharkey [Fri, 20 Feb 2015 22:45:03 +0000 (14:45 -0800)]
Export include details from libuuid.
Change-Id: I682e38c9710dcd91b20b8cba3bb2e32b2dbc61c4
Ying Wang [Tue, 16 Dec 2014 23:17:02 +0000 (15:17 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I7d2db77f410d50bc6feed5f1a79c0bfef88c7cab
Ying Wang [Tue, 16 Dec 2014 21:50:08 +0000 (21:50 +0000)]
am
5faf22b5: am
a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
5faf22b50d92805553d373da1a24b71c695df177':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 21:06:01 +0000 (21:06 +0000)]
am
a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
a72d7e9db1144749931eeb42d1455285992dbadd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:50:32 +0000 (20:50 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:31:57 +0000 (12:31 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I3a39de092dad5f608dbcac3f495011775169a536
JP Abgrall [Mon, 24 Nov 2014 18:18:17 +0000 (18:18 +0000)]
am
e59f7c7c: am
d25948b9: tune2fs: Allow building it as a static lib
* commit '
e59f7c7cedb1e07eb4dbbb66e115c14faea19f19':
tune2fs: Allow building it as a static lib
JP Abgrall [Mon, 24 Nov 2014 18:06:32 +0000 (18:06 +0000)]
am
d25948b9: tune2fs: Allow building it as a static lib
* commit '
d25948b9b4a9e361ef071dc8175df0407f60b7e0':
tune2fs: Allow building it as a static lib
JP Abgrall [Fri, 21 Nov 2014 07:19:25 +0000 (23:19 -0800)]
tune2fs: Allow building it as a static lib
This allows getting all of tune2fs as a static library.
The entry point is
int tune2fs_main(int argc, char **argv).
It requires passing argv[0]="tune2fs" to get tune2fs behavior.
Bug:
18430740
Change-Id: I7bf8d96c53066a4da37778c0d67383b0b820e2ff
JP Abgrall [Fri, 21 Nov 2014 07:19:25 +0000 (23:19 -0800)]
tune2fs: Allow building it as a static lib
This allows getting all of tune2fs as a static library.
The entry point is
int tune2fs_main(int argc, char **argv).
It requires passing argv[0]="tune2fs" to get tune2fs behavior.
Bug:
18430740
Change-Id: I7bf8d96c53066a4da37778c0d67383b0b820e2ff
Yabin Cui [Tue, 18 Nov 2014 03:46:34 +0000 (03:46 +0000)]
am
2ca3c659: Merge "kill HAVE_TERMIO_H"
* commit '
2ca3c65991609bb5b48004ec3c7a66f6b417beed':
kill HAVE_TERMIO_H
Yabin Cui [Tue, 18 Nov 2014 03:40:15 +0000 (03:40 +0000)]
Merge "kill HAVE_TERMIO_H"
Yabin Cui [Tue, 18 Nov 2014 02:17:30 +0000 (18:17 -0800)]
kill HAVE_TERMIO_H
Bug:
18398307
Change-Id: I72bd78c845cc7d052ca1c3f44fe69f49de9c5c3e
Conley Owens [Sun, 26 Oct 2014 22:48:08 +0000 (22:48 +0000)]
am
9652dd65: am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
9652dd6589d10675573c9a0acc90f6df5ac33397':
Conley Owens [Wed, 15 Oct 2014 23:34:22 +0000 (23:34 +0000)]
am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
e64b83185148d359b9b6cc1310172a3c213a61fb':
Add MODULE_LICENSE and NOTICE files
Conley Owens [Wed, 15 Oct 2014 23:33:58 +0000 (23:33 +0000)]
am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
e64b83185148d359b9b6cc1310172a3c213a61fb':
Add MODULE_LICENSE and NOTICE files
Conley Owens [Wed, 15 Oct 2014 23:20:28 +0000 (23:20 +0000)]
Merge "Add MODULE_LICENSE and NOTICE files"
Conley Owens [Fri, 10 Oct 2014 18:23:55 +0000 (11:23 -0700)]
Add MODULE_LICENSE and NOTICE files
Change-Id: I9208ca656b344cb46afc9cf832b4c30e42b947cf
JP Abgrall [Mon, 30 Jun 2014 21:13:49 +0000 (21:13 +0000)]
am
24c386ed: lib/uuid: make a static library also (fix build)
* commit '
24c386ed46cd767edc2fd0e5e2e2b8a4790d109d':
lib/uuid: make a static library also (fix build)
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also (fix build)
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
(cherry picked from commit
a9e24fdeb275a2afc964f511583795052801ad65)
JP Abgrall [Wed, 25 Jun 2014 18:46:57 +0000 (18:46 +0000)]
am
721f3bc5: Merge "lib/uuid: make a static library also"
* commit '
721f3bc56989b5f4101e646a02d598ddb4a7ff6e':
lib/uuid: make a static library also
JP Abgrall [Wed, 25 Jun 2014 16:36:41 +0000 (16:36 +0000)]
Merge "lib/uuid: make a static library also"
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
The Android Automerger [Thu, 22 May 2014 14:21:49 +0000 (07:21 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 22 May 2014 12:49:59 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 21 May 2014 12:49:50 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 20 May 2014 12:49:49 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Mon, 19 May 2014 12:49:37 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sun, 18 May 2014 12:49:40 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sat, 17 May 2014 12:50:20 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 15 May 2014 12:50:21 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 14 May 2014 12:50:13 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 13 May 2014 12:49:54 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Mon, 12 May 2014 12:49:34 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sun, 11 May 2014 12:49:34 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sat, 10 May 2014 12:49:56 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 8 May 2014 12:49:54 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 7 May 2014 16:10:49 +0000 (09:10 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 7 May 2014 12:49:57 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 6 May 2014 12:49:54 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Mon, 5 May 2014 12:49:41 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sun, 4 May 2014 12:49:40 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sat, 3 May 2014 12:50:29 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 1 May 2014 12:49:49 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 30 Apr 2014 12:50:00 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 29 Apr 2014 12:49:55 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Mon, 28 Apr 2014 12:49:30 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sun, 27 Apr 2014 12:49:33 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sat, 26 Apr 2014 12:50:25 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 24 Apr 2014 12:50:52 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
JP Abgrall [Mon, 24 Mar 2014 22:36:52 +0000 (22:36 +0000)]
am
78374f04: Merge "llseek: setup the correct seek for ext2fs_llseek"
* commit '
78374f0476e3af9060362028e99085e1c200514b':
llseek: setup the correct seek for ext2fs_llseek
JP Abgrall [Mon, 24 Mar 2014 17:33:48 +0000 (17:33 +0000)]
Merge "llseek: setup the correct seek for ext2fs_llseek"
The Android Automerger [Sat, 22 Mar 2014 12:51:18 +0000 (05:51 -0700)]
merge in master-release history after reset to master
JP Abgrall [Thu, 6 Mar 2014 03:42:19 +0000 (19:42 -0800)]
e2fsck: remove unneeded type redefinitions
Or else ...:
In file included from e2fsck/pass5.c:21:
e2fsck/problem.h:13: error: redefinition of typedef ‘__u32’
lib/ext2fs/ext2_types.h:56: error: previous declaration of ‘__u32’ was here
e2fsck/problem.h:14: error: redefinition of typedef ‘errcode_t’
lib/et/com_err.h:22: error: previous declaration of ‘errcode_t’ was here
Change-Id: I0a1ff3b2455bfbaf1e3d0940034a7dbcc231a0f7
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 20 Mar 2014 02:31:35 +0000 (19:31 -0700)]
llseek: setup the correct seek for ext2fs_llseek
After
http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/lib/ext2fs/llseek.c?id=
274d46e1d35af423d0292d63c4d0ad7a03be82ba
with
__linux__
defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
SIZEOF_OFF_T >= SIZEOF_LONG_LONG
it leads to ext2fs_llseek() doing a "return lseek(fd, offset, origin);"
Which fails for offsets > 32bit.
Also, with
__linux__
!(defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE))
defined(HAVE_LLSEEK)
SIZEOF_OFF_T == SIZEOF_LONG_LONG
my_llseek is not defined at all. And there is no need to define
llseek as lseek, as llseek is never used.
Luckily ext2fs_llseek() then does "return lseek(...);"
It would seem that my_llseek should be used in both places.
Bug:
13340735
Change-Id: Ie7330300c9c1ca103eaaef97536dcf10adbbba02
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 20 Mar 2014 02:31:35 +0000 (19:31 -0700)]
llseek: setup the correct seek for ext2fs_llseek
After
http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/lib/ext2fs/llseek.c?id=
274d46e1d35af423d0292d63c4d0ad7a03be82ba
with
__linux__
defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
SIZEOF_OFF_T >= SIZEOF_LONG_LONG
it leads to ext2fs_llseek() doing a "return lseek(fd, offset, origin);"
Which fails for offsets > 32bit.
Also, with
__linux__
!(defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE))
defined(HAVE_LLSEEK)
SIZEOF_OFF_T == SIZEOF_LONG_LONG
my_llseek is not defined at all. And there is no need to define
llseek as lseek, as llseek is never used.
Luckily ext2fs_llseek() then does "return lseek(...);"
It would seem that my_llseek should be used in both places.
Bug:
13340735
Change-Id: Ie7330300c9c1ca103eaaef97536dcf10adbbba02
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 20 Mar 2014 02:08:39 +0000 (19:08 -0700)]
Switch back to 1.42.9 now that there is a fix
Revert "Revert changes that moved from 1.41.14 to 1.42.9"
This reverts commit
65f0aab98b20b5994a726ab90d355248bcddfffd.
JP Abgrall [Fri, 7 Mar 2014 03:02:15 +0000 (03:02 +0000)]
am
9d965309: (-s ours) Merge "e2fsck: remove unneeded type redefinitions"
* commit '
9d9653095dd3ecb9f86e9347a14f7203f52f3f3e':
e2fsck: remove unneeded type redefinitions
JP Abgrall [Thu, 6 Mar 2014 21:50:20 +0000 (13:50 -0800)]
Revert changes that moved from 1.41.14 to 1.42.9
Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
commit
e80e74c41d85ff93f3d212ba6512340f48054a93.
Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
This reverts commit
e97b2b6fc82f840e84dfc631b87f21be44ff2421, reversing
changes made to
7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Revert "Prepare for upstream 1.42.9"
This reverts commit
7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Bug:
13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 6 Mar 2014 21:50:20 +0000 (13:50 -0800)]
Revert changes that moved from 1.41.14 to 1.42.9
Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
commit
e80e74c41d85ff93f3d212ba6512340f48054a93.
Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
This reverts commit
e97b2b6fc82f840e84dfc631b87f21be44ff2421, reversing
changes made to
7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Revert "Prepare for upstream 1.42.9"
This reverts commit
7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Bug:
13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 6 Mar 2014 18:18:49 +0000 (18:18 +0000)]
Merge "e2fsck: remove unneeded type redefinitions"
JP Abgrall [Thu, 6 Mar 2014 03:42:19 +0000 (19:42 -0800)]
e2fsck: remove unneeded type redefinitions
Or else ...:
In file included from e2fsck/pass5.c:21:
e2fsck/problem.h:13: error: redefinition of typedef ‘__u32’
lib/ext2fs/ext2_types.h:56: error: previous declaration of ‘__u32’ was here
e2fsck/problem.h:14: error: redefinition of typedef ‘errcode_t’
lib/et/com_err.h:22: error: previous declaration of ‘errcode_t’ was here
Change-Id: I0a1ff3b2455bfbaf1e3d0940034a7dbcc231a0f7
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Tue, 4 Mar 2014 23:51:32 +0000 (23:51 +0000)]
am
166bc333: Merge "e2fsck: Don\'t use e2fsck_global_ctx unless HAVE_SIGNAL_H"
* commit '
166bc3339ab0914cf1c2e316e2143ccfefec2ae4':
e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H
JP Abgrall [Tue, 4 Mar 2014 21:24:25 +0000 (13:24 -0800)]
e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H
Program received signal SIGSEGV, Segmentation fault.
0x56577382 in e2fsck_set_bitmap_type (fs=0x5658c2b8, default_type=2, profile_name=0x56580e12 "default", old_type=0x0) at external/e2fsprogs/e2fsck/util.c:797
797 profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",
e2fsck_global_ctx is only ever initialized in unix.c PRS()
if HAVE_SIGNAL_H is defined.
Change-Id: Ic93fb8d9114054f7bf8512c622b2fb9b2ae60584
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Tue, 4 Mar 2014 21:31:04 +0000 (21:31 +0000)]
Merge "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
JP Abgrall [Tue, 4 Mar 2014 21:24:25 +0000 (13:24 -0800)]
e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H
Program received signal SIGSEGV, Segmentation fault.
0x56577382 in e2fsck_set_bitmap_type (fs=0x5658c2b8, default_type=2, profile_name=0x56580e12 "default", old_type=0x0) at external/e2fsprogs/e2fsck/util.c:797
797 profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",
e2fsck_global_ctx is only ever initialized in unix.c PRS()
if HAVE_SIGNAL_H is defined.
Change-Id: Ic93fb8d9114054f7bf8512c622b2fb9b2ae60584
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Tue, 4 Mar 2014 02:44:03 +0000 (18:44 -0800)]
Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master
* linaro/linaro-1.42.9: (4262 commits)
Add missing libext2_quota linkage and resource_track.c
Fix blkid time diff bug, build binary.
Add files that would normally be generated by the e2fsprogs build system
Re-add Android makefiles from AOSP master
Update release notes, etc., for final 1.42.9 release
po: update vi.po (from translationproject.org)
po: update tr.po (from translationproject.org)
po: update sv.po (from translationproject.org)
po: update pl.po (from translationproject.org)
po: update nl.po (from translationproject.org)
po: update fr.po (from translationproject.org)
po: update de.po (from translationproject.org)
po: update cs.po (from translationproject.org)
po: update ca.po (from translationproject.org)
e2freefrag: avoid integer overflow when reporting free space statistics
debugfs: document the lsdel command in the man page
mke2fs: clarify documentation about bigalloc in the man page
debian: fix cross build support
mke2fs: clarify the description of the -I option in the man page
debian: update debian-policy conormance to 3.9.5
...
JP Abgrall [Tue, 4 Mar 2014 02:43:55 +0000 (18:43 -0800)]
Prepare for upstream 1.42.9
Remove everything.
Change-Id: I6ef4c9bc888a245744d7ec4d193857b357472392
Signed-off-by: JP Abgrall <jpa@google.com>
Bernhard Rosenkraenzer [Wed, 19 Feb 2014 10:46:32 +0000 (11:46 +0100)]
Add missing libext2_quota linkage and resource_track.c
Change-Id: If3983d882f97c5b4cfaf2a177d5d84c68c66fad3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Jeff Sharkey [Wed, 16 Oct 2013 22:42:12 +0000 (15:42 -0700)]
Fix blkid time diff bug, build binary.
When calculating time diffs, use difftime() instead of risking
integer overflow. Also build a "blkid" binary.
Bug:
11175082
Change-Id: I23521f45204574bb32f152926401c2cbad93175b
Bernhard Rosenkränzer [Tue, 31 Dec 2013 13:43:20 +0000 (14:43 +0100)]
Add files that would normally be generated by the e2fsprogs build system
Android doesn't run ./configure and friends, so it has to rely on
pre-populated versions of the autogenerated files.
This is somewhat bogus (e.g. hardcoded little-endian reference in
lib/ext2fs/ext2_types.h) and should at some point be fixed, but it's
what Android has always done, not a regression from the 1.41.14 branch.
Also, don't #include config.h which we don't generate (we pass what it
usually contains as -D parameters from Android.mk) anywhere.
Add a new Android.mk file for the quota library.
Change-Id: I162c6327fee5bd06261d9cdcc34bda10f04a6f21
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Bernhard Rosenkränzer [Tue, 31 Dec 2013 13:13:18 +0000 (14:13 +0100)]
Re-add Android makefiles from AOSP master
Change-Id: I6c6dbe11baa395442f4cf845ad39801f1c426129
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Theodore Ts'o [Sun, 29 Dec 2013 03:39:41 +0000 (22:39 -0500)]
Update release notes, etc., for final 1.42.9 release
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Trần Ngọc Quân [Sun, 29 Dec 2013 03:34:45 +0000 (22:34 -0500)]
po: update vi.po (from translationproject.org)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>