diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-09-25 21:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-09-25 21:00:11 +0200 |
| commit | 1d7e6c42cb92dfbf57e9504f1648867b2264bc9c (patch) | |
| tree | 52f784802a4f799f68e777435db09e23107354c3 /scripts/package-build/linux-kernel/build-jool.py | |
| parent | 989ba3c04929db4754a6e042ba9614236607e78e (diff) | |
| parent | eff99f5eda19d5ddf324eb01abcc68577d942e62 (diff) | |
| download | vyos-build-1d7e6c42cb92dfbf57e9504f1648867b2264bc9c.tar.gz vyos-build-1d7e6c42cb92dfbf57e9504f1648867b2264bc9c.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'scripts/package-build/linux-kernel/build-jool.py')
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-jool.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/package-build/linux-kernel/build-jool.py b/scripts/package-build/linux-kernel/build-jool.py index 570293f5..3d2c3d6a 100755 --- a/scripts/package-build/linux-kernel/build-jool.py +++ b/scripts/package-build/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 @@ -66,7 +65,7 @@ MODULES_DIR := extra # main packaging script based on dh7 syntax %: - dh $@ + dh $@ override_dh_clean: dh_clean --exclude=debian/{PACKAGE_NAME}.substvars @@ -88,7 +87,7 @@ override_dh_auto_install: install -D -m 644 src/mod/common/jool_common.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/jool_common.ko install -D -m 644 src/mod/nat64/jool.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/jool.ko install -D -m 644 src/mod/siit/jool_siit.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/jool_siit.ko - + ${{KERNEL_DIR}}/../sign-modules.sh ${{PACKAGE_BUILD_DIR}}/lib ''' bild_rules = Path(f'{PACKAGE_DIR}/debian/rules') bild_rules.write_text(build_rules_text) |