patches: Update for Bliss 11.2 Stable
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I6f7c6beee6581a349627f4f449f99f5c894e37e7
diff --git a/patches/system/vold/0001-Allow-deletion-of-symlink.patch b/patches/system/vold/0001-Allow-deletion-of-symlink.patch
deleted file mode 100644
index c7c5b99..0000000
--- a/patches/system/vold/0001-Allow-deletion-of-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 30efdaa4669e5dcf632457cbdbc06d1943b19700 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Sat, 17 Feb 2018 19:39:38 +0100
-Subject: [PATCH 1/5] Allow deletion of symlink
-
-Change-Id: I9731895f88729072297f753088583aabbe6990f4
----
- Ext4Crypt.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
-index 67b7e90..99a63b4 100644
---- a/Ext4Crypt.cpp
-+++ b/Ext4Crypt.cpp
-@@ -221,6 +221,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
- static bool destroy_dir(const std::string& dir) {
- LOG(DEBUG) << "Destroying: " << dir;
- if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
-+ if(unlink(dir.c_str()) == 0) return true;
- PLOG(ERROR) << "Failed to destroy " << dir;
- return false;
- }
---
-2.7.4
-
diff --git a/patches/system/vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch b/patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
similarity index 85%
rename from patches/system/vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
rename to patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
index 4bb1f92..289c53f 100644
--- a/patches/system/vold/0003-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
+++ b/patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
@@ -1,7 +1,7 @@
-From e3d4f144c3322ef7910c4f61dc8cbfc1f17c9455 Mon Sep 17 00:00:00 2001
+From 40ca9a2fc137e0c185e3aaedeababb65f1d6cd4e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 20:54:08 +0200
-Subject: [PATCH 3/5] Create vendor_de. This is done by /init.rc on
+Subject: [PATCH 1/4] Create vendor_de. This is done by /init.rc on
system-as-root device
---
@@ -22,5 +22,5 @@
if (!prepare_dir(system_legacy_path, 0700, AID_SYSTEM, AID_SYSTEM)) return false;
#if MANAGE_MISC_DIRS
--
-2.7.4
+2.17.1
diff --git a/patches/system/vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch b/patches/system/vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
deleted file mode 100644
index 150354d..0000000
--- a/patches/system/vold/0002-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 90dfcf4b79f01087997d658d87dbf2ff332b7012 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 14 Aug 2018 20:53:12 +0200
-Subject: [PATCH 2/5] Don't set reserved_disk group, it panics old inits
-
----
- vold.rc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/vold.rc b/vold.rc
-index 7d14453..c27aeda 100644
---- a/vold.rc
-+++ b/vold.rc
-@@ -5,4 +5,3 @@ service vold /system/bin/vold \
- ioprio be 2
- writepid /dev/cpuset/foreground/tasks
- shutdown critical
-- group reserved_disk
---
-2.7.4
-
diff --git a/patches/system/vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch b/patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
similarity index 91%
rename from patches/system/vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
rename to patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
index c353771..d129fae 100644
--- a/patches/system/vold/0004-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
+++ b/patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
@@ -1,7 +1,7 @@
-From baa16308959d861658a63836e43b57479d02345d Mon Sep 17 00:00:00 2001
+From 642887ce1ff0403fce542af0aea8c3c52ba07fdb Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:37:54 +0200
-Subject: [PATCH 4/5] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 2/4] Support Samsung's implementation of exfat, called sdfat
---
fs/Exfat.cpp | 9 ++++++---
@@ -40,5 +40,5 @@
}
--
-2.7.4
+2.17.1
diff --git a/patches/system/vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch b/patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch
similarity index 81%
rename from patches/system/vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch
rename to patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch
index cf92197..ce56b36 100644
--- a/patches/system/vold/0005-Also-create-vendor_ce-same-reason-as-vendor_de.patch
+++ b/patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch
@@ -1,8 +1,9 @@
-From 18b7fc6d0fb54a16e6d1d095b000dc8840511eff Mon Sep 17 00:00:00 2001
+From d2d67f9e989a6b72df42b387ac573f55bd236d3c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:38:08 +0200
-Subject: [PATCH 5/5] Also create vendor_ce (same reason as vendor_de)
+Subject: [PATCH 3/4] Also create vendor_ce (same reason as vendor_de)
+Change-Id: Ifba45dd063cc2f4947dcb5c47be30e34b32bd758
---
Ext4Crypt.cpp | 2 ++
1 file changed, 2 insertions(+)
@@ -21,5 +22,5 @@
if (!prepare_dir(system_ce_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
--
-2.7.4
+2.17.1
diff --git a/patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch b/patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
new file mode 100644
index 0000000..4c5470b
--- /dev/null
+++ b/patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
@@ -0,0 +1,23 @@
+From 5a60b2a5fee25755109ab9e060bf5a2aff905ca8 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 14 Aug 2018 20:53:12 +0200
+Subject: [PATCH 4/4] Don't set reserved_disk group, it panics old inits
+
+Signed-off-by: Jackeagle <jackeagle102@gmail.com>
+Change-Id: Ib9318bb0af7a2f0b5dbc75b505d1d716bb4e9cc7
+---
+ vold.rc | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/vold.rc b/vold.rc
+index 93d8786..c27aeda 100644
+--- a/vold.rc
++++ b/vold.rc
+@@ -5,4 +5,3 @@ service vold /system/bin/vold \
+ ioprio be 2
+ writepid /dev/cpuset/foreground/tasks
+ shutdown critical
+- group root reserved_disk
+--
+2.17.1
+