diff options
author | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
---|---|---|
committer | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
commit | 65f0aab98b20b5994a726ab90d355248bcddfffd (patch) | |
tree | 2b7c0cf831d8255e3b0d1bab367609100a7e0f18 /depfix.sed | |
parent | 66b7b06812cc7ae835e0c0ed2656d1a27580c5ed (diff) | |
download | android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.gz android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.bz2 android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.zip |
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>
Diffstat (limited to 'depfix.sed')
-rw-r--r-- | depfix.sed | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -25,8 +25,8 @@ s/ */ /g s;/usr/include/[^ ]* *;;g s;/usr/lib/[^ ]* *;;g s;/mit/cygnus[^ ]* *;;g -s;\.\./[^ ]*lib/blkid/blkid[^ ]* *;;g -s;\.\./[^ ]*lib/uuid/uuid.h[^ ]* *;;g +s;../[^ ]*lib/blkid/blkid[^ ]* *;;g +s;../[^ ]*lib/uuid/uuid.h[^ ]* *;;g # # Now insert a trailing newline... |