diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-08-08 19:45:12 +0000 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-08-08 22:39:56 +0200 |
| commit | 24f6ed6ee8fa009dd7e7fbf4db8c70ef5f6ef04b (patch) | |
| tree | 81a63fc6f3bf24ec8cc09fa4e0ca819c86956a1e | |
| parent | 62f7a2bac4d4040928c9772495d8f69c84610fc5 (diff) | |
| download | vyos-build-24f6ed6ee8fa009dd7e7fbf4db8c70ef5f6ef04b.tar.gz vyos-build-24f6ed6ee8fa009dd7e7fbf4db8c70ef5f6ef04b.zip | |
Kernel: T9181: convert jool/realtek sub-package scripts from Python to bash
Rewrite build-jool.py, build-realtek-r8126.py and build-realtek-r8152.py
as build-*.sh, matching the Bash convention already used by every other
sub-dependency script in this directory (kernel-vars sourcing, debmake +
debuild packaging).
7 files changed, 189 insertions, 288 deletions
diff --git a/scripts/package-build/linux-kernel/build-jool.py b/scripts/package-build/linux-kernel/build-jool.py deleted file mode 100755 index bfdcf93a..00000000 --- a/scripts/package-build/linux-kernel/build-jool.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env python3 - -from tomllib import loads as toml_loads -from requests import get -from pathlib import Path -from subprocess import run - -def find_arch() -> str: - tmp=run(['dpkg-architecture', '-q', 'DEB_HOST_ARCH'], capture_output=True) - return tmp.stdout.decode().strip() - -# 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 -arch: str = find_arch() -defaults_file: str = Path('../../../data/defaults.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 = 'jool' -PACKAGE_VERSION: str = '4.1.15' -PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}' -SOURCES_ARCHIVE: str = f'{PACKAGE_DIR}.tar.gz' -SOURCES_URL: str = f'https://github.com/NICMx/Jool/archive/refs/tags/v{PACKAGE_VERSION}.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 = f'''#!/usr/bin/make -f -# config -export KERNEL_DIR := {KERNEL_SRC} -PACKAGE_BUILD_DIR := debian/{PACKAGE_NAME} -KVER := {KERNEL_VER}-{KERNEL_FLAVOR} -MODULES_DIR := extra - -# main packaging script based on dh7 syntax -%: - dh $@ - -override_dh_clean: - dh_clean --exclude=debian/{PACKAGE_NAME}.substvars - -override_dh_prep: - dh_prep --exclude=debian/{PACKAGE_NAME}.substvars - -# override_dh_auto_clean: -# make -C src/mod clean - -override_dh_auto_build: - dh_auto_build $@ - make -C ${{KERNEL_DIR}} M=$$PWD/src/mod/common modules - make -C ${{KERNEL_DIR}} M=$$PWD/src/mod/nat64 modules - make -C ${{KERNEL_DIR}} M=$$PWD/src/mod/siit modules - -override_dh_auto_install: - 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) - -# build a package -debuild_cmd: list[str] = ['debuild'] -run(debuild_cmd, cwd=PACKAGE_DIR) diff --git a/scripts/package-build/linux-kernel/build-jool.sh b/scripts/package-build/linux-kernel/build-jool.sh new file mode 100755 index 00000000..731ce11f --- /dev/null +++ b/scripts/package-build/linux-kernel/build-jool.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -e +CWD=$(pwd) +KERNEL_VAR_FILE=${CWD}/kernel-vars + +if [ ! -f ${KERNEL_VAR_FILE} ]; then + echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build-kernel.sh first" + exit 1 +fi + +. ${KERNEL_VAR_FILE} + +PACKAGE_NAME=jool +PACKAGE_VERSION=4.1.15 +PACKAGE_DIR=${PACKAGE_NAME}-${PACKAGE_VERSION} +SOURCES_ARCHIVE=${PACKAGE_DIR}.tar.gz +SOURCES_URL=https://github.com/NICMx/Jool/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz + +if [ -e ${SOURCES_ARCHIVE} ]; then + rm -f ${SOURCES_ARCHIVE} +fi +curl -L -o ${SOURCES_ARCHIVE} ${SOURCES_URL} + +debmake -e support@vyos.io -f "VyOS Support" -p ${PACKAGE_NAME} -u ${PACKAGE_VERSION} -a ${SOURCES_ARCHIVE} + +echo "misc:Depends=linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX}" > ${PACKAGE_DIR}/debian/${PACKAGE_NAME}.substvars + +cat << EOF > ${PACKAGE_DIR}/debian/rules +#!/usr/bin/make -f +# config +export KERNEL_DIR := ${KERNEL_DIR} +PACKAGE_BUILD_DIR := debian/${PACKAGE_NAME} +KVER := ${KERNEL_VERSION}${KERNEL_SUFFIX} +MODULES_DIR := extra + +# main packaging script based on dh7 syntax +%: + dh \$@ + +override_dh_clean: + dh_clean --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_prep: + dh_prep --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_auto_build: + dh_auto_build \$@ + make -C \${KERNEL_DIR} M=\$\$PWD/src/mod/common modules + make -C \${KERNEL_DIR} M=\$\$PWD/src/mod/nat64 modules + make -C \${KERNEL_DIR} M=\$\$PWD/src/mod/siit modules + +override_dh_auto_install: + 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 +EOF + +cd ${PACKAGE_DIR} +debuild diff --git a/scripts/package-build/linux-kernel/build-realtek-r8126.py b/scripts/package-build/linux-kernel/build-realtek-r8126.py deleted file mode 100755 index 31bad0ce..00000000 --- a/scripts/package-build/linux-kernel/build-realtek-r8126.py +++ /dev/null @@ -1,93 +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() -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-r8126' -PACKAGE_VERSION: str = '10.016.00' -PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}' -SOURCES_ARCHIVE: str = f'r8126-{PACKAGE_VERSION}.tar.bz2' -SOURCES_URL: str = f'https://packages.vyos.net/source-mirror/{SOURCES_ARCHIVE}' - -# 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/ethernet -# 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}}/src modules - -override_dh_auto_install: -\tinstall -D -m 644 src/r8126.ko ${{PACKAGE_BUILD_DIR}}/lib/modules/${{KVER}}/${{MODULES_DIR}}/r8126.ko -\t${{KERNELDIR}}/../sign-modules.sh ${{PACKAGE_BUILD_DIR}}/lib -'''.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-realtek-r8126.sh b/scripts/package-build/linux-kernel/build-realtek-r8126.sh new file mode 100755 index 00000000..1a4875e0 --- /dev/null +++ b/scripts/package-build/linux-kernel/build-realtek-r8126.sh @@ -0,0 +1,62 @@ +#!/bin/sh +set -e +CWD=$(pwd) +KERNEL_VAR_FILE=${CWD}/kernel-vars + +if [ ! -f ${KERNEL_VAR_FILE} ]; then + echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build-kernel.sh first" + exit 1 +fi + +. ${KERNEL_VAR_FILE} + +PACKAGE_NAME=vyos-drivers-realtek-r8126 +PACKAGE_VERSION=10.016.00 +PACKAGE_DIR=${PACKAGE_NAME}-${PACKAGE_VERSION} +SOURCES_ARCHIVE=r8126-${PACKAGE_VERSION}.tar.bz2 +SOURCES_URL=https://packages.vyos.net/source-mirror/${SOURCES_ARCHIVE} + +if [ -e ${SOURCES_ARCHIVE} ]; then + rm -f ${SOURCES_ARCHIVE} +fi +curl -L -o ${SOURCES_ARCHIVE} ${SOURCES_URL} + +debmake -e support@vyos.io -f "VyOS Support" -p ${PACKAGE_NAME} -u ${PACKAGE_VERSION} -a ${SOURCES_ARCHIVE} + +echo "misc:Depends=linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX}" > ${PACKAGE_DIR}/debian/${PACKAGE_NAME}.substvars + +cat << EOF > ${PACKAGE_DIR}/debian/rules +#!/usr/bin/make -f +# config +export KERNELDIR := ${KERNEL_DIR} +PACKAGE_BUILD_DIR := debian/${PACKAGE_NAME} +KVER := ${KERNEL_VERSION}${KERNEL_SUFFIX} +MODULES_DIR := updates/drivers/net/ethernet +# main packaging script based on dh7 syntax +%: + dh \$@ + +override_dh_clean: + dh_clean --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_prep: + dh_prep --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_auto_clean: + make clean + +override_dh_auto_build: + echo "KERNELDIR=\${KERNELDIR}" + echo "CURDIR=\${CURDIR}" + make -C \${KERNELDIR} M=\${CURDIR}/src modules + +override_dh_auto_install: + install -D -m 644 src/r8126.ko \${PACKAGE_BUILD_DIR}/lib/modules/\${KVER}/\${MODULES_DIR}/r8126.ko + \${KERNELDIR}/../sign-modules.sh \${PACKAGE_BUILD_DIR}/lib +EOF + +cd ${PACKAGE_DIR} +debuild +cd ${CWD} + +rm -rf ${PACKAGE_DIR} diff --git a/scripts/package-build/linux-kernel/build-realtek-r8152.py b/scripts/package-build/linux-kernel/build-realtek-r8152.py deleted file mode 100755 index b8b3866d..00000000 --- a/scripts/package-build/linux-kernel/build-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.21.4' -PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}' -SOURCES_ARCHIVE: str = f'r8152-{PACKAGE_VERSION}.tar.bz2' -SOURCES_URL: str = f'https://packages.vyos.net/source-mirror/{SOURCES_ARCHIVE}' - -# 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-realtek-r8152.sh b/scripts/package-build/linux-kernel/build-realtek-r8152.sh new file mode 100755 index 00000000..959c7dad --- /dev/null +++ b/scripts/package-build/linux-kernel/build-realtek-r8152.sh @@ -0,0 +1,63 @@ +#!/bin/sh +set -e +CWD=$(pwd) +KERNEL_VAR_FILE=${CWD}/kernel-vars + +if [ ! -f ${KERNEL_VAR_FILE} ]; then + echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build-kernel.sh first" + exit 1 +fi + +. ${KERNEL_VAR_FILE} + +PACKAGE_NAME=vyos-drivers-realtek-r8152 +PACKAGE_VERSION=2.21.4 +PACKAGE_DIR=${PACKAGE_NAME}-${PACKAGE_VERSION} +SOURCES_ARCHIVE=r8152-${PACKAGE_VERSION}.tar.bz2 +SOURCES_URL=https://packages.vyos.net/source-mirror/${SOURCES_ARCHIVE} + +if [ -e ${SOURCES_ARCHIVE} ]; then + rm -f ${SOURCES_ARCHIVE} +fi +curl -L -o ${SOURCES_ARCHIVE} ${SOURCES_URL} + +debmake -e support@vyos.io -f "VyOS Support" -p ${PACKAGE_NAME} -u ${PACKAGE_VERSION} -a ${SOURCES_ARCHIVE} + +echo "misc:Depends=linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX}" > ${PACKAGE_DIR}/debian/${PACKAGE_NAME}.substvars + +cat << EOF > ${PACKAGE_DIR}/debian/rules +#!/usr/bin/make -f +# config +export KERNELDIR := ${KERNEL_DIR} +PACKAGE_BUILD_DIR := debian/${PACKAGE_NAME} +KVER := ${KERNEL_VERSION}${KERNEL_SUFFIX} +MODULES_DIR := updates/drivers/net/usb +# main packaging script based on dh7 syntax +%: + dh \$@ + +override_dh_clean: + dh_clean --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_prep: + dh_prep --exclude=debian/${PACKAGE_NAME}.substvars + +override_dh_auto_clean: + make clean + +override_dh_auto_build: + echo "KERNELDIR=\${KERNELDIR}" + echo "CURDIR=\${CURDIR}" + make -C \${KERNELDIR} M=\${CURDIR} modules + +override_dh_auto_install: + install -D -m 644 r8152.ko \${PACKAGE_BUILD_DIR}/lib/modules/\${KVER}/\${MODULES_DIR}/r8152.ko + \${KERNELDIR}/../sign-modules.sh \${PACKAGE_BUILD_DIR}/lib + install -D -m 644 50-usb-realtek-net.rules \${PACKAGE_BUILD_DIR}/etc/udev/rules.d/50-usb-realtek-net.rules +EOF + +cd ${PACKAGE_DIR} +debuild +cd ${CWD} + +rm -rf ${PACKAGE_DIR} diff --git a/scripts/package-build/linux-kernel/build.py b/scripts/package-build/linux-kernel/build.py index a5094914..f2cc9145 100755 --- a/scripts/package-build/linux-kernel/build.py +++ b/scripts/package-build/linux-kernel/build.py @@ -242,17 +242,17 @@ def build_mellanox_ofed(): def build_realtek_r8126(): """Build Realtek r8126""" - run(['./build-realtek-r8126.py'], check=True) + run(['./build-realtek-r8126.sh'], check=True) def build_realtek_r8152(): """Build Realtek r8152""" - run(['./build-realtek-r8152.py'], check=True) + run(['./build-realtek-r8152.sh'], check=True) def build_jool(): """Build Jool""" - run(['echo y | ./build-jool.py'], check=True, shell=True) + run(['echo y | ./build-jool.sh'], check=True, shell=True) def build_ipt_netflow(commit_id, scm_url): """Build ipt_NETFLOW""" |
