diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-04 21:13:49 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-09-07 21:31:46 +0200 |
| commit | fd7d1d0d208f5857d84f1bc48577ff775a67b823 (patch) | |
| tree | 1bc41376624394fc4d9f6bc940bacb7e1ba60115 /packages/linux-kernel | |
| parent | ae3e89deeaf80eb2457aa9235e19e9da1fb2f1ad (diff) | |
| download | vyos-build-fd7d1d0d208f5857d84f1bc48577ff775a67b823.tar.gz vyos-build-fd7d1d0d208f5857d84f1bc48577ff775a67b823.zip | |
Kernel: T861: remove superfluous architecture from Kernel string
Diffstat (limited to 'packages/linux-kernel')
| -rwxr-xr-x | packages/linux-kernel/build-jool.py | 3 | ||||
| -rwxr-xr-x | packages/linux-kernel/build-kernel.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/linux-kernel/build-jool.py b/packages/linux-kernel/build-jool.py index 1781a6c8..3f8fd3a5 100755 --- a/packages/linux-kernel/build-jool.py +++ b/packages/linux-kernel/build-jool.py @@ -29,9 +29,8 @@ def add_depends(package_dir: str, package_name: str, # find kernel version and source path arch: str = find_arch() defaults_file: str = Path('../../data/defaults.toml').read_text() -architecture_file: str = Path(f'../../data/architectures/{arch}.toml').read_text() KERNEL_VER: str = toml_loads(defaults_file).get('kernel_version') -KERNEL_FLAVOR: str = toml_loads(architecture_file).get('kernel_flavor') +KERNEL_FLAVOR: str = toml_loads(defaults_file).get('kernel_flavor') KERNEL_SRC: str = Path.cwd().as_posix() + '/linux' # define variables diff --git a/packages/linux-kernel/build-kernel.sh b/packages/linux-kernel/build-kernel.sh index 2c02f5c3..c0a863c6 100755 --- a/packages/linux-kernel/build-kernel.sh +++ b/packages/linux-kernel/build-kernel.sh @@ -18,7 +18,7 @@ echo "I: clean modified files" git reset --hard HEAD KERNEL_VERSION=$(make kernelversion) -KERNEL_SUFFIX=-$(dpkg --print-architecture)-vyos +KERNEL_SUFFIX=-$(awk -F "= " '/kernel_flavor/ {print $2}' ../../../data/defaults.toml | tr -d \") # VyOS requires some small Kernel Patches - apply them here # It's easier to habe them here and make use of the upstream |