FORUMS
Remove All Ads from XDA

[REFERENCE] Merge latest CAF Tag in Kernel

1,275 posts
Thanks Meter: 2,798
 
Post Reply Email Thread
Introduction:
Hello folks! In this thread I will be guiding you about how you can merge latest CAF tags in your CAF based kernel. Many people who just started compiling the kernels still don't know how to merge a CAF tag because there isn't any proper guide available. I will try to make the guide as simple as possible.

What is CAF?
Code Aurora, a Linux Foundation Collaborative project. that host the tested open source code needed to provide upstream enablement for innovative, performance optimized support for system on a chip (SoC) products and related ecosystems, and also serves as a staging area for code that is submitted to upstream projects such as the Linux kernel and Android.

This thread is inspired from @nathanchance's linux version upstreaming thread!


Requirements:
  • You should know how to compile a kernel
  • The kernel should be for a Qualcomm device obviously
  • You should know the CAF tag you kernel is currently on
  • You should know basic stuffs of Git like commit, push, fixing conflicts etc.
  • You should know the chipset of your device
  • You should know your kernel version like 3.18.y, 4.4.y etc.

Instructions:
  • Open this link ( https://wiki.codeaurora.org/xwiki/bin/QAEP/release ) in your browser.
  • Check for the chipset and the Android version here. Find the caf tag your device is on. Like in my case My device is Redmi Note 4 and it has msm8953 chipset and my kernel is for Android 8.1. So now I can easily know that which CAF tag I have to merge. In my case my kernel was on LA.UM.6.6.r1-07400-89xx.0 tag. The newer tag is LA.UM.6.6.r1-08300-89xx.0
  • Now you know which CAF tag you need to merge. Open your terminal and change the directory to your kernel directory.
  • Copy the URL from this list according to your kernel version. In my case the kernel version is 3.18 so I will copy the 3.18 URL.
    Code:
    3.10 -> https://source.codeaurora.org/quic/la/kernel/msm-3.10/
    3.18 -> https://source.codeaurora.org/quic/la/kernel/msm-3.18/
    4.4 -> https://source.codeaurora.org/quic/la/kernel/msm-4.4/
  • In terminal type git fetch <repo link> <tag> and paste the url in place of <repo link>and also the CAF tag you want to merge, in place of <tag>, just like given below and hit enter. It will fetch the tag. It will take some time depending on your internet speed.
    Code:
    git fetch https://source.codeaurora.org/quic/la/kernel/msm-3.18/ LA.UM.6.6.r1-08300-89xx.0
  • After fetching the tag, type below line and hit enter.
    Code:
    git merge FETCH_HEAD
  • Now you will see that your tag is being merged successfully. If it gets some conflicts then fix the conflicts and complete the merge by following commands.
    Code:
    git add .
    git commit
  • After successfully merging the CAF tag, just push it to your github repository.
    Code:
    git push

Congratulations! You have successfully merged latest CAF tag in your kernel.


Tips:
  • Test each CAF tag
  • Do not multiple tags at once without testing the previous one
  • Bookmark all the links from this thread, even this thread.

Support & Help:
If you have any problem then post here. Do not PM me. I will not help you there. You can join the Telegram group for quick support and help.
You can also follow me on:
The Following 17 Users Say Thank You to LordArcadius For This Useful Post: [ View ] Gift LordArcadius Ad-Free
 
 
8th May 2018, 09:44 PM |#2  
LordArcadius's Avatar
OP Senior Member
Flag Delhi
Thanks Meter: 2,798
 
Donate to Me
More
Reserved
The Following 2 Users Say Thank You to LordArcadius For This Useful Post: [ View ] Gift LordArcadius Ad-Free
9th May 2018, 05:34 AM |#3  
Account currently disabled
Flag The Matrix
Thanks Meter: 459
 
More
;_; wew
The Following User Says Thank You to [email protected]_ For This Useful Post: [ View ] Gift [email protected]_ Ad-Free
9th May 2018, 07:02 AM |#4  
Senior Member
Flag chennai
Thanks Meter: 641
 
Donate to Me
More
Nice work
10th May 2018, 10:14 AM |#5  
Ayushd70's Avatar
Senior Member
Flag kolkata
Thanks Meter: 296
 
More
WEW PRo Sir
3rd June 2018, 12:17 PM |#6  
Englezos's Avatar
Senior Member
Thanks Meter: 691
 
Donate to Me
More
How do I know what is my current kernel CAF version? Or i just fetch the latest and everything is updated.
10th June 2018, 08:15 AM |#7  
LordArcadius's Avatar
OP Senior Member
Flag Delhi
Thanks Meter: 2,798
 
Donate to Me
More
Quote:
Originally Posted by [email protected]_

;_; wew

;_;
Quote:
Originally Posted by arunassain

Nice work

Thanks mate.
Quote:
Originally Posted by Ayushd70

WEW PRo Sir

NoU
Quote:
Originally Posted by Englezos

How do I know what is my current kernel CAF version? Or i just fetch the latest and everything is updated.

Check your commit history.
21st October 2018, 11:34 PM |#8  
pvineeth97's Avatar
Senior Member
Flag St. Louis
Thanks Meter: 912
 
Donate to Me
More
Quote:
Originally Posted by LordArcadius

;_;

Thanks mate.

NoU

Check your commit history.


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.
The Following User Says Thank You to pvineeth97 For This Useful Post: [ View ] Gift pvineeth97 Ad-Free
18th November 2018, 08:05 AM |#9  
Recognized Developer
Thanks Meter: 943
 
Donate to Me
More
How do I merge updated prima drivers?
5th December 2018, 02:26 PM |#10  
Junior Member
Thanks Meter: 0
 
More
thanks for your guide,i need it haha
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?
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