vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: T861: remove superfluous architecture from Kernel string

Browse Source
This commit is contained in:
Christian Breunig 2024-09-04 21:13:49 +02:00
parent ae3e89deea
commit fd7d1d0d20
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/architectures/amd64.toml
View File

@ -2,8 +2,6 @@ additional_repositories = [
"deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main" "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main"
] ]
kernel_flavor = "amd64-vyos"
# Packages added to images for x86 by default # Packages added to images for x86 by default
packages = [ packages = [
"grub2", "grub2",

2
data/architectures/arm64.toml
View File

@ -2,8 +2,6 @@ additional_repositories = [
"deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main" "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main"
] ]
kernel_flavor = "arm64-vyos"
# Packages included in ARM64 images by default # Packages included in ARM64 images by default
packages = [ packages = [
"grub-efi-arm64", "grub-efi-arm64",

1
data/defaults.toml
View File

@ -15,6 +15,7 @@ vyos_branch = "current"
release_train = "current" release_train = "current"
kernel_version = "6.6.49" kernel_version = "6.6.49"
kernel_flavor = "vyos"
bootloaders = "syslinux,grub-efi" bootloaders = "syslinux,grub-efi"
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"

3
packages/linux-kernel/build-jool.py
View File

@ -29,9 +29,8 @@ def add_depends(package_dir: str, package_name: str,
# find kernel version and source path # find kernel version and source path
arch: str = find_arch() arch: str = find_arch()
defaults_file: str = Path('../../data/defaults.toml').read_text() 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_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' KERNEL_SRC: str = Path.cwd().as_posix() + '/linux'
# define variables # define variables

2
packages/linux-kernel/build-kernel.sh
View File

@ -18,7 +18,7 @@ echo "I: clean modified files"
git reset --hard HEAD git reset --hard HEAD
KERNEL_VERSION=$(make kernelversion) 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 # VyOS requires some small Kernel Patches - apply them here
# It's easier to habe them here and make use of the upstream # It's easier to habe them here and make use of the upstream

9
scripts/check-qemu-install
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# #
# Copyright (C) 2019-2023, VyOS maintainers and contributors # Copyright (C) 2019-2024, VyOS maintainers and contributors
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as # it under the terms of the GNU General Public License version 2 or later as
@ -47,6 +47,8 @@ import tomli
from io import BytesIO from io import BytesIO
from io import StringIO from io import StringIO
from datetime import datetime from datetime import datetime
from pathlib import Path
from tomllib import loads as toml_loads
EXCEPTION = 0 EXCEPTION = 0
now = datetime.now() now = datetime.now()
@ -416,8 +418,11 @@ try:
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show version') c.sendline('show version')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show version kernel') c.sendline('show version kernel')
c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["architecture"]}-vyos') kernel_flavor = toml_loads(Path('data/architectures/amd64.toml').read_text()).get('kernel_flavor')
c.expect(f'{vyos_defaults["kernel_version"]}-{kernel_flavor}')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show version frr') c.sendline('show version frr')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)