@ajudge I want to verify I’m doing all of this correctly.
I’m running in to an error on the initial kernel compile after cherry-picking commits. I’ll admit this is at the edge of my understanding and have previously done custom raspberrypi kernel compiling but only with enabling a few other features from within the .config file. I wish I could post a more specific error but the make just ends with an error occured with the Makefile. Do all these steps seem correct?
Steps I performed:
-
cd ~ git clone --branch stable_20250428 https://github.com/raspberrypi/linux cd linux -
git remote add morse https://github.com/MorseMicro/rpi-linux.git # from within ~/linux git fetch morse # from within ~/linux -
Looked at MorseMicro repo and saw you were 14 commits ahead the main linux repo so I started cherry-picking.
-
git cherry-pick a58e45bf88ee4c1eb540cffac23f141112631b76 -
git cherry-pick 8db61ec7a55c5b2651e02f41ad3e72c852e1b860 -
git cherry-pick 8cdeb90f9b06e6ebe521e5379efc38a492292b83 -
git cherry-pick 310b08f58d3514a0b8c1704c1727b915a8fc9d16 -
git cherry-pick 6f0fca77d0bf5be0ad3bbdda35560fe840f01e9c -
git cherry-pick 485d6678b5d1e0dc5b8232e96164f285891cfd8c -
git cherry-pick 000a77f5066813a8be18d39d414dfa59d97e7a01 -
git cherry-pick e89a4f1d00ad3f4527dae4700010a1ff89a09b42 # resolved conflict on 2 files-
You are currently cherry-picking commit e89a4f1d00ad. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: include/linux/ieee80211.h modified: net/mac80211/agg-rx.c modified: net/mac80211/agg-tx.c modified: net/mac80211/ht.c modified: net/mac80211/ieee80211_i.h modified: net/mac80211/iface.c modified: net/mac80211/rx.c modified: net/mac80211/sta_info.h Unmerged paths: (use "git add <file>..." to mark resolution) both modified: include/net/mac80211.h both modified: net/mac80211/debugfs.c
-
-
git cherry-pick af1d42caa061f834255784e4bec2ed6af3ff9301 -
git cherry-pick 9dcdb90f3069748544a9fd3b3bc7d5120c8a3e19 -
git cherry-pick 836aa308560cf2dcacca0c8d862b57c8f2f2cdd5 -
git cherry-pick 2ed640414ee93a0799168e65b28bc32be024c9cd -
git cherry-pick 87bb8f092477b11b5b9017f440f946be0381dade -
git cherry-pick f746aa8a795b1330f4664b9c46d558a614b7114d # resolved conflict on 1 file-
You are currently cherry-picking commit f746aa8a795b. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: net/mac80211/mesh.h modified: net/mac80211/mesh_pathtbl.c modified: net/mac80211/rx.c modified: net/wireless/mesh.c Unmerged paths: (use "git add <file>..." to mark resolution) both modified: net/mac80211/mesh_hwmp.c
-
-
-
Compile
-
make bcm2712_defconfig sed -r -i 's/CONFIG_LOCALVERSION=\"(.*)\"/CONFIG_LOCALVERSION=\"\1-morse\"/g' .config make -j6 Image.gz modules dtbs
-