From 3a6e1d4455c5685e1e23cc0b2c5b16682726e783 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 12 Oct 2024 08:02:23 +0200 Subject: 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. --- .../linux-kernel/build-driver-realtek-r8152.py | 95 ---------------------- .../linux-kernel/build-realtek-r8152.py | 95 ++++++++++++++++++++++ scripts/package-build/linux-kernel/build.py | 2 +- 3 files changed, 96 insertions(+), 96 deletions(-) delete mode 100755 scripts/package-build/linux-kernel/build-driver-realtek-r8152.py create mode 100755 scripts/package-build/linux-kernel/build-realtek-r8152.py (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/build-driver-realtek-r8152.py b/scripts/package-build/linux-kernel/build-driver-realtek-r8152.py deleted file mode 100755 index 3f13b68d..00000000 --- a/scripts/package-build/linux-kernel/build-driver-realtek-r8152.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python3 - -import os -from tomllib import loads as toml_loads -from requests import get -from pathlib import Path -from subprocess import run - -CWD = os.getcwd() - -# dependency modifier -def add_depends(package_dir: str, package_name: str, - depends: list[str]) -> None: - """Add dependencies to a package - Args: - package_dir (str): a directory where package sources are located - package_name (str): a name of package - depends (list[str]): a list of dependencies to add - """ - depends_list: str = ', '.join(depends) - depends_line: str = f'misc:Depends={depends_list}\n' - - substvars_file = Path(f'{package_dir}/debian/{package_name}.substvars') - substvars_file.write_text(depends_line) - - -# find kernel version and source path -defaults_file: str = Path('../../../data/defaults.toml').read_text() -architecture_file: str = Path('../../../data/architectures/amd64.toml').read_text() -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' -PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}' -SOURCES_ARCHIVE: str = 'r8152-2.18.1-1.tar.gz' -SOURCES_URL: str = f'https://github.com/bb-qq/r8152/archive/refs/tags/2.18.1-1.tar.gz' - -# download sources -sources_archive = Path(SOURCES_ARCHIVE) -sources_archive.write_bytes(get(SOURCES_URL).content) - -# prepare sources -debmake_cmd: list[str] = [ - 'debmake', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p', - PACKAGE_NAME, '-u', PACKAGE_VERSION, '-a', SOURCES_ARCHIVE -] -run(debmake_cmd) - -# add kernel to dependencies -add_depends(PACKAGE_DIR, PACKAGE_NAME, - [f'linux-image-{KERNEL_VER}-{KERNEL_FLAVOR}']) - -# configure build rules -build_rules_text: str = '''#!/usr/bin/make -f -# config -export KERNELDIR := {KERNEL_SRC} -PACKAGE_BUILD_DIR := debian/{PACKAGE_NAME} -KVER := {KERNEL_VER}-{KERNEL_FLAVOR} -MODULES_DIR := updates/drivers/net/usb -# main packaging script based on dh7 syntax -%: -\tdh $@ - -override_dh_clean: -\tdh_clean --exclude=debian/{PACKAGE_NAME}.substvars - -override_dh_prep: -\tdh_prep --exclude=debian/{PACKAGE_NAME}.substvars - -override_dh_auto_clean: -\tmake clean - -override_dh_auto_build: -\techo "KERNELDIR=${{KERNELDIR}}" -\techo "CURDIR=${{CURDIR}}" -\tmake -C ${{KERNELDIR}} M=${{CURDIR}} modules - -override_dh_auto_install: -\tinstall -D -m 644 r8152.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/r8152.ko -\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) - -build_rules_path = Path(f'{PACKAGE_DIR}/debian/rules') -build_rules_path.write_text(build_rules_text, encoding='utf-8') - -# build a package -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) diff --git a/scripts/package-build/linux-kernel/build-realtek-r8152.py b/scripts/package-build/linux-kernel/build-realtek-r8152.py new file mode 100755 index 00000000..25c1b0fe --- /dev/null +++ b/scripts/package-build/linux-kernel/build-realtek-r8152.py @@ -0,0 +1,95 @@ +#!/usr/bin/env python3 + +import os +from tomllib import loads as toml_loads +from requests import get +from pathlib import Path +from subprocess import run + +CWD = os.getcwd() + +# dependency modifier +def add_depends(package_dir: str, package_name: str, + depends: list[str]) -> None: + """Add dependencies to a package + Args: + package_dir (str): a directory where package sources are located + package_name (str): a name of package + depends (list[str]): a list of dependencies to add + """ + depends_list: str = ', '.join(depends) + depends_line: str = f'misc:Depends={depends_list}\n' + + substvars_file = Path(f'{package_dir}/debian/{package_name}.substvars') + substvars_file.write_text(depends_line) + + +# find kernel version and source path +defaults_file: str = Path('../../../data/defaults.toml').read_text() +architecture_file: str = Path('../../../data/architectures/amd64.toml').read_text() +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' +PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}' +SOURCES_ARCHIVE: str = 'r8152-2.18.1-1.tar.gz' +SOURCES_URL: str = f'https://github.com/bb-qq/r8152/archive/refs/tags/2.18.1-1.tar.gz' + +# download sources +sources_archive = Path(SOURCES_ARCHIVE) +sources_archive.write_bytes(get(SOURCES_URL).content) + +# prepare sources +debmake_cmd: list[str] = [ + 'debmake', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p', + PACKAGE_NAME, '-u', PACKAGE_VERSION, '-a', SOURCES_ARCHIVE +] +run(debmake_cmd) + +# add kernel to dependencies +add_depends(PACKAGE_DIR, PACKAGE_NAME, + [f'linux-image-{KERNEL_VER}-{KERNEL_FLAVOR}']) + +# configure build rules +build_rules_text: str = '''#!/usr/bin/make -f +# config +export KERNELDIR := {KERNEL_SRC} +PACKAGE_BUILD_DIR := debian/{PACKAGE_NAME} +KVER := {KERNEL_VER}-{KERNEL_FLAVOR} +MODULES_DIR := updates/drivers/net/usb +# main packaging script based on dh7 syntax +%: +\tdh $@ + +override_dh_clean: +\tdh_clean --exclude=debian/{PACKAGE_NAME}.substvars + +override_dh_prep: +\tdh_prep --exclude=debian/{PACKAGE_NAME}.substvars + +override_dh_auto_clean: +\tmake clean + +override_dh_auto_build: +\techo "KERNELDIR=${{KERNELDIR}}" +\techo "CURDIR=${{CURDIR}}" +\tmake -C ${{KERNELDIR}} M=${{CURDIR}} modules + +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) + +build_rules_path = Path(f'{PACKAGE_DIR}/debian/rules') +build_rules_path.write_text(build_rules_text, encoding='utf-8') + +# build a package +debuild_cmd: list[str] = ['debuild'] +run(debuild_cmd, cwd=PACKAGE_DIR, check=True) + +# Sign generated Kernel modules +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(): -- cgit v1.2.3