diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-12 08:02:23 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-10-12 08:02:23 +0200 |
| commit | 3a6e1d4455c5685e1e23cc0b2c5b16682726e783 (patch) | |
| tree | 7cf351c882f8dcb41acb38a6e0ec79e18cf1fd13 | |
| parent | cde77d07d1615f0aefe576170f0ace5b1dd2b5da (diff) | |
| download | vyos-build-3a6e1d4455c5685e1e23cc0b2c5b16682726e783.tar.gz vyos-build-3a6e1d4455c5685e1e23cc0b2c5b16682726e783.zip | |
Kernel: T861: T6713: fix generation of realtek driver signature
We need to sign the module during the Debian build run, before the
binaries are packed into the resulting DEB.
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-realtek-r8152.py (renamed from scripts/package-build/linux-kernel/build-driver-realtek-r8152.py) | 6 | ||||
| -rwxr-xr-x | scripts/package-build/linux-kernel/build.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/package-build/linux-kernel/build-driver-realtek-r8152.py b/scripts/package-build/linux-kernel/build-realtek-r8152.py index 3f13b68d..25c1b0fe 100755 --- a/scripts/package-build/linux-kernel/build-driver-realtek-r8152.py +++ b/scripts/package-build/linux-kernel/build-realtek-r8152.py @@ -30,7 +30,6 @@ architecture_file: str = Path('../../../data/architectures/amd64.toml').read_tex KERNEL_VER: str = toml_loads(defaults_file).get('kernel_version') KERNEL_FLAVOR: str = toml_loads(defaults_file).get('kernel_flavor') KERNEL_SRC: str = Path.cwd().as_posix() + '/linux' - # define variables PACKAGE_NAME: str = 'vyos-drivers-realtek-r8152' PACKAGE_VERSION: str = '2.18.1' @@ -80,6 +79,7 @@ override_dh_auto_build: override_dh_auto_install: \tinstall -D -m 644 r8152.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/r8152.ko +\t${{KERNELDIR}}/../sign-modules.sh ${{PACKAGE_BUILD_DIR}}/lib \tinstall -D -m 644 50-usb-realtek-net.rules ${{PACKAGE_BUILD_DIR}}/etc/udev/rules.d/50-usb-realtek-net.rules '''.format(KERNEL_SRC=KERNEL_SRC, PACKAGE_NAME=PACKAGE_NAME, KERNEL_VER=KERNEL_VER, KERNEL_FLAVOR=KERNEL_FLAVOR) @@ -91,5 +91,5 @@ debuild_cmd: list[str] = ['debuild'] run(debuild_cmd, cwd=PACKAGE_DIR, check=True) # Sign generated Kernel modules -sign_modules_script = os.path.join(CWD, 'sign-modules.sh') -run([sign_modules_script, PACKAGE_DIR], check=True) +clean_cmd: list[str] = ['rm', '-rf', PACKAGE_DIR] +run(clean_cmd, cwd=CWD, check=True) diff --git a/scripts/package-build/linux-kernel/build.py b/scripts/package-build/linux-kernel/build.py index 2a239adc..b16e0702 100755 --- a/scripts/package-build/linux-kernel/build.py +++ b/scripts/package-build/linux-kernel/build.py @@ -194,7 +194,7 @@ def build_mellanox_ofed(): def build_realtek_r8152(): """Build Realtek r8152""" - run(['sudo', './build-driver-realtek-r8152.py'], check=True) + run(['sudo', './build-realtek-r8152.py'], check=True) def build_jool(): |