Skip to content

Instantly share code, notes, and snippets.

@Claymore1297
Last active April 21, 2024 14:48
Show Gist options
  • Save Claymore1297/0fa68afb11725c1edd1f3372cd3bb52c to your computer and use it in GitHub Desktop.
Save Claymore1297/0fa68afb11725c1edd1f3372cd3bb52c to your computer and use it in GitHub Desktop.
Merging needed Motorola additions into MMI-T1SSMS33.1-121-4-8 kernel
git remote add -f techpack-camera https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-camera
git merge -s ours --no-commit techpack-camera/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/camera -u techpack-camera/android-13-release-t1rd33.116-33-3
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-camera/android-13-release-t1rd33.116-33-3"
# camera
git remote add -f techpack-camera_local /home/julian/git_Sandbox/misc/kernel-msm-5.4-techpack-camera
git merge -s ours --no-commit techpack-camera_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/camera -u techpack-camera_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-camera/releases/tag/MMI-T1SSMS33.1-121-4-8"
# audio
git remote add -f techpack-audio_local /home/julian/git_Sandbox/misc/kernel-msm-5.4-techpack-audio
git merge -s ours --no-commit techpack-audio_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/audio -u techpack-audio_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-audio/releases/tag/MMI-T1SSMS33.1-121-4-8"
# video
git remote add -f techpack-video_local /home/julian/git_Sandbox/misc/kernel-msm-5.4-techpack-video
git merge -s ours --no-commit techpack-video_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/video -u techpack-video_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-video/releases/tag/MMI-T1SSMS33.1-121-4-8"
# display
git remote add -f techpack-display_local /home/julian/git_Sandbox/misc/kernel-msm-5.4-techpack-display
git merge -s ours --no-commit techpack-display_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/display -u techpack-display_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-display/releases/tag/MMI-T1SSMS33.1-121-4-8"
# dataipa
git remote add -f techpack-dataipa_local /home/julian/git_Sandbox/misc/kernel-msm-techpack-dataipa
git merge -s ours --no-commit techpack-dataipa_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/dataipa -u techpack-dataipa_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-techpack-dataipa/releases/tag/MMI-T1SSMS33.1-121-4-8"
# datarmnet-ext
git remote add -f techpack-datarmnet-ext_local /home/julian/git_Sandbox/misc/vendor-qcom-opensource-datarmnet-ext
git merge -s ours --no-commit techpack-datarmnet-ext_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/datarmnet-ext -u techpack-datarmnet-ext_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-techpack-datarmnet-ext/releases/tag/MMI-T1SSMS33.1-121-4-8"
# datarmnet
git remote add -f techpack-datarmnet_local /home/julian/git_Sandbox/misc/vendor-qcom-opensource-datarmnet
git merge -s ours --no-commit techpack-datarmnet_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=techpack/datarmnet -u techpack-datarmnet_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-msm-techpack-datarmnet/releases/tag/MMI-T1SSMS33.1-121-4-8"
# kernel-devicetree
git remote add -f kernel-devicetree_local /home/julian/git_Sandbox/misc/kernel-devicetree
git merge -s ours --no-commit kernel-devicetree_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=arch/arm64/boot/dts/vendor -u kernel-devicetree_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-devicetree/releases/tag/MMI-T1SSMS33.1-121-4-8"
# kernel-camera-devicetree
git remote add -f kernel-camera-devicetree_local /home/julian/git_Sandbox/misc/kernel-camera-devicetree
git merge -s ours --no-commit kernel-camera-devicetree_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=arch/arm64/boot/dts/vendor/qcom/camera -u kernel-camera-devicetree_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-camera-devicetree/releases/tag/MMI-T1SSMS33.1-121-4-8"
# kernel-display-displaytree
git remote add -f kernel-display-devicetree_local /home/julian/git_Sandbox/misc/kernel-display-devicetree
git merge -s ours --no-commit kernel-display-devicetree_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=arch/arm64/boot/dts/vendor/qcom -u kernel-display-devicetree_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/kernel-display-devicetree/releases/tag/MMI-T1SSMS33.1-121-4-8"
# motorola-kernel-modules
git merge origin/motorola-kernel-modules-MMI-T1SSMS33.1-121-4-8 --allow-unrelated-histories
# wlan-qcacld-3.0
git remote add -f vendor-qcom-opensource-wlan-qcacld-3.0_local /home/julian/git_Sandbox/misc/vendor-qcom-opensource-wlan-qcacld-3.0
git merge -s ours --no-commit vendor-qcom-opensource-wlan-qcacld-3.0_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=drivers/staging/qcacld-3.0 -u vendor-qcom-opensource-wlan-qcacld-3.0_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-qcacld-3.0/releases/tag/MMI-T1SSMS33.1-121-4-8"
# wlan-fw-api
git remote add -f vendor-qcom-opensource-wlan-fw-api_local /home/julian/git_Sandbox/misc/vendor-qcom-opensource-wlan-fw-api
git merge -s ours --no-commit vendor-qcom-opensource-wlan-fw-api_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=drivers/staging/fw-api -u vendor-qcom-opensource-wlan-fw-api_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-fw-api/releases/tag/MMI-T1SSMS33.1-121-4-8"
# wlan-qca-wifi-host-cmn
git remote add -f vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local /home/julian/git_Sandbox/misc/vendor-qcom-opensource-wlan-qca-wifi-host-cmn
git merge -s ours --no-commit vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local/MMI-T1SSMS33.1-121-4-8
git read-tree --prefix=drivers/staging/qca-wifi-host-cmn -u vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local/MMI-T1SSMS33.1-121-4-8
git commit -m "Add https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-qca-wifi-host-cmn/releases/tag/MMI-T1SSMS33.1-121-4-8"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment