diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-07-27 17:25:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-27 17:25:19 +0300 |
| commit | e8fd5d2f3e3a3ecb08346f509d53034afd5fa5f5 (patch) | |
| tree | 6d84f422868e589f13555eb8ed5b590cc75e426e | |
| parent | 35bfaa5b73f142e48c1bfe6e6221e8141c836be5 (diff) | |
| parent | a37b3cb1521508e474da9f3183e4919dac2cc691 (diff) | |
| download | vyos-build-e8fd5d2f3e3a3ecb08346f509d53034afd5fa5f5.tar.gz vyos-build-e8fd5d2f3e3a3ecb08346f509d53034afd5fa5f5.zip | |
Merge pull request #1252 from c-po/iproute2
iproute2: T8926: add custom build which matches Kernel 6.18
| -rw-r--r-- | .github/workflows/trigger_rebuild_packages.yml | 6 | ||||
| -rw-r--r-- | data/live-build-config/archives/bookworm-backports.pref.chroot | 4 | ||||
| -rw-r--r-- | scripts/package-build/iproute2/.gitignore | 1 | ||||
| l--------- | scripts/package-build/iproute2/build.py | 1 | ||||
| -rw-r--r-- | scripts/package-build/iproute2/package.toml | 5 |
5 files changed, 13 insertions, 4 deletions
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index 2a1f9e87..09c20fa5 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -47,6 +47,8 @@ jobs: - 'scripts/package-build/hostap/**' hsflowd: - 'scripts/package-build/hsflowd/**' + iproute2: + - 'scripts/package-build/iproute2/**' isc-dhcp: - 'scripts/package-build/isc-dhcp/**' isc-kea: @@ -173,6 +175,10 @@ jobs: trigger_build "hsflowd" fi + if [ "${{ steps.changes.outputs.iproute2 }}" == "true" ]; then + trigger_build "iproute2" + fi + if [ "${{ steps.changes.outputs.isc-dhcp }}" == "true" ]; then trigger_build "isc-dhcp" fi diff --git a/data/live-build-config/archives/bookworm-backports.pref.chroot b/data/live-build-config/archives/bookworm-backports.pref.chroot index e0eba2c0..f48ff10f 100644 --- a/data/live-build-config/archives/bookworm-backports.pref.chroot +++ b/data/live-build-config/archives/bookworm-backports.pref.chroot @@ -1,7 +1,3 @@ -Package: iproute2 -Pin: release n=bookworm-backports -Pin-Priority: 600 - Package: suricata Pin: release n=bookworm-backports Pin-Priority: 600 diff --git a/scripts/package-build/iproute2/.gitignore b/scripts/package-build/iproute2/.gitignore new file mode 100644 index 00000000..393b9da9 --- /dev/null +++ b/scripts/package-build/iproute2/.gitignore @@ -0,0 +1 @@ +/iproute2/ diff --git a/scripts/package-build/iproute2/build.py b/scripts/package-build/iproute2/build.py new file mode 120000 index 00000000..3c76af73 --- /dev/null +++ b/scripts/package-build/iproute2/build.py @@ -0,0 +1 @@ +../build.py
\ No newline at end of file diff --git a/scripts/package-build/iproute2/package.toml b/scripts/package-build/iproute2/package.toml new file mode 100644 index 00000000..363cbd31 --- /dev/null +++ b/scripts/package-build/iproute2/package.toml @@ -0,0 +1,5 @@ +[[packages]] +name = "iproute2" +commit_id = "debian/6.18.0-1" +scm_url = "https://salsa.debian.org/kernel-team/iproute2.git" +pre_build_hook = "sudo apt-get install -y -t bookworm-backports debhelper" |