From edbf4ba2277c2dc0855baf6900b39a4f0d7d9e17 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Tue, 14 Feb 2017 21:06:36 +0100 Subject: [PATCH 01/11] add LeEco Le Pro3 maintainers Change-Id: I4798d78f264b375be3942f15d6f41a2fb9821fc4 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index dbe14251..3acbcc9e 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -55,6 +55,7 @@ Maintainers (LineageOS 13.0): * __Huawei Ascend Mate 2:__ mdmower, u-ra * __Huawei Honor 4/4X (cherry):__ dianlujitao, surdupetru, desalesouche * __LeEco Le 2 (s2):__ codeworkx +* __LeEco Le Pro3 (zl1):__ jrior001, codeworkx * __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2 * __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2 * __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2 From 1966e9990919516d7a480cf90e53897a691d23f6 Mon Sep 17 00:00:00 2001 From: ElDainosor Date: Fri, 10 Feb 2017 04:05:51 +0000 Subject: [PATCH 02/11] apn: Updating Movistar Argentina APN This change updates the APN settings, removing the proxy and the port. This, according to movistar itself, makes the connection slower and will be shut down soon. More info on their forum: https://foro.movistar.com.ar/threads/43044-NOVEDAD-Apagado-de-Proxy Change-Id: I705e6ed2237503ee67c7371bf3595b461dfbbd9c (cherry picked from commit 08eb71e86a4218817496eee60a80d21a5781e1b3) --- prebuilt/common/etc/apns-conf.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index ec1c3223..f0e330e8 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -3688,27 +3688,27 @@ - + - + - + - + - + - + - + - + - + - + - + From 5da6b60229b3501f4d1a46c5900f9533e6752c16 Mon Sep 17 00:00:00 2001 From: Brinly Taylor Date: Fri, 24 Feb 2017 05:09:42 +0000 Subject: [PATCH 03/11] cm: Add BQ Aquaris X5 (paella) maintainers. Change-Id: I782dd3109ea441d2d0bf77a86d1b3b22d6a2a673 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 3acbcc9e..fdfc1e16 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -22,6 +22,7 @@ Maintainers (LineageOS 13.0): * __B&N Nook Tablet (acclaim):__ chrmhoffmann * __BQ Aquaris E5 4G/E5 S (vegetalte):__ cmorlok, eloimuns, Kra1o5, stucki, brinlyau (bq-dev) * __BQ Aquaris M5 (piccolo):__ cmorlok, eloimuns, Kra1o5, stucki, brinlyau (bq-dev) +* __BQ Aquaris X5 (paella):__ cmorlok, eloimuns, Kra1o5, stucki, brinlyau (bq-dev) * __BQ Aquaris X5 Plus (gohan):__ cmorlok, eloimuns, Kra1o5, stucki, brinlyau (bq-dev) * __Google Android One:__ varunchitre15 * __Google Galaxy Nexus:__ Ziyan, musical_chairs From 70e53042eb33d1d02e8ac918db9c90093bb996f6 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sat, 25 Feb 2017 08:01:58 +0800 Subject: [PATCH 04/11] cm: Import init.superuser.rc into init.local.rc With change I73bbf37e547323846cd863b3dcea5c890f9ee969, we need to move all the contents of the su service into the main init.cm.rc file. Change-Id: Id7cf00738dcb81935b27e5de33d1f7dd2b2fcdb3 --- prebuilt/common/etc/init.local.rc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc index 2a5316d4..9c40061e 100644 --- a/prebuilt/common/etc/init.local.rc +++ b/prebuilt/common/etc/init.local.rc @@ -1,6 +1,4 @@ # CyanogenMod Extras -import /init.superuser.rc - on init export ANDROID_CACHE /cache export TERMINFO /system/etc/terminfo @@ -211,3 +209,19 @@ on property:sys.io.scheduler=bfq write /sys/block/sde/queue/iosched/slice_idle 0 write /sys/block/dm-0/queue/iosched/slice_idle 0 +# su daemon +service su_daemon /system/xbin/su --daemon + disabled + seclabel u:r:sudaemon:s0 + +on property:persist.sys.root_access=0 + stop su_daemon + +on property:persist.sys.root_access=1 + start su_daemon + +on property:persist.sys.root_access=2 + start su_daemon + +on property:persist.sys.root_access=3 + start su_daemon From cf276aa7cda379b93a38f8e6251fa4fe51eb96d9 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 26 Feb 2017 21:01:38 +0100 Subject: [PATCH 05/11] backuptool: Don't rely on the order of the elements in the list We should not test symlinks using -e or -f, otherwise the order in which the files are backed up and restored matters. Change-Id: I9b87972b27a63ef562c0c5f46f943eafd0a08ce1 --- prebuilt/common/bin/backuptool.functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions index 9598f23c..d9b2fc09 100644 --- a/prebuilt/common/bin/backuptool.functions +++ b/prebuilt/common/bin/backuptool.functions @@ -8,7 +8,7 @@ export S=/system export V=13.0 backup_file() { - if [ -e "$1" ]; then + if [ -e "$1" -o -L "$1" ]; then local F=`basename "$1"` local D=`dirname "$1"` # dont backup any apps that have odex files, they are useless @@ -24,7 +24,7 @@ backup_file() { restore_file() { local FILE=`basename "$1"` local DIR=`dirname "$1"` - if [ -e "$C/$DIR/$FILE" ]; then + if [ -e "$C/$DIR/$FILE" -o -L "$C/$DIR/$FILE" ]; then if [ ! -d "$DIR" ]; then mkdir -p "$DIR"; fi From 52996421a116965bff6b7b58bd99693b4ef02d23 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Mon, 27 Feb 2017 15:44:17 +0100 Subject: [PATCH 06/11] backuptool: Preserve the SELinux context of the files Add a function that allows to copy files preserving their SELinux context that is generic enough to work with both busybox and toybox. Change-Id: If2c245863df5675c18dbf43b6bcedeb33383fc38 --- prebuilt/common/bin/backuptool.functions | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions index d9b2fc09..8a372a3e 100644 --- a/prebuilt/common/bin/backuptool.functions +++ b/prebuilt/common/bin/backuptool.functions @@ -7,6 +7,16 @@ export C=/tmp/backupdir export S=/system export V=13.0 +copy_file() { + cp -dp "$1" "$2" + # symlinks don't have a context + if [ ! -L "$1" ]; then + # it is assumed that every label starts with 'u:object_r' and has no white-spaces + local context=`ls -Z "$1" | grep -o 'u:object_r:[^ ]*' | head -1` + chcon "$context" "$2" + fi +} + backup_file() { if [ -e "$1" -o -L "$1" ]; then local F=`basename "$1"` @@ -16,7 +26,7 @@ backup_file() { echo "Skipping odexed apk $1"; else mkdir -p "$C/$D" - cp -p $1 "$C/$D/$F" + copy_file "$1" "$C/$D/$F" fi fi } @@ -28,7 +38,7 @@ restore_file() { if [ ! -d "$DIR" ]; then mkdir -p "$DIR"; fi - cp -p "$C/$DIR/$FILE" "$1"; + copy_file "$C/$DIR/$FILE" "$1"; if [ -n "$2" ]; then echo "Deleting obsolete file $2" rm "$2"; From 5f124ae55be98d4996658f05aaac4c63802ea590 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 22 Jan 2017 22:50:02 +0100 Subject: [PATCH 07/11] Add target to make a flashable su addon Run 'make addonsu' to make a flashable zip to install the addon and 'make addonsu-remove' for a flashable zip that removes it. Change-Id: I5b2fe67f98f2474b923c074dc6025b47c6db2ae0 --- addonsu/51-addonsu.sh | 37 ++++++++++++++++++++++++++++++++++ addonsu/mount-system.sh | 13 ++++++++++++ addonsu/updater-script-install | 21 +++++++++++++++++++ addonsu/updater-script-remove | 19 +++++++++++++++++ build/tasks/addonsu.mk | 37 ++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 addonsu/51-addonsu.sh create mode 100644 addonsu/mount-system.sh create mode 100644 addonsu/updater-script-install create mode 100644 addonsu/updater-script-remove create mode 100644 build/tasks/addonsu.mk diff --git a/addonsu/51-addonsu.sh b/addonsu/51-addonsu.sh new file mode 100644 index 00000000..4e36c4cd --- /dev/null +++ b/addonsu/51-addonsu.sh @@ -0,0 +1,37 @@ +#!/sbin/sh + +. /tmp/backuptool.functions + +list_files() { +cat < Date: Sun, 26 Mar 2017 00:45:24 -0600 Subject: [PATCH 08/11] sepolicy: com.cyanogenmod.updater -> org.lineageos.updater Update seapp_contexts and mac_permissions.xml for the new LineageOS updater Change-Id: I171b35ad5578202724efc3f823f7e7a461e5e5cd --- sepolicy/mac_permissions.xml | 2 +- sepolicy/seapp_contexts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sepolicy/mac_permissions.xml b/sepolicy/mac_permissions.xml index f70b7225..f66aadaf 100644 --- a/sepolicy/mac_permissions.xml +++ b/sepolicy/mac_permissions.xml @@ -17,7 +17,7 @@ - + diff --git a/sepolicy/seapp_contexts b/sepolicy/seapp_contexts index 11c8f00f..6b9c88fb 100644 --- a/sepolicy/seapp_contexts +++ b/sepolicy/seapp_contexts @@ -1,4 +1,4 @@ user=_app seinfo=platform name=com.cyanogenmod.filemanager domain=untrusted_app type=app_data_file user=theme_man domain=system_app type=system_data_file -user=_app seinfo=cmupdater name=com.cyanogenmod.updater domain=system_app type=system_app_data_file -user=_app seinfo=themeservice name=org.cyanogenmod.themeservice domain=themeservice_app type=themeservice_app_data_file \ No newline at end of file +user=_app seinfo=cmupdater name=org.lineageos.updater domain=system_app type=system_app_data_file +user=_app seinfo=themeservice name=org.cyanogenmod.themeservice domain=themeservice_app type=themeservice_app_data_file From 116515991c4eb230a6134559f82afa9859a59e8f Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Mon, 17 Apr 2017 09:47:26 +0200 Subject: [PATCH 09/11] Fix lunch names in vendorsetup.sh Change-Id: Ic2daf7ae920126fa6af420225bf9eac101c534e3 --- vendorsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendorsetup.sh b/vendorsetup.sh index b520579d..41f28c2e 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,4 +1,4 @@ -for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/lineage-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "cm_%s-%s\n", $1, $2}') +for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/lineage-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "lineage_%s-%s\n", $1, $2}') do add_lunch_combo $combo done From c30dc1b5eaa6b77fea5190721b365c7a7d6b4b47 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 28 Apr 2017 23:55:07 +0300 Subject: [PATCH 10/11] addonsu: Add Lineage version to zip name * Avoid confusion Change-Id: I823d77e037b0d0dc2a4b9f0466d594213c72e179 --- build/tasks/addonsu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/addonsu.mk b/build/tasks/addonsu.mk index 2fbeb43f..1c360f38 100644 --- a/build/tasks/addonsu.mk +++ b/build/tasks/addonsu.mk @@ -1,7 +1,7 @@ ADDONSU_PREBUILTS_PATH := vendor/cm/addonsu/ ADDONSU_INSTALL_OUT := $(PRODUCT_OUT)/addonsu-install/ -ADDONSU_INSTALL_TARGET := $(PRODUCT_OUT)/addonsu-$(TARGET_ARCH).zip +ADDONSU_INSTALL_TARGET := $(PRODUCT_OUT)/addonsu-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_ARCH).zip $(ADDONSU_INSTALL_TARGET): $(ALL_MODULES.updater.BUILT) \ $(ALL_MODULES.su.BUILT) @@ -22,7 +22,7 @@ addonsu: $(ADDONSU_INSTALL_TARGET) ADDONSU_REMOVE_OUT := $(PRODUCT_OUT)/addonsu-remove/ -ADDONSU_REMOVE_TARGET := $(PRODUCT_OUT)/addonsu-remove-$(TARGET_ARCH).zip +ADDONSU_REMOVE_TARGET := $(PRODUCT_OUT)/addonsu-remove-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_ARCH).zip $(ADDONSU_REMOVE_TARGET): $(ALL_MODULES.updater.BUILT) $(hide) rm -rf $@ $(ADDONSU_REMOVE_OUT) From 109fef9e1e04b2faa44c5f9dc7c5b8d3ba559858 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 30 Apr 2017 18:16:45 +0200 Subject: [PATCH 11/11] su: Don't start daemon for adb only mode adb root doesn't rely on su to work, so the daemon shouldn't be started. Change-Id: Ice9131b7efe9344df5d77fdbc465ce0b82dbe07f --- prebuilt/common/etc/init.local.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc index 9c40061e..53f972c9 100644 --- a/prebuilt/common/etc/init.local.rc +++ b/prebuilt/common/etc/init.local.rc @@ -221,7 +221,7 @@ on property:persist.sys.root_access=1 start su_daemon on property:persist.sys.root_access=2 - start su_daemon + stop su_daemon on property:persist.sys.root_access=3 start su_daemon