Updating Kernel

For Developers
1

HI,

when you updating kerrnel from https://github.com/openwrt/openwrt/pulls
ie; kernel: bump 5.10 to 5.10.165 do you use patch -p1 < exemple.patch or maybe git am works ?

git am exemple.patch
2

I just copy the patches into <buildroot> and run git am *.patch

1 Like
3

I assume you could also just add .patch to the end of the URL to get a unified diff of all changes and apply that.

2 Likes
4

yes always what I do,

ie;

wget https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/11880.patch

I tought it was the thing to do?
@RuralRoots

1 Like
5

and maybe more complex, if I've updated 2 times the kernel
5.10.163 and .164, after that the stable build is updating to .164, when I git pull on my build, there will be a conflict, right?

6

You can even script it:

I like to make a new branch first though so you do not pollute master:

#!/bin/bash

# 11004 NEEDED FOR REDMI
# 11194 harden dropbear
main=(
  11004
  11194
)

if (( ${#main[@]} != 0 )); then
  for i in "${main[@]}"; do
    git pull origin pull/"$i"/head --no-edit
  done
fi
4 Likes
7

maybe i'm wrong but

fatal: couldn't find remote ref pull/11004/head
fatal: couldn't find remote ref pull/11194/head
8

Maybe my .git/config is different from yours

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = https://github.com/openwrt/openwrt.git
        fetch = +refs/heads/*:refs/remotes/origin/*
9

same + that;

[branch "master"]
	remote = origin
	merge = refs/heads/master
10 
git fetch origin
git checkout master
git rebase origin/master

Then run the script (or add those lines to the script)

1 Like
11

but that is to update master not about patch and update kernel from pull request github?

12

weird, still have it

Already on 'master'
Your branch is up to date with 'origin/master'.
Current branch master is up to date.
fatal: couldn't find remote ref pull/11004/head
fatal: couldn't find remote ref pull/11194/head
13

I wamted to update the kernel, the 5.10.161 to .165 they work except the .163.

.162, 164,165 are ok, but .163 does not