Pulling with custom changes

demontefacto · November 25, 2020, 8:11am

Hello,

I would like ask you:

I'm compiling openwrt by myself and I have a lot of custom changes in openwrt base/kernel... These changes are not compatible with base OpenWrt and developers dont want them in main openwrt tree
BUT
I would like have the possibility to update openwrt to latest version. How to handle these custom changes?

Thx.

lantis1008 · November 25, 2020, 8:50am

Write them all as patches, and wrap the build environment in a pre-build script which downloads, patches, then builds.

This is how the Gargoyle build system works

github.com

ericpaulbishop/gargoyle/blob/master/build.sh

#!/bin/bash


set_constant_variables()
{
	#working directories
	scriptpath="$(readlink -f "$0")"
	top_dir="${scriptpath%/${0##*/}}"
	targets_dir="$top_dir/targets"
	patches_dir="$top_dir/patches-generic"
	compress_js_dir="$top_dir/compressed_javascript"
	compress_css_dir="$top_dir/compressed_css"
	
	node_version_tag="v10.19.0"
	npm_version_tag="v6.14.4"


	#script for building netfilter patches
	netfilter_patch_script="$top_dir/netfilter-match-modules/integrate_netfilter_modules.sh"

This file has been truncated. show original

There's a lot of stuff you won't need in that script, but the core idea is applicable.

demontefacto · November 25, 2020, 8:54am

Thanks for hint. I'll try dig into it

Grommish · November 26, 2020, 1:43am

I don't ever do a straight git pull - I use git fetch and git rebase. This bounces all of my local commits to tip of the branch.