From 3c7bfd7a06aa1c26ea8c716d8df15bf19b725084 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Sat, 30 Mar 2019 11:27:12 +0800 Subject: [PATCH 1/5] Update SAMPLE.yml --- data/devices/SAMPLE.yml | 42 +++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/data/devices/SAMPLE.yml b/data/devices/SAMPLE.yml index 758646ef1..79dc8f7a3 100644 --- a/data/devices/SAMPLE.yml +++ b/data/devices/SAMPLE.yml @@ -9,60 +9,66 @@ # Human readable device name (required) -- name: Samsung Galaxy S 4 (Qcom) +- name: OE106 # Device ID (required). Must be unique, but can be any string. It is good # practice to set this value similar to the device's codename if possible. - id: jflte + id: ocean # List of device codenames (required). The codename is the value of # 'ro.product.device' or 'ro.build.product' in the /system/build.prop file. # WARNING: All of the devices listed MUST have the same partition table. # Otherwise, there's a chance of hard-bricking the device. codenames: - - jflte - - jfltetmo - - jfltexx + - ocean + # Device architecture (required). For example, armeabi-v7a, arm64-v8a, or x86. - architecture: armeabi-v7a + architecture: arm64-v8a # Block device paths section (required). block_devs: # Base directories (optional). This is a list of the 'by-name' directories # in /dev/ that contain the partition block devices. base_dirs: - - /dev/block/platform/msm_sdcc.1/by-name + - /dev/block/bootdevice/by-name + - /dev/block/ # System partition block device paths (required). system: - - /dev/block/platform/msm_sdcc.1/by-name/system - - /dev/block/mmcblk0p16 + - /dev/block/bootdevice/by-name/system + - /dev/block/mmcblk0p49 # Cache partition block device paths (required). cache: - - /dev/block/platform/msm_sdcc.1/by-name/cache - - /dev/block/mmcblk0p18 + - /dev/block/bootdevice/by-name/cache + - /dev/block/mmcblk0p15 # Data partition block device paths (required). data: - - /dev/block/platform/msm_sdcc.1/by-name/userdata - - /dev/block/mmcblk0p29 + - /dev/block/logic_data + - /dev/block/dm-0 # Boot partition block device paths (required). boot: - - /dev/block/platform/msm_sdcc.1/by-name/boot - - /dev/block/mmcblk0p20 + - /dev/block/bootdevice/by-name/boot + - /dev/block/mmcblk0p13 # Recovery partition block device paths (required). recovery: - - /dev/block/platform/msm_sdcc.1/by-name/recovery - - /dev/block/mmcblk0p21 + - /dev/block/bootdevice/by-name/recovery + - /dev/block/mmcblk0p16 # Extra block device paths (optional). This is a list of block devices that # will be available during the flashing process. Any block devices not # listed here cannot be touched by a ROM's installer. extra: - - /dev/block/platform/msm_sdcc.1/by-name/aboot + # - /dev/block/platform/msm_sdcc.1/by-name/aboot + - /dev/block/platform/soc + - /dev/block/platform/soc/7c4000.sdhci + - /dev/block/platform/soc/7c4000.sdhci/by-name + - /dev/block/platform/soc/7c4000.sdhci/by-name/abl + - /dev/block/platform/soc/7c4000.sdhci/by-name/alterable + - /dev/block/platform/soc/7c4000.sdhci/by-name/aop # Boot UI section (optional). boot_ui: From f6a7e2676d557200145cc2e749d74e5fc7e6ae58 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Sat, 30 Mar 2019 11:49:38 +0800 Subject: [PATCH 2/5] Update SAMPLE.yml --- data/devices/SAMPLE.yml | 61 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/data/devices/SAMPLE.yml b/data/devices/SAMPLE.yml index 79dc8f7a3..685fa94ec 100644 --- a/data/devices/SAMPLE.yml +++ b/data/devices/SAMPLE.yml @@ -63,12 +63,63 @@ # listed here cannot be touched by a ROM's installer. extra: # - /dev/block/platform/msm_sdcc.1/by-name/aboot - - /dev/block/platform/soc - - /dev/block/platform/soc/7c4000.sdhci - - /dev/block/platform/soc/7c4000.sdhci/by-name + - /dev/block/platform/soc/7c4000.sdhci/by-name/abl - /dev/block/platform/soc/7c4000.sdhci/by-name/alterable - /dev/block/platform/soc/7c4000.sdhci/by-name/aop + - /dev/block/platform/soc/7c4000.sdhci/by-name/apdp + - /dev/block/platform/soc/7c4000.sdhci/by-name/bluetooth + - /dev/block/platform/soc/7c4000.sdhci/by-name/boot + - /dev/block/platform/soc/7c4000.sdhci/by-name/cache + - /dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib + - /dev/block/platform/soc/7c4000.sdhci/by-name/cmnlib64 + - /dev/block/platform/soc/7c4000.sdhci/by-name/ddr + - /dev/block/platform/soc/7c4000.sdhci/by-name/devcfg + - /dev/block/platform/soc/7c4000.sdhci/by-name/devinfo + - /dev/block/platform/soc/7c4000.sdhci/by-name/dip + - /dev/block/platform/soc/7c4000.sdhci/by-name/dpo + - /dev/block/platform/soc/7c4000.sdhci/by-name/dsp + - /dev/block/platform/soc/7c4000.sdhci/by-name/dtbo + - /dev/block/platform/soc/7c4000.sdhci/by-name/factory + - /dev/block/platform/soc/7c4000.sdhci/by-name/factory_bak + - /dev/block/platform/soc/7c4000.sdhci/by-name/frp + - /dev/block/platform/soc/7c4000.sdhci/by-name/fsc + - /dev/block/platform/soc/7c4000.sdhci/by-name/fsg + - /dev/block/platform/soc/7c4000.sdhci/by-name/fsg1 + - /dev/block/platform/soc/7c4000.sdhci/by-name/fsg2 + - /dev/block/platform/soc/7c4000.sdhci/by-name/hyp + - /dev/block/platform/soc/7c4000.sdhci/by-name/keymaster + - /dev/block/platform/soc/7c4000.sdhci/by-name/keystore + - /dev/block/platform/soc/7c4000.sdhci/by-name/klogdump + - /dev/block/platform/soc/7c4000.sdhci/by-name/limits + - /dev/block/platform/soc/7c4000.sdhci/by-name/logdump + - /dev/block/platform/soc/7c4000.sdhci/by-name/logfs + - /dev/block/platform/soc/7c4000.sdhci/by-name/misc + - /dev/block/platform/soc/7c4000.sdhci/by-name/modem + - /dev/block/platform/soc/7c4000.sdhci/by-name/modemst1 + - /dev/block/platform/soc/7c4000.sdhci/by-name/modemst2 + - /dev/block/platform/soc/7c4000.sdhci/by-name/msadp + - /dev/block/platform/soc/7c4000.sdhci/by-name/persist + - /dev/block/platform/soc/7c4000.sdhci/by-name/qupfw + - /dev/block/platform/soc/7c4000.sdhci/by-name/ramdump + - /dev/block/platform/soc/7c4000.sdhci/by-name/rawdump + - /dev/block/platform/soc/7c4000.sdhci/by-name/recovery + - /dev/block/platform/soc/7c4000.sdhci/by-name/sec + - /dev/block/platform/soc/7c4000.sdhci/by-name/splash + - /dev/block/platform/soc/7c4000.sdhci/by-name/spunvm + - /dev/block/platform/soc/7c4000.sdhci/by-name/ssd + - /dev/block/platform/soc/7c4000.sdhci/by-name/sti + - /dev/block/platform/soc/7c4000.sdhci/by-name/storsec + - /dev/block/platform/soc/7c4000.sdhci/by-name/system + - /dev/block/platform/soc/7c4000.sdhci/by-name/toolsfv + - /dev/block/platform/soc/7c4000.sdhci/by-name/tz + - /dev/block/platform/soc/7c4000.sdhci/by-name/userdata + - /dev/block/platform/soc/7c4000.sdhci/by-name/vbmeta + - /dev/block/platform/soc/7c4000.sdhci/by-name/vendor + - /dev/block/platform/soc/7c4000.sdhci/by-name/xbl + - /dev/block/platform/soc/7c4000.sdhci/by-name/xbl_config + + # Boot UI section (optional). boot_ui: @@ -108,7 +159,7 @@ # - RGBX_8888 # - BGRA_8888 # - RGBA_8888 - pixel_format: DEFAULT + pixel_format: RGBA_8888 # TWRP force pixel format (optional). # @@ -127,7 +178,7 @@ default_y_offset: 0 # TWRP brightness sysfs path (optional). - brightness_path: '/sys/...' + brightness_path: '/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/backlight/panel0-backlight/brightness' # TWRP secondary brightness sysfs path (optional). secondary_brightness_path: '/sys/...' From 077c5e18f34e43ab92817a6f1900989127eb3054 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Sat, 30 Mar 2019 11:53:42 +0800 Subject: [PATCH 3/5] 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 e66a4fd5abb4aa300fe66b5f601b5c5564c26aad Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Sat, 30 Mar 2019 11:56:39 +0800 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84492af4f..1d4cfc1e7 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 ${TRAVIS_BUILD_DIR}/DualBootPatcher/ # Pull docker images - docker pull yshalsager/dualbootpatcher:9.3.0-4-base - docker pull yshalsager/dualbootpatcher:9.3.0-4-android From 108383eafeeb07a1964e4905a34ee2e734a6f669 Mon Sep 17 00:00:00 2001 From: gfzhy <1099205351@qq.com> Date: Sat, 30 Mar 2019 12:19:23 +0800 Subject: [PATCH 5/5] Update SAMPLE.yml --- data/devices/SAMPLE.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/devices/SAMPLE.yml b/data/devices/SAMPLE.yml index 685fa94ec..4c90c0a92 100644 --- a/data/devices/SAMPLE.yml +++ b/data/devices/SAMPLE.yml @@ -181,7 +181,7 @@ brightness_path: '/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/backlight/panel0-backlight/brightness' # TWRP secondary brightness sysfs path (optional). - secondary_brightness_path: '/sys/...' + #secondary_brightness_path: '/sys/...' # TWRP max brightness (optional). max_brightness: 255 @@ -190,16 +190,16 @@ default_brightness: 128 # TWRP battery sysfs path (optional). - battery_path: '/sys/...' + # battery_path: '/sys/...' # TWRP CPU temperature sys path (optional). - cpu_temp_path: '/sys/...' + # cpu_temp_path: '/sys/...' # TWRP input device blacklist (optional). - input_blacklist: '' + # input_blacklist: '' # TWRP input device whitelist (optional). - input_whitelist: '' + # input_whitelist: '' # TWRP graphics backend list (required). #