FORUMS
Remove All Ads from XDA

[REFERENCE] Merge latest CAF Tag in Kernel

1,275 posts
Thanks Meter: 2,799
 
Post Reply Email Thread
12th January 2019, 06:29 PM |#11  
onliner's Avatar
Senior Member
Flag Queens
Thanks Meter: 830
 
More
Thanks for this guide @LordArcadius, but I have some doubts:

- With this form, the commit "merge tag xxx into xxx" doesn't show as a description the complete list of commits that have been made in the merge, how can I show the complete list?
- Some devices have extra modules that are found in other branches of the caf kernel, for example: fw-api, qcacld-3.0, qca-wifi-host-cmn, how can I merge that too?
 
 
12th January 2019, 06:38 PM |#12  
LordArcadius's Avatar
OP Senior Member
Flag Delhi
Thanks Meter: 2,799
 
Donate to Me
More
Quote:
Originally Posted by pascua28

How do I merge updated prima drivers?

Use this repo: https://source.codeaurora.org/quic/l...ce/wlan/prima/
Quote:
Originally Posted by onliner

Thanks for this guide @LordArcadius, but I have some doubts:

- With this form, the commit "merge tag xxx into xxx" doesn't show as a description the complete list of commits that have been made in the merge, how can I show the complete list?
- Some devices have extra modules that are found in other branches of the caf kernel, for example: fw-api, qcacld-3.0, qca-wifi-host-cmn, how can I merge that too?

Sorry but I don't know the answer of first question. Will let you know soon. For upstreaming things like qcacld you have to use their repos. LIke in case of qcacld here it is: https://source.codeaurora.org/quic/l...an/qcacld-3.0/
12th January 2019, 07:12 PM |#13  
onliner's Avatar
Senior Member
Flag Queens
Thanks Meter: 830
 
More
Quote:
Originally Posted by LordArcadius

Sorry but I don't know the answer of first question. Will let you know soon. For upstreaming things like qcacld you have to use their repos. LIke in case of qcacld here it is: https://source.codeaurora.org/quic/l...an/qcacld-3.0/

After reading some guides, watching some videos and reading information in the linux kernel chat, I managed to do it by myself, here is an example with smd600 in case someone needs the info:


- qcacld-3.0
First merge:
Code:
git remote add qcacld https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0
git fetch qcacld <tag_to_merge> (In my case was: LA.UM.7.2.r1-05800-sdm660.0 )
git merge -s ours --no-commit FETCH_HEAD --allow-unrelated-histories
git read-tree --prefix=drivers/staging/qcacld-3.0 -u FETCH_HEAD
git commit
Updates:
Code:
git fetch qcacld <the_new_tag>
git merge -X subtree=drivers/staging/qcacld-3.0 FETCH_HEAD
- fw-api:
First merge:
Code:
git remote add fw-api https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api
git fetch fw-api <tag_to_merge> (In my case was: LA.UM.7.2.r1-05800-sdm660.0 )
git merge -s ours --no-commit FETCH_HEAD --allow-unrelated-histories
git read-tree --prefix=drivers/staging/fw-api -u FETCH_HEAD
git commit
Updates:
Code:
git fetch fw-api <the_new_tag>
git merge -X subtree=drivers/staging/fw-api FETCH_HEAD

- qca-wifi-host-cmn:
First merge:
Code:
git remote add qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn
git fetch qca-wifi-host-cmn <tag_to_merge> (In my case was: LA.UM.7.2.r1-05800-sdm660.0 )
git merge -s ours --no-commit FETCH_HEAD --allow-unrelated-histories
git read-tree --prefix=drivers/staging/qca-wifi-host-cmn -u FETCH_HEAD
git commit
Updates:
Code:
git fetch qca-wifi-host-cmn <the_new_tag>
git merge -X subtree=drivers/staging/qca-wifi-host-cmn FETCH_HEAD
The Following 4 Users Say Thank You to onliner For This Useful Post: [ View ] Gift onliner Ad-Free
30th January 2019, 02:54 PM |#14  
widi aprianto's Avatar
Member
Flag Banjarnegara
Thanks Meter: 35
 
More
Ask
How to make this kernel https://github.com/LineageOS/android...xiaomi_msm8953 can be use for xiami redmi 5 plus/vince ??? Thx before
9th May 2019, 12:01 PM |#15  
Junior Member
Thanks Meter: 4
 
More
Current CAF tag version
Can someone tell me how to check what is the current CAF version my kernel is on?I am currently on stock ROM and i have no idea how to check
The Following User Says Thank You to rath007 For This Useful Post: [ View ] Gift rath007 Ad-Free
11th May 2019, 06:50 PM |#16  
SyberHexen's Avatar
Senior Member
Flag Washington
Thanks Meter: 212
 
More
After merging CAF Tags for wlan related the WiFi driver wasn't loading

To solve I had to make device tree changes

https://github.com/SyberHexen/havoc_...cea027b8970947

But if there is a more correct way to achieve this just in the kernel I'd enjoy the knowledge as I can't share my kernel to different roms.
13th May 2019, 03:41 AM |#17  
Recognized Developer
Thanks Meter: 943
 
Donate to Me
More
Quote:
Originally Posted by rath007

Can someone tell me how to check what is the current CAF version my kernel is on?I am currently on stock ROM and i have no idea how to check

Go to /firmware/verinfo and open verinfo.txt
15th May 2019, 03:47 PM |#18  
Junior Member
Thanks Meter: 0
 
More
Quote:
Originally Posted by rath007

Can someone tell me how to check what is the current CAF version my kernel is on?I am currently on stock ROM and i have no idea how to check

Did you find out how to do it?

---------- Post added at 03:47 PM ---------- Previous post was at 03:46 PM ----------

Quote:
Originally Posted by pvineeth97

How to get to know CAF tag the OEM used? LG doesn't provide any commit history. It just uploads the kernel in ZIP files.

Hi, even I have this problem. Did you find a way to check the CAF tag of OEM?
Thanks
16th May 2019, 07:55 AM |#19  
pvineeth97's Avatar
Senior Member
Flag St. Louis
Thanks Meter: 912
 
Donate to Me
More
Quote:
Originally Posted by hoenhind

Did you find out how to do it?

---------- Post added at 03:47 PM ---------- Previous post was at 03:46 PM ----------


Hi, even I have this problem. Did you find a way to check the CAF tag of OEM?
Thanks

https://github.com/PVineeth/dotfiles

Use: https://github.com/PVineeth/dotfiles...in/best_kernel
17th May 2019, 01:44 PM |#20  
Recognized Developer
Thanks Meter: 943
 
Donate to Me
More
Quote:
Originally Posted by hoenhind

Did you find out how to do it?

---------- Post added at 03:47 PM ---------- Previous post was at 03:46 PM ----------


Hi, even I have this problem. Did you find a way to check the CAF tag of OEM?
Thanks

Read my post above yours
Post Reply Subscribe to Thread

Tags
caf, caf kernel, caf tag, caf upstream, kernel

Guest Quick Reply (no urls or BBcode)
Message:
Previous Thread Next Thread
Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes