From d7b58513a4625fa131a8e1be3f77cca1bc76e132 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 11:40:23 +0800 Subject: [PATCH 01/11] Create cool 1 dual --- data/devices/cool 1 dual | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 data/devices/cool 1 dual diff --git a/data/devices/cool 1 dual b/data/devices/cool 1 dual new file mode 100644 index 000000000..b17159ac1 --- /dev/null +++ b/data/devices/cool 1 dual @@ -0,0 +1,78 @@ +--- + + + +- name: cool 1 dual + + id: c106-9 + + + codenames: + - cool_c1 + - REL + - c106-9 + + architecture: arm64-v8a + + block_devs: + + base_dirs: + - /dev/block/bootdevice/by-name + + system: + - /dev/block/bootdevice/by-name/system + + + cache: + - /dev/block/bootdevice/by-name/cache + + + + data: + - /dev/block/bootdevice/by-name/userdata + + + + boot: + - /dev/block/bootdevice/by-name/boot + + + + recovery: + - /dev/block/bootdevice/by-name/recovery + + + + boot_ui: + + supported: true + + + + flags: + - TW_QCOM_RTC_FIX + + + + pixel_format: RGBX_8888 + + + force_pixel_format: NONE + + + + brightness_path: '/sys/class/leds/lcd-backlight/brightness' + + + + max_brightness: 255 + + default_brightness: 128 + + + + graphics_backends: + - fbdev + + + theme: portrait_hdpi From 2b4673f15d4b9a462c46595f0653620611ebe4d4 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 12:26:32 +0800 Subject: [PATCH 02/11] Update cool 1 dual --- data/devices/cool 1 dual | 66 +++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/data/devices/cool 1 dual b/data/devices/cool 1 dual index b17159ac1..5faef142b 100644 --- a/data/devices/cool 1 dual +++ b/data/devices/cool 1 dual @@ -2,15 +2,17 @@ -- name: cool 1 dual +- name: cool 1 dual / cool 1c id: c106-9 codenames: - cool_c1 - - REL + - cool 1 dual - c106-9 + - c106-7 + - c106-8 architecture: arm64-v8a @@ -18,48 +20,70 @@ base_dirs: - /dev/block/bootdevice/by-name - + - /dev/block/dm-0 + - /dev/block/platform/soc.0/7824900.sdhci system: - /dev/block/bootdevice/by-name/system - + - /dev/block/mmcblk0p27 cache: - /dev/block/bootdevice/by-name/cache - - - + - /dev/block/mmcblk0p28 + data: - /dev/block/bootdevice/by-name/userdata - - - + - /dev/block/dm-0 + boot: - /dev/block/bootdevice/by-name/boot - + - /dev/block/mmcblk0p23 - recovery: - /dev/block/bootdevice/by-name/recovery - - + - /dev/block/mmcblk0p24 + + misc: + - /dev/block/bootdevice/by-name/misc + - /dev/block/mmcblk0p29 + + system_image: + - /dev/block/bootdevice/by-name/system + - /dev/block/mmcblk0p27 + + external_sd: + - /dev/block/mmcblk1p1 + + extra: + - /dev/block/platform/soc.0/7824900.sdhci + - + + #external_sd | | Size: 0MB Used: 0MB Free: 0MB Backup Size: 0MB + #Flags: Can_Be_Mounted Can_Be_Wiped Wipe_Available_in_GUI Removable Is_Storage + # Primary_Block_Device: /dev/block/mmcblk1p1 + # Display_Name: external_sd + # Storage_Name: external_sd + # Backup_Path: /external_sd + # Backup_Name: external_sd + # Backup_Display_Name: external_sd + # Storage_Path: /external_sd + # Current_File_System: vfat + # Fstab_File_System: vfat + # Backup_Method: files + # MTP_Storage_ID: 65538 boot_ui: supported: true - flags: - TW_QCOM_RTC_FIX - - + - pixel_format: RGBX_8888 + pixel_format: RGBA_8888 - force_pixel_format: NONE - - + GGL_PIXEL_FORMAT_RGBA_8888 brightness_path: '/sys/class/leds/lcd-backlight/brightness' From 01a896e42e9cd98fbd70942779d73c545d626969 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 12:31:45 +0800 Subject: [PATCH 03/11] Update cool 1 dual --- data/devices/cool 1 dual | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/devices/cool 1 dual b/data/devices/cool 1 dual index 5faef142b..3ff1d425f 100644 --- a/data/devices/cool 1 dual +++ b/data/devices/cool 1 dual @@ -53,9 +53,9 @@ external_sd: - /dev/block/mmcblk1p1 - extra: + extra: - /dev/block/platform/soc.0/7824900.sdhci - - + #external_sd | | Size: 0MB Used: 0MB Free: 0MB Backup Size: 0MB #Flags: Can_Be_Mounted Can_Be_Wiped Wipe_Available_in_GUI Removable Is_Storage @@ -83,7 +83,7 @@ pixel_format: RGBA_8888 force_pixel_format: NONE - GGL_PIXEL_FORMAT_RGBA_8888 + brightness_path: '/sys/class/leds/lcd-backlight/brightness' From 026c6d18bb34ff276381128f621238a975bca10e Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 16:49:50 +0800 Subject: [PATCH 04/11] Create .travis.yml --- .travis.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..84492af4f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,44 @@ +sudo: required + +services: + - docker + +before_install: + # Clone DualBootPatcher Repository + - git clone --recursive https://github.com/yshalsager/DualBootPatcher -b master DualBootPatcher/ + # Pull docker images + - docker pull yshalsager/dualbootpatcher:9.3.0-4-base + - docker pull yshalsager/dualbootpatcher:9.3.0-4-android + - docker pull yshalsager/dualbootpatcher:9.3.0-4-linux +script: + # Make work directories + - mkdir $HOME/.android + - mkdir -p ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/ && cd ${TRAVIS_BUILD_DIR}/DualBootPatcher/ + # Build APK + - | + docker run --rm -i -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -v "$(pwd):/builder/DualBootPatcher:rw,z" -v "${HOME}/.android:/builder/.android:rw,z" yshalsager/dualbootpatcher:9.3.0-4-android bash << EOF + cd DualBootPatcher/builder && cmake .. -DMBP_BUILD_TARGET=android -DMBP_BUILD_TYPE=debug && make -j16 && rm -rf assets && cpack && make apk -j16 + make android-system_armeabi-v7a -j16 && make -C data/devices -j16 + exit + EOF + - | + docker run --rm -i -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -v "$(pwd):/builder/DualBootPatcher:rw,z" -v "${HOME}/.android:/builder/.android:rw,z" yshalsager/dualbootpatcher:9.3.0-4-linux bash << EOF + # Build Utilities Zip + cd ~/DualBootPatcher/builder && ./utilities/create.sh + # Build Linux + cmake .. -DMBP_BUILD_TARGET=desktop -DMBP_PORTABLE=ON && make -j16 && cpack + exit + EOF +after_success: + - export TRAVIS_CURRENT_DATE=$(date +"%d%m%y-%Hh%Mm") + # Check output & md5sum + - ls -l ${TRAVIS_BUILD_DIR}/DualBootPatcher/Android_GUI/build/outputs/apk/debug/Android_GUI-debug.apk + - md5sum ${TRAVIS_BUILD_DIR}/DualBootPatcher/Android_GUI/build/outputs/apk/debug/Android_GUI-debug.apk + - ls -l ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/utilities/DualBootUtilities-9.3.0.zip + - md5sum ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/utilities/DualBootUtilities-9.3.0.zip + - ls -l ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/DualBootPatcher-9.3.0-Linux.zip + - md5sum ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/DualBootPatcher-9.3.0-Linux.zip + # Upload to transfer.sh + - cd ${TRAVIS_BUILD_DIR}/DualBootPatcher/Android_GUI/build/outputs/apk/debug/ && curl --upload-file ./Android_GUI-debug.apk https://transfer.sh/Android_GUI-debug-${TRAVIS_CURRENT_DATE}.apk + - cd ${TRAVIS_BUILD_DIR}//DualBootPatcher/builder/utilities/ && curl --upload-file ./DualBootUtilities-9.3.0.zip https://transfer.sh/DualBootUtilities-9.3.0-${TRAVIS_CURRENT_DATE}.zip + - cd ${TRAVIS_BUILD_DIR}/DualBootPatcher/builder/ && curl --upload-file ./DualBootPatcher-9.3.0-Linux.zip https://transfer.sh/DualBootPatcher-9.3.0-${TRAVIS_CURRENT_DATE}-Linux.zip From 85b949bb1ce5d6d8ac66f5bd93575b6ce56688b3 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 16:53:06 +0800 Subject: [PATCH 05/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84492af4f..02d6edfb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: before_install: # Clone DualBootPatcher Repository - - git clone --recursive https://github.com/yshalsager/DualBootPatcher -b master DualBootPatcher/ + - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master DualBootPatcher/ # Pull docker images - docker pull yshalsager/dualbootpatcher:9.3.0-4-base - docker pull yshalsager/dualbootpatcher:9.3.0-4-android From c5e79ca4ffec8f5c2225bd165dea84f2ff395ec1 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 16:56:34 +0800 Subject: [PATCH 06/11] Update cool 1 dual --- data/devices/cool 1 dual | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/data/devices/cool 1 dual b/data/devices/cool 1 dual index 3ff1d425f..829869bf2 100644 --- a/data/devices/cool 1 dual +++ b/data/devices/cool 1 dual @@ -50,26 +50,13 @@ - /dev/block/bootdevice/by-name/system - /dev/block/mmcblk0p27 - external_sd: - - /dev/block/mmcblk1p1 + extra: - /dev/block/platform/soc.0/7824900.sdhci - #external_sd | | Size: 0MB Used: 0MB Free: 0MB Backup Size: 0MB - #Flags: Can_Be_Mounted Can_Be_Wiped Wipe_Available_in_GUI Removable Is_Storage - # Primary_Block_Device: /dev/block/mmcblk1p1 - # Display_Name: external_sd - # Storage_Name: external_sd - # Backup_Path: /external_sd - # Backup_Name: external_sd - # Backup_Display_Name: external_sd - # Storage_Path: /external_sd - # Current_File_System: vfat - # Fstab_File_System: vfat - # Backup_Method: files - # MTP_Storage_ID: 65538 + boot_ui: From 4a2327ea175bd012bfb0ddf3025a9c32dffe6912 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 17:32:48 +0800 Subject: [PATCH 07/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02d6edfb8..97ebe146f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: before_install: # Clone DualBootPatcher Repository - - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master DualBootPatcher/ + - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master gfzhy/DualBootPatcher/ # Pull docker images - docker pull yshalsager/dualbootpatcher:9.3.0-4-base - docker pull yshalsager/dualbootpatcher:9.3.0-4-android From adb718d0ffbcadae1b7f07fe01039d3c43f2809e Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 17:36:07 +0800 Subject: [PATCH 08/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 97ebe146f..4a0c3af27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: before_install: # Clone DualBootPatcher Repository - - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master gfzhy/DualBootPatcher/ + - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master https://travis-ci.org/gfzhy/DualBootPatcher/ # Pull docker images - docker pull yshalsager/dualbootpatcher:9.3.0-4-base - docker pull yshalsager/dualbootpatcher:9.3.0-4-android From 04cbbacb58437eda50c6fb6d494ed2db94051485 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 17:41:47 +0800 Subject: [PATCH 09/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a0c3af27..02d6edfb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: before_install: # Clone DualBootPatcher Repository - - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master https://travis-ci.org/gfzhy/DualBootPatcher/ + - git clone --recursive https://github.com/gfzhy/DualBootPatcher -b master DualBootPatcher/ # Pull docker images - docker pull yshalsager/dualbootpatcher:9.3.0-4-base - docker pull yshalsager/dualbootpatcher:9.3.0-4-android From a9c2058de440a3f742edfbf01c0712b9dc71db32 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 18:18:47 +0800 Subject: [PATCH 10/11] Update cool 1 dual --- data/devices/cool 1 dual | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/devices/cool 1 dual b/data/devices/cool 1 dual index 829869bf2..6cbd8af8c 100644 --- a/data/devices/cool 1 dual +++ b/data/devices/cool 1 dual @@ -22,6 +22,7 @@ - /dev/block/bootdevice/by-name - /dev/block/dm-0 - /dev/block/platform/soc.0/7824900.sdhci + - /dev/block/platform/soc.0/7824900.sdhci/by-name system: - /dev/block/bootdevice/by-name/system - /dev/block/mmcblk0p27 @@ -50,10 +51,13 @@ - /dev/block/bootdevice/by-name/system - /dev/block/mmcblk0p27 - + external_sd: + - /dev/block/mmcblk1p1 extra: - /dev/block/platform/soc.0/7824900.sdhci + - /dev/block/platform/soc.0/7824900.sdhci/by-name + - /dev/block/bootdevice/by-name/config From 6fc90ef9cb303daab693dfd1679403e5a127f660 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Mon, 18 Feb 2019 20:05:26 +0800 Subject: [PATCH 11/11] Update CMakeLists.txt --- data/devices/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/data/devices/CMakeLists.txt b/data/devices/CMakeLists.txt index 1f0daaf51..0dc67b9a7 100644 --- a/data/devices/CMakeLists.txt +++ b/data/devices/CMakeLists.txt @@ -16,6 +16,7 @@ set(files cherrymobile.yml cmcc.yml coolpad.yml + cool 1 dual.yml dexp.yml doogee.yml elephone.yml