I would like to know the procedure in how to merge a newer build of android kernel into my github project.
For example: I built a kernel built on android 5.1.0 kernel sources. For example: I want to merge the newer kernel sources for android 5.1.1 into my kernel built on 5.1.0.
"Merge branch 'android-msm-hammerhead-3.4-lollipop-mr1' into lollipop-mr1"
Standard git merge...
1. Checkout your git repo
Code:
git clone <your repo> -b <your branch>
(in your example above, <your branch> = 'lollipop-mr1')
2. Go to that directory
Code:
cd <checkout dir>
3. Add upstream kernel source as a remote repository
Code:
git remote add upstream <upstream kernel repo>
git fetch upstream
4. Checkout the upstream branch you want to merge
Code:
git checkout <upstream branch>
(in your example above, <upstream branch> = 'android-msm-hammerhead-3.4-lollipop-mr1')
5. Checkout your branch
Code:
git checkout <your branch>
6. Merge the upstream branch
Code:
git merge <upstream branch>
7a. If you have no conflicts, push the changes
Code:
git push
7b. If you have conflicts, resolve all the conflicts and the push the changes
Code:
git commit -a
git push
Hope this helps
Related
There's a bunch of new updates for the Linux 3.0 kernel specific to OMAP up on the Android Source GIT.
[ New User can't post link to the Android Source GIT ]
Be intersting to see if some of this can make it into a Motorola update.
Information from G+
CM 11 Manifest is up
repo init -u git:// github.com/CyanogenMod/android.git -b cm-11.0
Proceed with caution. The phone you brick could be your own.
Code:
# I am not responsible for anything that this code does to your device
# I've run it on my device at least once, but my device is NOT your device
# Don't blame me if your tablet becomes a cyborg, eats your cat, or destroys the world.
# Or just stops booting.
#
# Don't forget that this voids your warranty. If you still have one.
I'm working on merging all the fixes for the linux kernel into Samsung's source code.
If you don't know how to build the kernel, this project is NOT for you. But have a recovery image anyway. Its the stock with only the kernel replaced, but that's so I have a stable development platform.
Features
* git history (mostly done via looking at the Makefile and copying everything over the source tree)
* Easier upgrades to newer minor releases (3.4.XX)
Installation
$ adb reboot download
$ heimdall flash --RECOVERY ${PATH_TO_RECOVERY_IMG}
Basic workflow:
# git merge v3.4.xx -- I'm doing it this way so that the changeset between builds is manageable (kind of).
# fix up compilation errors (show breaking) and then replace zImage in Samsung's recovery image. See if it boots into recovery.
# Reboot into regular mode, pull /proc/last_kmsg and check kernel version.
Notes:
Requires that gcc 4.6 is used
linux cannot be in the directory path (gets replaced with "1" by the graphics source code)
Doesn't work with repo. Sorry. I like gitlab better than github, even though I have accounts on both.
Changelog:
v3.4.67-lt02wifi:
Updated to android-3.4 master
[new] Modified ion code (took upstream code, for most part -- main exception is we used "heaps[]" instead of "*heaps"
[new] Marvell drivers can now be built into the kernel (obj-m -> obj-$(CONFIG_WHATEVER))
[fixed] CVE-2015-1805
[fixed] Most kernel CVE's
v3.4.34-samsung:
Updated to v3.4.34 from v3.4.11
[new] Completely replaced net/ipv{4,6} code
v3.4.11-samsung:
Updated to v3.4.11 linux stable source
v3.4.10-samsung:
[new] Updated to v3.4.10 from v3.4.5 stock sources
[fixed] kernel/timeconst.pl (cherry-pick from android-3.4)
Downloads
Kernel source code: https://gitlab.com/sm-t210r/android_kernel_samsung_lt02
Device Tree (not dtb): https://gitlab.com/sm-t210r/android_device_samsung_lt02wifi -- mostly using this to keep track of mainlined kernel modules.
FAQ
Can I build with a GCC version other than 4.6? No
Can I have a directory called "linux" anywhere in the project path? No. One of the vendor modules replaces "linux" with "1".
Can I use the git repo in a local manifest? No. There's a bug in gitlab that prevents this. Hopefully its fixed soonish. For now, just use git clone.
Click to expand...
Click to collapse
Thanks To/Credits
Code:
* Samsung. Even though they are required to release the source upon request.
* The various Linux kernel contributors over the years
* Everyone else who has worked on this device (even if I haven't used their work)
XDA:DevDB Information
Vorpalblade Kernel Updating, Kernel for the Samsung Galaxy Tab 3 7.0
Contributors
vorpalblade77
Source Code: https://gitlab.com/sm-t210r/android_kernel_samsung_lt02
Kernel Special Features:
Version Information
Status: Testing
Current Stable Version: v3.4.5-samsung
Stable Release Date: 2015-12-09
Current Beta Version: v3.4.67-lt02wifi
Beta Release Date: 2016-03-26
Created 2016-03-11
Last Updated 2016-03-26
Reserved
Reserved
Hi, I am trying to build a ROM, but I have hit this error, while pulling propriety blobs "[email protected]:~/android$ ./extract-files.sh ~/android/system_dump/ -bash: ./extract-files.sh: No such file or directory"
This would be the first time I will be building a ROM, please be elaborate.
You can get those proprietary blobs from The GitHub . It is available in TheMuppets GitHub ( Vendor) and LineageOS GitHub ( Kernel , Device Tree ) if you're okay to download them
I was compiling AICP for Oxygen (Mi Max 2) and got an error.
Can anyone please help me?
Source
Device Tree branch arrow-9.x
Vendor Blob branch lineage-16.0
Device Common branch 9.0-4.9
Kernel Source branch pie_final