summaryrefslogtreecommitdiff
path: root/scripts/package-build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/package-build')
-rw-r--r--scripts/package-build/aws-gwlbtun/package.toml5
-rwxr-xr-xscripts/package-build/build.py5
-rw-r--r--scripts/package-build/frr/package.toml6
-rw-r--r--scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig142
-rw-r--r--scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig44
-rwxr-xr-xscripts/package-build/linux-kernel/build.py21
-rw-r--r--scripts/package-build/linux-kernel/package.toml42
-rw-r--r--scripts/package-build/linux-kernel/patches/accel-ppp/0002-Add-vrf-support-for-Framed-Route-and-Framed-IPv6-Rou.patch639
-rw-r--r--scripts/package-build/linux-kernel/patches/accel-ppp/0003-Simplify-implementation-of-vrf-support-for-iproute_a.patch213
-rw-r--r--scripts/package-build/linux-kernel/patches/accel-ppp/0004-Fix-whitespace-in-accel-pppd-libnetlink-iputils.c.patch26
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch11
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch9
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/build-linux-perf-package.patch62
-rw-r--r--scripts/package-build/netfilter/package.toml6
-rw-r--r--scripts/package-build/openvpn-otp/package.toml8
l---------scripts/package-build/udp-broadcast-relay/build.py1
-rw-r--r--scripts/package-build/udp-broadcast-relay/package.toml21
-rw-r--r--scripts/package-build/udp-broadcast-relay/patches/udp-broadcast-relay/0001-Add-Debian-packaging.patch202
18 files changed, 1425 insertions, 38 deletions
diff --git a/scripts/package-build/aws-gwlbtun/package.toml b/scripts/package-build/aws-gwlbtun/package.toml
index 1c4e53f6..138a5a76 100644
--- a/scripts/package-build/aws-gwlbtun/package.toml
+++ b/scripts/package-build/aws-gwlbtun/package.toml
@@ -57,3 +57,8 @@ chmod +x debian/rules
debuild -us -uc -b
'''
## Build cmd end
+
+[dependencies]
+packages = [
+ "cmake"
+]
diff --git a/scripts/package-build/build.py b/scripts/package-build/build.py
index 9c1df7b3..2eceea93 100755
--- a/scripts/package-build/build.py
+++ b/scripts/package-build/build.py
@@ -17,6 +17,7 @@
import glob
import shutil
+import sys
import toml
import os
@@ -91,7 +92,11 @@ def build_package(package: list, patch_dir: Path) -> None:
# Check out the specific commit
run(['git', 'checkout', package['commit_id']], cwd=repo_dir, check=True)
+ except CalledProcessError as e:
+ print(f"Failed to clone or checkout for package '{repo_name}': {e}")
+ sys.exit(1)
+ try:
# The `pre_build_hook` is an optional configuration defined in `package.toml`.
# It executes after the repository is checked out and before the build process begins.
# This hook allows you to perform preparatory tasks, such as creating directories,
diff --git a/scripts/package-build/frr/package.toml b/scripts/package-build/frr/package.toml
index 8ff35777..002e9f50 100644
--- a/scripts/package-build/frr/package.toml
+++ b/scripts/package-build/frr/package.toml
@@ -33,5 +33,9 @@ packages = [
"python3-dev:native",
"texinfo",
"lua5.3",
- "doxygen"
+ "doxygen",
+ "bison",
+ "liblua5.3-dev",
+ "flex",
+ "libelf-dev"
]
diff --git a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig b/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig
index f9ce00c8..e6ea3893 100644
--- a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -1975,7 +1975,7 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_QCOM_SCM=y
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
CONFIG_SYSFB=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
CONFIG_TI_SCI_PROTOCOL=y
CONFIG_TURRIS_MOX_RWTM=m
# CONFIG_ARM_FFA_TRANSPORT is not set
@@ -3353,7 +3353,8 @@ CONFIG_SERIAL_8250_TEGRA=y
# Non-8250 serial port support
#
# CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
# CONFIG_SERIAL_MESON is not set
# CONFIG_SERIAL_TEGRA is not set
@@ -3401,7 +3402,7 @@ CONFIG_TTY_PRINTK=m
CONFIG_TTY_PRINTK_LEVEL=6
# CONFIG_PRINTER is not set
# CONFIG_PPDEV is not set
-CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_CONSOLE=y
CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DMI_DECODE=y
CONFIG_IPMI_PLAT_DATA=y
@@ -4495,8 +4496,141 @@ CONFIG_VIDEO_CMDLINE=y
# CONFIG_AUXDISPLAY is not set
# CONFIG_PANEL is not set
# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_DRM is not set
+CONFIG_DRM=y
+# CONFIG_DRM_DEBUG_MM is not set
+CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_TTM=y
+CONFIG_DRM_TTM_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_ROCKCHIP is not set
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_RCAR_DU is not set
+# CONFIG_DRM_RZG2L_MIPI_DSI is not set
+# CONFIG_DRM_SHMOBILE is not set
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_QXL=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+# CONFIG_DRM_MSM is not set
+# CONFIG_DRM_TEGRA is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_FSL_LDB is not set
+# CONFIG_DRM_ITE_IT6505 is not set
+# CONFIG_DRM_LONTIUM_LT8912B is not set
+# CONFIG_DRM_LONTIUM_LT9211 is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
+# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
+# CONFIG_DRM_LVDS_CODEC is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_PARADE_PS8640 is not set
+# CONFIG_DRM_SAMSUNG_DSIM is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+# CONFIG_DRM_SIMPLE_BRIDGE is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI83 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+# CONFIG_DRM_TI_TPD12S015 is not set
+# CONFIG_DRM_ANALOGIX_ANX6345 is not set
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
+# CONFIG_DRM_IMX8QM_LDB is not set
+# CONFIG_DRM_IMX8QXP_LDB is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
+# end of Display Interface Bridges
+
+# CONFIG_DRM_IMX_DCSS is not set
+# CONFIG_DRM_IMX_LCDC is not set
+# CONFIG_DRM_V3D is not set
+# CONFIG_DRM_LOONGSON is not set
+# CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_HISI_KIRIN is not set
+# CONFIG_DRM_LOGICVC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_IMX_LCDIF is not set
+# CONFIG_DRM_MESON is not set
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_GM12U320 is not set
+CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_PL111 is not set
+# CONFIG_DRM_XEN_FRONTEND is not set
+# CONFIG_DRM_LIMA is not set
+# CONFIG_DRM_PANFROST is not set
+# CONFIG_DRM_TIDSS is not set
+# CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
+# CONFIG_DRM_HYPERV is not set
+# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
diff --git a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig b/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig
index de3b84aa..9e8b1986 100644
--- a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.89 Kernel Configuration
+# Linux/x86 6.6.93 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -522,6 +522,7 @@ CONFIG_CPU_SRSO=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
CONFIG_MITIGATION_SPECTRE_BHI=y
+CONFIG_MITIGATION_ITS=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -1072,7 +1073,6 @@ CONFIG_SKB_EXTENSIONS=y
CONFIG_PACKET=m
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=y
@@ -2404,7 +2404,7 @@ CONFIG_FUSION_CTL=m
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
-CONFIG_MII=m
+CONFIG_MII=y
CONFIG_NET_CORE=y
CONFIG_BONDING=m
CONFIG_DUMMY=m
@@ -2801,21 +2801,21 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
# CONFIG_SLIP is not set
CONFIG_SLHC=m
-CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_NET_DRIVERS=y
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
+CONFIG_USB_USBNET=y
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_CDCETHER=y
+CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_NET_CDC_NCM=y
+CONFIG_USB_NET_HUAWEI_CDC_NCM=y
+CONFIG_USB_NET_CDC_MBIM=y
# CONFIG_USB_NET_DM9601 is not set
# CONFIG_USB_NET_SR9700 is not set
# CONFIG_USB_NET_SR9800 is not set
@@ -2830,11 +2830,11 @@ CONFIG_USB_NET_SMSC95XX=m
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_USB_NET_CX82310_ETH is not set
# CONFIG_USB_NET_KALMIA is not set
-CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_NET_QMI_WWAN=y
# CONFIG_USB_HSO is not set
# CONFIG_USB_NET_INT51X1 is not set
# CONFIG_USB_IPHETH is not set
-CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_SIERRA_NET=y
# CONFIG_USB_VL600 is not set
# CONFIG_USB_NET_CH9200 is not set
# CONFIG_USB_NET_AQC111 is not set
@@ -3079,7 +3079,11 @@ CONFIG_MAC80211_HWSIM=m
#
# Wireless WAN
#
-# CONFIG_WWAN is not set
+CONFIG_WWAN=y
+CONFIG_WWAN_DEBUGFS=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_IOSM=m
+CONFIG_MTK_T7XX=m
# end of Wireless WAN
CONFIG_XEN_NETDEV_FRONTEND=m
@@ -4523,7 +4527,7 @@ CONFIG_USB_SL811_HCD=m
#
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
-CONFIG_USB_WDM=m
+CONFIG_USB_WDM=y
# CONFIG_USB_TMC is not set
#
@@ -4570,7 +4574,8 @@ CONFIG_USB_STORAGE=m
#
# USB port drivers
#
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_SIMPLE=m
# CONFIG_USB_SERIAL_AIRCABLE is not set
@@ -4606,16 +4611,16 @@ CONFIG_USB_SERIAL_MXUPORT=m
# CONFIG_USB_SERIAL_NAVMAN is not set
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_QCAUX=y
+CONFIG_USB_SERIAL_QUALCOMM=y
CONFIG_USB_SERIAL_SPCP8X5=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=y
# CONFIG_USB_SERIAL_SYMBOL is not set
CONFIG_USB_SERIAL_TI=m
# CONFIG_USB_SERIAL_CYBERJACK is not set
-CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_WWAN=y
CONFIG_USB_SERIAL_OPTION=m
# CONFIG_USB_SERIAL_OMNINET is not set
# CONFIG_USB_SERIAL_OPTICON is not set
@@ -5420,6 +5425,7 @@ CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
+CONFIG_INOTIFY_STACKFS=y
# CONFIG_FANOTIFY is not set
# CONFIG_QUOTA is not set
CONFIG_AUTOFS_FS=m
diff --git a/scripts/package-build/linux-kernel/build.py b/scripts/package-build/linux-kernel/build.py
index af610079..5d891c71 100755
--- a/scripts/package-build/linux-kernel/build.py
+++ b/scripts/package-build/linux-kernel/build.py
@@ -18,6 +18,7 @@
import datetime
import glob
import shutil
+import sys
import toml
import os
import subprocess
@@ -37,6 +38,7 @@ def ensure_dependencies(dependencies: list) -> None:
return
print("I: Ensure Debian build dependencies are met")
+ run(['sudo', 'apt-get', 'update'], check=True)
run(['sudo', 'apt-get', 'install', '-y'] + dependencies, check=True)
@@ -59,8 +61,12 @@ def clone_or_update_repo(repo_dir: Path, scm_url: str, commit_id: str) -> None:
run(['git', 'checkout', commit_id], cwd=repo_dir, check=True)
#run(['git', 'pull'], cwd=repo_dir, check=True)
else:
- run(['git', 'clone', scm_url, str(repo_dir)], check=True)
- run(['git', 'checkout', commit_id], cwd=repo_dir, check=True)
+ try:
+ run(['git', 'clone', scm_url, str(repo_dir)], check=True)
+ run(['git', 'checkout', commit_id], cwd=repo_dir, check=True)
+ except CalledProcessError as e:
+ print(f"Failed to clone or checkout: {e}")
+ sys.exit(1)
def create_tarball(package_name, source_dir=None):
@@ -112,9 +118,6 @@ def build_package(package: dict, dependencies: list) -> None:
# Clone or update the repository
#clone_or_update_repo(repo_dir, package['scm_url'], package['commit_id'])
- # Ensure dependencies
- #ensure_dependencies(dependencies)
-
# Prepare the package if required
#if package.get('prepare_package', False):
# prepare_package(repo_dir, package.get('install_data', ''))
@@ -265,6 +268,7 @@ if __name__ == '__main__':
arg_parser = ArgumentParser()
arg_parser.add_argument('--config', default='package.toml', help='Path to the package configuration file')
arg_parser.add_argument('--packages', nargs='+', help='Names of packages to build (default: all)', default=[])
+ arg_parser.add_argument('--install-dependencies', '-i', help='Only install build dependencies', action='store_true')
args = arg_parser.parse_args()
# Load package configuration
@@ -275,6 +279,13 @@ if __name__ == '__main__':
with open(defaults_path, 'r') as file:
defaults = toml.load(file)
+ # Load global dependencies
+ global_dependencies = config.get('dependencies', {}).get('packages', [])
+ if global_dependencies:
+ ensure_dependencies(global_dependencies)
+ if args.install_dependencies:
+ exit(0)
+
packages = config['packages']
# Filter packages if specific packages are specified in the arguments
diff --git a/scripts/package-build/linux-kernel/package.toml b/scripts/package-build/linux-kernel/package.toml
index 0bbd6785..b98bcd2f 100644
--- a/scripts/package-build/linux-kernel/package.toml
+++ b/scripts/package-build/linux-kernel/package.toml
@@ -81,3 +81,45 @@ name = "ipt-netflow"
commit_id = "0eb2092e93"
scm_url = "https://github.com/aabc/ipt-netflow"
build_cmd = "build_ipt_netflow"
+
+[dependencies]
+packages = [
+ "cmake",
+ "gnupg2",
+ "rsync",
+ "libelf-dev",
+ "libncurses5-dev",
+ "flex",
+ "bison",
+ "bc",
+ "kmod",
+ "cpio",
+ "dwarves",
+ "nasm",
+ "rdfind",
+ "pciutils",
+ "yasm",
+ "libudev-dev",
+ "ruby",
+ "ruby-dev",
+ "rubygems",
+ "build-essential",
+ "libdw-dev",
+ "libunwind-dev",
+ "systemtap-sdt-dev",
+ "libslang2-dev",
+ "python-dev-is-python3",
+ "libzstd-dev",
+ "libcap-dev",
+ "libnuma-dev",
+ "libbabeltrace-ctf-dev",
+ "libpfm4-dev",
+ "libtraceevent-dev",
+ "liblua5.3-dev",
+ "libssl3",
+ "libssl-dev",
+ "libpcre3-dev",
+ "libnl-genl-3-dev",
+ "libxtables-dev",
+ "asciidoc-base"
+]
diff --git a/scripts/package-build/linux-kernel/patches/accel-ppp/0002-Add-vrf-support-for-Framed-Route-and-Framed-IPv6-Rou.patch b/scripts/package-build/linux-kernel/patches/accel-ppp/0002-Add-vrf-support-for-Framed-Route-and-Framed-IPv6-Rou.patch
new file mode 100644
index 00000000..b963050f
--- /dev/null
+++ b/scripts/package-build/linux-kernel/patches/accel-ppp/0002-Add-vrf-support-for-Framed-Route-and-Framed-IPv6-Rou.patch
@@ -0,0 +1,639 @@
+From 5587c45d9e3264f45eba636941cf80b90f2f6186 Mon Sep 17 00:00:00 2001
+From: Chris Hills <chris@brsk.co.uk>
+Date: Thu, 29 Jun 2023 09:24:36 +0100
+Subject: [PATCH 2/4] Add vrf support for Framed-Route and Framed-IPv6-Route
+
+(cherry picked from commit 899dc375fe01672a5eae2d7f7db81edc0d2a4440)
+---
+ accel-pppd/CMakeLists.txt | 4 +
+ accel-pppd/ctrl/ipoe/ipoe.c | 20 ++++
+ accel-pppd/ifcfg.c | 6 +-
+ accel-pppd/ipv6/dhcpv6.c | 8 ++
+ accel-pppd/libnetlink/iputils.c | 110 ++++++++++++++++-
+ accel-pppd/libnetlink/iputils.h | 11 ++
+ accel-pppd/libnetlink/rt_names.c | 196 +++++++++++++++++++++++++++++++
+ accel-pppd/libnetlink/rt_names.h | 14 +++
+ accel-pppd/radius/radius.c | 21 +++-
+ 9 files changed, 384 insertions(+), 6 deletions(-)
+ create mode 100644 accel-pppd/libnetlink/rt_names.c
+ create mode 100644 accel-pppd/libnetlink/rt_names.h
+
+diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt
+index ab8a350..c3995ea 100644
+--- a/accel-pppd/CMakeLists.txt
++++ b/accel-pppd/CMakeLists.txt
+@@ -123,6 +123,10 @@ ADD_EXECUTABLE(accel-pppd
+ main.c
+ )
+
++IF (DEFINED HAVE_VRF)
++ target_sources(accel-pppd PRIVATE libnetlink/rt_names.c)
++ENDIF (DEFINED HAVE_VRF)
++
+ TARGET_LINK_LIBRARIES(accel-pppd triton rt pthread ${crypto_lib} pcre)
+ set_property(TARGET accel-pppd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
+ set_property(TARGET accel-pppd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
+index 61b7c23..6f23fd6 100644
+--- a/accel-pppd/ctrl/ipoe/ipoe.c
++++ b/accel-pppd/ctrl/ipoe/ipoe.c
+@@ -1067,9 +1067,17 @@ static void __ipoe_session_activate(struct ipoe_session *ses)
+
+ if (ses->ifindex == -1 && !serv->opt_ifcfg) {
+ if (!serv->opt_ip_unnumbered)
++#ifdef HAVE_VRF
++ iproute_add(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0, NULL);
++#else
+ iproute_add(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0);
++#endif
+ else
++#ifdef HAVE_VRF
++ iproute_add(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
++#else
+ iproute_add(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
++#endif
+ }
+
+ if (ses->l4_redirect)
+@@ -1170,7 +1178,11 @@ static void ipoe_session_started(struct ap_session *s)
+
+ if (ses->ses.ipv4->peer_addr != ses->yiaddr)
+ //ipaddr_add_peer(ses->ses.ifindex, ses->router, ses->yiaddr); // breaks quagga
++#ifdef HAVE_VRF
++ iproute_add(ses->ses.ifindex, ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
++#else
+ iproute_add(ses->ses.ifindex, ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
++#endif
+
+ if (ses->ifindex != -1 && ses->xid) {
+ ses->dhcpv4 = dhcpv4_create(ses->ctrl.ctx, ses->ses.ifname, "");
+@@ -1254,9 +1266,17 @@ static void ipoe_session_finished(struct ap_session *s)
+ } else if (ses->started) {
+ if (!serv->opt_ifcfg) {
+ if (!serv->opt_ip_unnumbered)
++#ifdef HAVE_VRF
++ iproute_del(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0, NULL);
++#else
+ iproute_del(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0);
++#endif
+ else
++#ifdef HAVE_VRF
++ iproute_del(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
++#else
+ iproute_del(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
++#endif
+ }
+ }
+
+diff --git a/accel-pppd/ifcfg.c b/accel-pppd/ifcfg.c
+index 3750060..3b1848e 100644
+--- a/accel-pppd/ifcfg.c
++++ b/accel-pppd/ifcfg.c
+@@ -234,7 +234,11 @@ void __export ap_session_ifdown(struct ap_session *ses)
+ if (!a->installed)
+ continue;
+ if (a->prefix_len > 64)
++#ifdef HAVE_VRF
++ ip6route_del(ses->ifindex, &a->addr, a->prefix_len, NULL, 0, 0, ses->vrf_name);
++#else
+ ip6route_del(ses->ifindex, &a->addr, a->prefix_len, NULL, 0, 0);
++#endif
+ else {
+ struct in6_addr addr;
+ memcpy(addr.s6_addr, &a->addr, 8);
+@@ -376,4 +380,4 @@ int __export ap_session_vrf(struct ap_session *ses, const char *vrf_name, int le
+
+ return 0;
+ }
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/accel-pppd/ipv6/dhcpv6.c b/accel-pppd/ipv6/dhcpv6.c
+index 158771b..41e6c3f 100644
+--- a/accel-pppd/ipv6/dhcpv6.c
++++ b/accel-pppd/ipv6/dhcpv6.c
+@@ -159,7 +159,11 @@ static void ev_ses_finished(struct ap_session *ses)
+ if (pd->dp_active) {
+ struct ipv6db_addr_t *p;
+ list_for_each_entry(p, &ses->ipv6_dp->prefix_list, entry)
++#ifdef HAVE_VRF
++ ip6route_del(0, &p->addr, p->prefix_len, NULL, 0, 0, ses->vrf_name);
++#else
+ ip6route_del(0, &p->addr, p->prefix_len, NULL, 0, 0);
++#endif
+ }
+
+ ipdb_put_ipv6_prefix(ses, ses->ipv6_dp);
+@@ -181,7 +185,11 @@ static void insert_dp_routes(struct ap_session *ses, struct dhcpv6_pd *pd, struc
+ addr = NULL;
+
+ list_for_each_entry(p, &ses->ipv6_dp->prefix_list, entry) {
++#ifdef HAVE_VRF
++ if (ip6route_add(ses->ifindex, &p->addr, p->prefix_len, addr, 0, 0, ses->vrf_name)) {
++#else
+ if (ip6route_add(ses->ifindex, &p->addr, p->prefix_len, addr, 0, 0)) {
++#endif
+ err = errno;
+ inet_ntop(AF_INET6, &p->addr, str1, sizeof(str1));
+ if (addr)
+diff --git a/accel-pppd/libnetlink/iputils.c b/accel-pppd/libnetlink/iputils.c
+index 23325fc..6c61fc2 100644
+--- a/accel-pppd/libnetlink/iputils.c
++++ b/accel-pppd/libnetlink/iputils.c
+@@ -11,7 +11,9 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <sys/uio.h>
+-//#include <linux/if_link.h>
++#ifdef HAVE_VRF
++#include <linux/if_link.h>
++#endif
+ //#include <linux/if_addr.h>
+ //#include <linux/rtnetlink.h>
+ #include <linux/fib_rules.h>
+@@ -21,6 +23,9 @@
+ #include "libnetlink.h"
+ #include "iputils.h"
+ #include "ap_net.h"
++#ifdef HAVE_VRF
++#include "rt_names.h"
++#endif
+
+ #ifdef ACCEL_DP
+ #define _malloc(x) malloc(x)
+@@ -457,7 +462,82 @@ int __export ipaddr_del_peer(int ifindex, in_addr_t addr, in_addr_t peer)
+ return r;
+ }
+
++#ifdef HAVE_VRF
++__u32 ipvrf_get_table(const char *vrf_name)
++{
++ struct iplink_req {
++ struct nlmsghdr n;
++ struct ifinfomsg i;
++ char buf[4096];
++ } req;
++ struct rtnl_handle *rth = net->rtnl_get();
++ struct rtattr *tb[IFLA_MAX+1];
++ struct rtattr *li[IFLA_INFO_MAX+1];
++ struct rtattr *vrf_attr[IFLA_VRF_MAX + 1];
++ struct ifinfomsg *ifi;
++ int len;
++ __u32 tb_id = RT_TABLE_MAIN;
++
++ log_ppp_info2("utils: getting route table for %s\n", vrf_name);
++
++ if (!vrf_name)
++ return tb_id;
++
++ memset(&req, 0, sizeof(req) - 4096);
++
++ req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
++ req.n.nlmsg_flags = NLM_F_REQUEST;
++ req.n.nlmsg_type = RTM_GETLINK;
++ req.i.ifi_family = AF_UNSPEC;
++
++ addattr_l(&req.n, 4096, IFLA_IFNAME, vrf_name, strlen(vrf_name));
++
++ if (rtnl_talk(rth, &req.n, 0, 0, &req.n, NULL, NULL, 0) < 0) {
++ if (errno == ENODEV && !strcmp(vrf_name, "default"))
++ if (rtnl_rttable_a2n(&tb_id, "main"))
++ log_ppp_error(
++ "BUG: route table \"main\" not found.\n");
++ return tb_id;
++ }
++
++ ifi = NLMSG_DATA(&req.n);
++
++ len = req.n.nlmsg_len;
++
++ len -= NLMSG_LENGTH(sizeof(*ifi));
++ if (len < 0)
++ goto out;
++
++ parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
++
++ if (!tb[IFLA_LINKINFO])
++ goto out;
++
++ parse_rtattr_nested(li, IFLA_INFO_MAX, tb[IFLA_LINKINFO]);
++
++ if (!li[IFLA_INFO_KIND] || !li[IFLA_INFO_DATA])
++ goto out;
++
++ if (strcmp(RTA_DATA(li[IFLA_INFO_KIND]), "vrf"))
++ goto out;
++
++ parse_rtattr_nested(vrf_attr, IFLA_VRF_MAX, li[IFLA_INFO_DATA]);
++ if (vrf_attr[IFLA_VRF_TABLE])
++ tb_id = *(__u32 *)RTA_DATA(vrf_attr[IFLA_VRF_TABLE]);
++
++ if (!tb_id)
++ log_ppp_error("BUG: VRF %s is missing table id\n", vrf_name);
++
++out:
++ return tb_id;
++}
++#endif
++
++#ifdef HAVE_VRF
++int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name)
++#else
+ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio)
++#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -472,11 +552,17 @@ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+
+ memset(&req, 0, sizeof(req) - 4096);
+
++#ifdef HAVE_VRF
++ __u32 rt_table = ipvrf_get_table(vrf_name);
++#else
++ __u32 rt_table = RT_TABLE_MAIN;
++#endif
++
+ req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+ req.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE;
+ req.n.nlmsg_type = RTM_NEWROUTE;
+ req.i.rtm_family = AF_INET;
+- req.i.rtm_table = RT_TABLE_MAIN;
++ req.i.rtm_table = rt_table;
+ req.i.rtm_scope = gw ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
+ req.i.rtm_protocol = proto;
+ req.i.rtm_type = RTN_UNICAST;
+@@ -500,7 +586,11 @@ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+ return r;
+ }
+
++#ifdef HAVE_VRF
++int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name)
++#else
+ int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio)
++#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -543,7 +633,11 @@ int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+ return r;
+ }
+
++#ifdef HAVE_VRF
++int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name)
++#else
+ int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio)
++#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -558,11 +652,17 @@ int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len,
+
+ memset(&req, 0, sizeof(req) - 4096);
+
++#ifdef HAVE_VRF
++ __u32 rt_table = ipvrf_get_table(vrf_name);
++#else
++ __u32 rt_table = RT_TABLE_MAIN;
++#endif
++
+ req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+ req.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE;
+ req.n.nlmsg_type = RTM_NEWROUTE;
+ req.i.rtm_family = AF_INET6;
+- req.i.rtm_table = RT_TABLE_MAIN;
++ req.i.rtm_table = rt_table;
+ req.i.rtm_scope = RT_SCOPE_UNIVERSE;
+ req.i.rtm_protocol = proto;
+ req.i.rtm_type = RTN_UNICAST;
+@@ -584,7 +684,11 @@ int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len,
+ return r;
+ }
+
++#ifdef HAVE_VRF
++int __export ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name)
++#else
+ int __export ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio)
++#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+diff --git a/accel-pppd/libnetlink/iputils.h b/accel-pppd/libnetlink/iputils.h
+index 9292cea..c3063f4 100644
+--- a/accel-pppd/libnetlink/iputils.h
++++ b/accel-pppd/libnetlink/iputils.h
+@@ -4,6 +4,7 @@
+ #include <linux/if_link.h>
+ #include <netinet/in.h>
+ #include <stdint.h>
++#include <config.h>
+
+ typedef int (*iplink_list_func)(int index, int flags, const char *name, int iflink, int vid, void *arg);
+
+@@ -20,12 +21,22 @@ int ipaddr_add_peer(int ifindex, in_addr_t addr, in_addr_t peer_addr);
+ int ipaddr_del(int ifindex, in_addr_t addr, int mask);
+ int ipaddr_del_peer(int ifindex, in_addr_t addr, in_addr_t peer);
+
++#ifdef HAVE_VRF
++int iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name);
++int iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name);
++#else
+ int iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio);
+ int iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio);
++#endif
+ in_addr_t iproute_get(in_addr_t dst, in_addr_t *gw);
+
++#ifdef HAVE_VRF
++int ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name);
++int ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name);
++#else
+ int ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio);
+ int ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio);
++#endif
+ int ip6addr_add(int ifindex, struct in6_addr *addr, int prefix_len);
+ int ip6addr_add_peer(int ifindex, struct in6_addr *addr, struct in6_addr *peer_addr);
+ int ip6addr_del(int ifindex, struct in6_addr *addr, int prefix_len);
+diff --git a/accel-pppd/libnetlink/rt_names.c b/accel-pppd/libnetlink/rt_names.c
+new file mode 100644
+index 0000000..5591a67
+--- /dev/null
++++ b/accel-pppd/libnetlink/rt_names.c
+@@ -0,0 +1,196 @@
++/* SPDX-License-Identifier: GPL-2.0-or-later */
++/*
++ * rt_names.c rtnetlink names DB.
++ *
++ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <string.h>
++#include <sys/time.h>
++#include <sys/socket.h>
++#include <dirent.h>
++#include <limits.h>
++
++#include <asm/types.h>
++#include <linux/rtnetlink.h>
++
++#include "rt_names.h"
++#include "utils.h"
++
++#define NAME_MAX_LEN 512
++#define CONFDIR "/etc/iproute2"
++
++int numeric;
++
++struct rtnl_hash_entry {
++ struct rtnl_hash_entry *next;
++ const char *name;
++ unsigned int id;
++};
++
++static int fread_id_name(FILE *fp, int *id, char *namebuf)
++{
++ char buf[NAME_MAX_LEN];
++
++ while (fgets(buf, sizeof(buf), fp)) {
++ char *p = buf;
++
++ while (*p == ' ' || *p == '\t')
++ p++;
++
++ if (*p == '#' || *p == '\n' || *p == 0)
++ continue;
++
++ if (sscanf(p, "0x%x %s\n", id, namebuf) != 2 &&
++ sscanf(p, "0x%x %s #", id, namebuf) != 2 &&
++ sscanf(p, "%d %s\n", id, namebuf) != 2 &&
++ sscanf(p, "%d %s #", id, namebuf) != 2) {
++ strcpy(namebuf, p);
++ return -1;
++ }
++ return 1;
++ }
++ return 0;
++}
++
++static void
++rtnl_hash_initialize(const char *file, struct rtnl_hash_entry **hash, int size)
++{
++ struct rtnl_hash_entry *entry;
++ FILE *fp;
++ int id;
++ char namebuf[NAME_MAX_LEN] = {0};
++ int ret;
++
++ fp = fopen(file, "r");
++ if (!fp)
++ return;
++
++ while ((ret = fread_id_name(fp, &id, &namebuf[0]))) {
++ if (ret == -1) {
++ fprintf(stderr, "Database %s is corrupted at %s\n",
++ file, namebuf);
++ fclose(fp);
++ return;
++ }
++
++ if (id < 0)
++ continue;
++
++ entry = malloc(sizeof(*entry));
++ if (entry == NULL) {
++ fprintf(stderr, "malloc error: for entry\n");
++ break;
++ }
++ entry->id = id;
++ entry->name = strdup(namebuf);
++ entry->next = hash[id & (size - 1)];
++ hash[id & (size - 1)] = entry;
++ }
++ fclose(fp);
++}
++
++static struct rtnl_hash_entry dflt_table_entry = { .name = "default" };
++static struct rtnl_hash_entry main_table_entry = { .name = "main" };
++static struct rtnl_hash_entry local_table_entry = { .name = "local" };
++
++static struct rtnl_hash_entry *rtnl_rttable_hash[256] = {
++ [RT_TABLE_DEFAULT] = &dflt_table_entry,
++ [RT_TABLE_MAIN] = &main_table_entry,
++ [RT_TABLE_LOCAL] = &local_table_entry,
++};
++
++static int rtnl_rttable_init;
++
++static void rtnl_rttable_initialize(void)
++{
++ struct dirent *de;
++ DIR *d;
++ int i;
++
++ rtnl_rttable_init = 1;
++ for (i = 0; i < 256; i++) {
++ if (rtnl_rttable_hash[i])
++ rtnl_rttable_hash[i]->id = i;
++ }
++ rtnl_hash_initialize(CONFDIR "/rt_tables",
++ rtnl_rttable_hash, 256);
++
++ d = opendir(CONFDIR "/rt_tables.d");
++ if (!d)
++ return;
++
++ while ((de = readdir(d)) != NULL) {
++ char path[PATH_MAX];
++ size_t len;
++
++ if (*de->d_name == '.')
++ continue;
++
++ /* only consider filenames ending in '.conf' */
++ len = strlen(de->d_name);
++ if (len <= 5)
++ continue;
++ if (strcmp(de->d_name + len - 5, ".conf"))
++ continue;
++
++ snprintf(path, sizeof(path),
++ CONFDIR "/rt_tables.d/%s", de->d_name);
++ rtnl_hash_initialize(path, rtnl_rttable_hash, 256);
++ }
++ closedir(d);
++}
++
++const char *rtnl_rttable_n2a(__u32 id, char *buf, int len)
++{
++ struct rtnl_hash_entry *entry;
++
++ if (!rtnl_rttable_init)
++ rtnl_rttable_initialize();
++ entry = rtnl_rttable_hash[id & 255];
++ while (entry && entry->id != id)
++ entry = entry->next;
++ if (!numeric && entry)
++ return entry->name;
++ snprintf(buf, len, "%u", id);
++ return buf;
++}
++
++int rtnl_rttable_a2n(__u32 *id, const char *arg)
++{
++ static const char *cache;
++ static unsigned long res;
++ struct rtnl_hash_entry *entry;
++ char *end;
++ unsigned long i;
++
++ if (cache && strcmp(cache, arg) == 0) {
++ *id = res;
++ return 0;
++ }
++
++ if (!rtnl_rttable_init)
++ rtnl_rttable_initialize();
++
++ for (i = 0; i < 256; i++) {
++ entry = rtnl_rttable_hash[i];
++ while (entry && strcmp(entry->name, arg))
++ entry = entry->next;
++ if (entry) {
++ cache = entry->name;
++ res = entry->id;
++ *id = res;
++ return 0;
++ }
++ }
++
++ i = strtoul(arg, &end, 0);
++ if (!end || end == arg || *end || i > RT_TABLE_MAX)
++ return -1;
++ *id = i;
++ return 0;
++}
+diff --git a/accel-pppd/libnetlink/rt_names.h b/accel-pppd/libnetlink/rt_names.h
+new file mode 100644
+index 0000000..2ba6fe9
+--- /dev/null
++++ b/accel-pppd/libnetlink/rt_names.h
+@@ -0,0 +1,14 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++#ifndef RT_NAMES_H_
++#define RT_NAMES_H_ 1
++
++#include <asm/types.h>
++
++const char *rtnl_rttable_n2a(__u32 id, char *buf, int len);
++const char *rtnl_dsfield_get_name(int id);
++
++int rtnl_rttable_a2n(__u32 *id, const char *arg);
++
++extern int numeric;
++
++#endif
+diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c
+index 2406ba0..a45666f 100644
+--- a/accel-pppd/radius/radius.c
++++ b/accel-pppd/radius/radius.c
+@@ -313,6 +313,7 @@ int rad_proc_attrs(struct rad_req_t *req)
+ } else if (attr->vendor->id == VENDOR_Accel_PPP) {
+ switch (attr->attr->id) {
+ case Accel_VRF_Name:
++ log_ppp_info2("radius: setting vrf_name to %s\n", attr->val.string);
+ if (rpd->ses->vrf_name)
+ _free(rpd->ses->vrf_name);
+ rpd->ses->vrf_name = _malloc(attr->len + 1);
+@@ -642,15 +643,23 @@ static void ses_started(struct ap_session *ses)
+ char nbuf[INET6_ADDRSTRLEN];
+ char gwbuf[INET6_ADDRSTRLEN];
+
++#ifdef HAVE_VRF
++ if (ip6route_add(gw_spec ? 0 : rpd->ses->ifindex, &fr6->prefix, fr6->plen, gw_spec ? &fr6->gw : NULL, 3, fr6->prio, rpd->ses->vrf_name)) {
++#else
+ if (ip6route_add(gw_spec ? 0 : rpd->ses->ifindex, &fr6->prefix, fr6->plen, gw_spec ? &fr6->gw : NULL, 3, fr6->prio)) {
++#endif
+ log_ppp_warn("radius: failed to add route %s/%hhu %s %u\n",
+- u_ip6str(&fr6->prefix, nbuf), fr6->plen,
+- u_ip6str(&fr6->gw, gwbuf), fr6->prio);
++ u_ip6str(&fr6->prefix, nbuf), fr6->plen,
++ u_ip6str(&fr6->gw, gwbuf), fr6->prio);
+ }
+ }
+
+ for (fr = rpd->fr; fr; fr = fr->next) {
++#ifdef HAVE_VRF
++ if (iproute_add(fr->gw ? 0 : rpd->ses->ifindex, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio, rpd->ses->vrf_name)) {
++#else
+ if (iproute_add(fr->gw ? 0 : rpd->ses->ifindex, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio)) {
++#endif
+ char dst[17], gw[17];
+ u_inet_ntoa(fr->dst, dst);
+ u_inet_ntoa(fr->gw, gw);
+@@ -689,12 +698,20 @@ static void ses_finishing(struct ap_session *ses)
+ * when the interface is removed.
+ */
+ if (!IN6_IS_ADDR_UNSPECIFIED(&fr6->gw))
++#ifdef HAVE_VRF
++ ip6route_del(0, &fr6->prefix, fr6->plen, &fr6->gw, 3, fr6->prio, rpd->ses->vrf_name);
++#else
+ ip6route_del(0, &fr6->prefix, fr6->plen, &fr6->gw, 3, fr6->prio);
++#endif
+ }
+
+ for (fr = rpd->fr; fr; fr = fr->next) {
+ if (fr->gw)
++#ifdef HAVE_VRF
++ iproute_del(0, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio, rpd->ses->vrf_name);
++#else
+ iproute_del(0, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio);
++#endif
+ }
+
+ if (rpd->acct_started || rpd->acct_req)
+--
+2.39.5
+
diff --git a/scripts/package-build/linux-kernel/patches/accel-ppp/0003-Simplify-implementation-of-vrf-support-for-iproute_a.patch b/scripts/package-build/linux-kernel/patches/accel-ppp/0003-Simplify-implementation-of-vrf-support-for-iproute_a.patch
new file mode 100644
index 00000000..3c8fff94
--- /dev/null
+++ b/scripts/package-build/linux-kernel/patches/accel-ppp/0003-Simplify-implementation-of-vrf-support-for-iproute_a.patch
@@ -0,0 +1,213 @@
+From 4898832b90a6b929b8316fe55085b14c3afcf4a8 Mon Sep 17 00:00:00 2001
+From: Chris Hills <chris@brsk.co.uk>
+Date: Mon, 3 Jul 2023 14:42:22 +0100
+Subject: [PATCH 3/4] Simplify implementation of vrf support for
+ iproute_add/del
+
+(cherry picked from commit 85cbd27bd440e0a4836bb9e03c933e05fd321769)
+---
+ accel-pppd/ctrl/ipoe/ipoe.c | 24 ++----------------------
+ accel-pppd/libnetlink/iputils.c | 16 ----------------
+ accel-pppd/libnetlink/iputils.h | 5 -----
+ accel-pppd/radius/radius.c | 16 ----------------
+ accel-pppd/session.c | 1 +
+ 5 files changed, 3 insertions(+), 59 deletions(-)
+
+diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
+index 6f23fd6..3a6c85b 100644
+--- a/accel-pppd/ctrl/ipoe/ipoe.c
++++ b/accel-pppd/ctrl/ipoe/ipoe.c
+@@ -1021,9 +1021,9 @@ static void __ipoe_session_activate(struct ipoe_session *ses)
+ in_addr_t gw;
+ iproute_get(ses->router, &gw, NULL);
+ if (gw)
+- iproute_add(0, ses->siaddr, ses->yiaddr, gw, conf_proto, 32);
++ iproute_add(0, ses->siaddr, ses->yiaddr, gw, conf_proto, 32, NULL);
+ else
+- iproute_add(0, ses->siaddr, ses->router, gw, conf_proto, 32);
++ iproute_add(0, ses->siaddr, ses->router, gw, conf_proto, 32, NULL);
+ }*/
+
+ if (serv->opt_mode == MODE_L3)
+@@ -1067,17 +1067,9 @@ static void __ipoe_session_activate(struct ipoe_session *ses)
+
+ if (ses->ifindex == -1 && !serv->opt_ifcfg) {
+ if (!serv->opt_ip_unnumbered)
+-#ifdef HAVE_VRF
+ iproute_add(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0, NULL);
+-#else
+- iproute_add(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0);
+-#endif
+ else
+-#ifdef HAVE_VRF
+ iproute_add(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
+-#else
+- iproute_add(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
+-#endif
+ }
+
+ if (ses->l4_redirect)
+@@ -1178,11 +1170,7 @@ static void ipoe_session_started(struct ap_session *s)
+
+ if (ses->ses.ipv4->peer_addr != ses->yiaddr)
+ //ipaddr_add_peer(ses->ses.ifindex, ses->router, ses->yiaddr); // breaks quagga
+-#ifdef HAVE_VRF
+ iproute_add(ses->ses.ifindex, ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
+-#else
+- iproute_add(ses->ses.ifindex, ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
+-#endif
+
+ if (ses->ifindex != -1 && ses->xid) {
+ ses->dhcpv4 = dhcpv4_create(ses->ctrl.ctx, ses->ses.ifname, "");
+@@ -1266,17 +1254,9 @@ static void ipoe_session_finished(struct ap_session *s)
+ } else if (ses->started) {
+ if (!serv->opt_ifcfg) {
+ if (!serv->opt_ip_unnumbered)
+-#ifdef HAVE_VRF
+ iproute_del(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0, NULL);
+-#else
+- iproute_del(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask, 0);
+-#endif
+ else
+-#ifdef HAVE_VRF
+ iproute_del(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0, NULL);
+-#else
+- iproute_del(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32, 0);
+-#endif
+ }
+ }
+
+diff --git a/accel-pppd/libnetlink/iputils.c b/accel-pppd/libnetlink/iputils.c
+index 6c61fc2..60eca8b 100644
+--- a/accel-pppd/libnetlink/iputils.c
++++ b/accel-pppd/libnetlink/iputils.c
+@@ -533,11 +533,7 @@ out:
+ }
+ #endif
+
+-#ifdef HAVE_VRF
+ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name)
+-#else
+-int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio)
+-#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -586,11 +582,7 @@ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+ return r;
+ }
+
+-#ifdef HAVE_VRF
+ int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name)
+-#else
+-int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio)
+-#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -633,11 +625,7 @@ int __export iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+ return r;
+ }
+
+-#ifdef HAVE_VRF
+ int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name)
+-#else
+-int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio)
+-#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+@@ -684,11 +672,7 @@ int __export ip6route_add(int ifindex, const struct in6_addr *dst, int pref_len,
+ return r;
+ }
+
+-#ifdef HAVE_VRF
+ int __export ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio, const char *vrf_name)
+-#else
+-int __export ip6route_del(int ifindex, const struct in6_addr *dst, int pref_len, const struct in6_addr *gw, int proto, uint32_t prio)
+-#endif
+ {
+ struct ipaddr_req {
+ struct nlmsghdr n;
+diff --git a/accel-pppd/libnetlink/iputils.h b/accel-pppd/libnetlink/iputils.h
+index c3063f4..d3a93f4 100644
+--- a/accel-pppd/libnetlink/iputils.h
++++ b/accel-pppd/libnetlink/iputils.h
+@@ -21,13 +21,8 @@ int ipaddr_add_peer(int ifindex, in_addr_t addr, in_addr_t peer_addr);
+ int ipaddr_del(int ifindex, in_addr_t addr, int mask);
+ int ipaddr_del_peer(int ifindex, in_addr_t addr, in_addr_t peer);
+
+-#ifdef HAVE_VRF
+ int iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name);
+ int iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio, const char *vrf_name);
+-#else
+-int iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio);
+-int iproute_del(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw, int proto, int mask, uint32_t prio);
+-#endif
+ in_addr_t iproute_get(in_addr_t dst, in_addr_t *gw);
+
+ #ifdef HAVE_VRF
+diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c
+index a45666f..9d567b7 100644
+--- a/accel-pppd/radius/radius.c
++++ b/accel-pppd/radius/radius.c
+@@ -643,11 +643,7 @@ static void ses_started(struct ap_session *ses)
+ char nbuf[INET6_ADDRSTRLEN];
+ char gwbuf[INET6_ADDRSTRLEN];
+
+-#ifdef HAVE_VRF
+ if (ip6route_add(gw_spec ? 0 : rpd->ses->ifindex, &fr6->prefix, fr6->plen, gw_spec ? &fr6->gw : NULL, 3, fr6->prio, rpd->ses->vrf_name)) {
+-#else
+- if (ip6route_add(gw_spec ? 0 : rpd->ses->ifindex, &fr6->prefix, fr6->plen, gw_spec ? &fr6->gw : NULL, 3, fr6->prio)) {
+-#endif
+ log_ppp_warn("radius: failed to add route %s/%hhu %s %u\n",
+ u_ip6str(&fr6->prefix, nbuf), fr6->plen,
+ u_ip6str(&fr6->gw, gwbuf), fr6->prio);
+@@ -655,11 +651,7 @@ static void ses_started(struct ap_session *ses)
+ }
+
+ for (fr = rpd->fr; fr; fr = fr->next) {
+-#ifdef HAVE_VRF
+ if (iproute_add(fr->gw ? 0 : rpd->ses->ifindex, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio, rpd->ses->vrf_name)) {
+-#else
+- if (iproute_add(fr->gw ? 0 : rpd->ses->ifindex, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio)) {
+-#endif
+ char dst[17], gw[17];
+ u_inet_ntoa(fr->dst, dst);
+ u_inet_ntoa(fr->gw, gw);
+@@ -698,20 +690,12 @@ static void ses_finishing(struct ap_session *ses)
+ * when the interface is removed.
+ */
+ if (!IN6_IS_ADDR_UNSPECIFIED(&fr6->gw))
+-#ifdef HAVE_VRF
+ ip6route_del(0, &fr6->prefix, fr6->plen, &fr6->gw, 3, fr6->prio, rpd->ses->vrf_name);
+-#else
+- ip6route_del(0, &fr6->prefix, fr6->plen, &fr6->gw, 3, fr6->prio);
+-#endif
+ }
+
+ for (fr = rpd->fr; fr; fr = fr->next) {
+ if (fr->gw)
+-#ifdef HAVE_VRF
+ iproute_del(0, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio, rpd->ses->vrf_name);
+-#else
+- iproute_del(0, 0, fr->dst, fr->gw, 3, fr->mask, fr->prio);
+-#endif
+ }
+
+ if (rpd->acct_started || rpd->acct_req)
+diff --git a/accel-pppd/session.c b/accel-pppd/session.c
+index c01417f..fedb6f5 100644
+--- a/accel-pppd/session.c
++++ b/accel-pppd/session.c
+@@ -68,6 +68,7 @@ void __export ap_session_init(struct ap_session *ses)
+ ses->ifindex = -1;
+ ses->unit_idx = -1;
+ ses->net = net;
++ ses->vrf_name = NULL;
+ }
+
+ void __export ap_session_set_ifindex(struct ap_session *ses)
+--
+2.39.5
+
diff --git a/scripts/package-build/linux-kernel/patches/accel-ppp/0004-Fix-whitespace-in-accel-pppd-libnetlink-iputils.c.patch b/scripts/package-build/linux-kernel/patches/accel-ppp/0004-Fix-whitespace-in-accel-pppd-libnetlink-iputils.c.patch
new file mode 100644
index 00000000..9273c8a3
--- /dev/null
+++ b/scripts/package-build/linux-kernel/patches/accel-ppp/0004-Fix-whitespace-in-accel-pppd-libnetlink-iputils.c.patch
@@ -0,0 +1,26 @@
+From a959ab0c0d659a8b314b98bb577a79ec9ed3542c Mon Sep 17 00:00:00 2001
+From: Chris Hills <chris@brsk.co.uk>
+Date: Tue, 11 Jul 2023 10:14:52 +0100
+Subject: [PATCH 4/4] Fix whitespace in accel-pppd/libnetlink/iputils.c
+
+(cherry picked from commit 10d2fba58928dcb4604a04169cbb3a8c9e8a172f)
+---
+ accel-pppd/libnetlink/iputils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/accel-pppd/libnetlink/iputils.c b/accel-pppd/libnetlink/iputils.c
+index 60eca8b..afe2380 100644
+--- a/accel-pppd/libnetlink/iputils.c
++++ b/accel-pppd/libnetlink/iputils.c
+@@ -551,7 +551,7 @@ int __export iproute_add(int ifindex, in_addr_t src, in_addr_t dst, in_addr_t gw
+ #ifdef HAVE_VRF
+ __u32 rt_table = ipvrf_get_table(vrf_name);
+ #else
+- __u32 rt_table = RT_TABLE_MAIN;
++ __u32 rt_table = RT_TABLE_MAIN;
+ #endif
+
+ req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+--
+2.39.5
+
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 7bd0b04b..107fdc67 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] VyOS: Add linkstate IP device attribute
Backport of earlier Vyatta patch.
(cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
+
---
Documentation/networking/ip-sysctl.rst | 11 +++++++++++
include/linux/inetdevice.h | 1 +
@@ -100,7 +101,7 @@ index c33b1ecc591e..7576d51cd16d 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 8360939acf85..b13832a08d28 100644
+index bb9add46e382..20346b1dd103 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5674,6 +5674,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -111,7 +112,7 @@ index 8360939acf85..b13832a08d28 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7103,6 +7104,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7116,6 +7117,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},
@@ -126,10 +127,10 @@ index 8360939acf85..b13832a08d28 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 5715d54f3d0b..e88971b512ba 100644
+index 53197087353a..4fed0253cf83 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -682,6 +682,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
+@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
}
#endif
@@ -144,7 +145,7 @@ index 5715d54f3d0b..e88971b512ba 100644
/*
* Default Router Selection (RFC 2461 6.3.6)
*/
-@@ -723,6 +731,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
+@@ -757,6 +765,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
if (!m && (strict & RT6_LOOKUP_F_IFACE))
return RT6_NUD_FAIL_HARD;
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
index b19a8d25..115f6831 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
@@ -19,6 +19,7 @@ for bug #303, and will allow that commit to be reverted.
Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425
(cherry picked from commit a93f1128bc83b5a6628da242e71c18ef05e81ea2)
+
---
fs/notify/inotify/Kconfig | 9 +++
fs/notify/inotify/inotify_user.c | 114 ++++++++++++++++++++++++++++++-
@@ -190,7 +191,7 @@ index 1c4bfdab008d..cf567cc33679 100644
struct inotify_inode_mark *i_mark)
{
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 2c056d737c27..2cb1f0024e70 100644
+index 93ee57bc82ad..5f4f886d011e 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -15,6 +15,7 @@
@@ -201,7 +202,7 @@ index 2c056d737c27..2cb1f0024e70 100644
#include <linux/file.h>
#include <linux/fs_context.h>
#include <linux/fs_parser.h>
-@@ -1528,6 +1529,18 @@ static void ovl_inode_init_once(void *foo)
+@@ -1533,6 +1534,18 @@ static void ovl_inode_init_once(void *foo)
inode_init_once(&oi->vfs_inode);
}
@@ -220,7 +221,7 @@ index 2c056d737c27..2cb1f0024e70 100644
static int __init ovl_init(void)
{
int err;
-@@ -1543,18 +1556,24 @@ static int __init ovl_init(void)
+@@ -1548,18 +1561,24 @@ static int __init ovl_init(void)
err = ovl_aio_request_cache_init();
if (!err) {
err = register_filesystem(&ovl_fs_type);
@@ -294,5 +295,5 @@ index 8d20caa1b268..c126e2f93a73 100644
+
#endif /* _LINUX_INOTIFY_H */
--
-2.39.2
+2.39.5
diff --git a/scripts/package-build/linux-kernel/patches/kernel/build-linux-perf-package.patch b/scripts/package-build/linux-kernel/patches/kernel/build-linux-perf-package.patch
new file mode 100644
index 00000000..082ad589
--- /dev/null
+++ b/scripts/package-build/linux-kernel/patches/kernel/build-linux-perf-package.patch
@@ -0,0 +1,62 @@
+diff --git c/scripts/package/builddeb i/scripts/package/builddeb
+index d7dd0d04c70c..6f4a9a7c2c62 100755
+--- c/scripts/package/builddeb
++++ i/scripts/package/builddeb
+@@ -182,6 +182,16 @@ install_libc_headers () {
+ mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/
+ }
+
++install_perf () {
++ pdir=$1
++
++ rm -rf $pdir
++
++ $MAKE -C tools/ perf_install prefix=$pdir/usr
++ mv tools/perf/$pdir/usr $srctree/$pdir
++
++}
++
+ rm -f debian/files
+
+ packages_enabled=$(dh_listpackages)
+@@ -199,6 +209,8 @@ do
+ install_libc_headers debian/linux-libc-dev;;
+ linux-headers-*)
+ install_kernel_headers debian/linux-headers ${package#linux-headers-};;
++ linux-perf-*)
++ install_perf debian/linux-perf ${package};;
+ esac
+ done
+
+@@ -213,6 +225,8 @@ do
+ create_package ${package} debian/linux-libc-dev;;
+ linux-headers-*)
+ create_package ${package} debian/linux-headers;;
++ linux-perf-*)
++ create_package ${package} debian/linux-perf;;
+ esac
+ done
+
+diff --git c/scripts/package/mkdebian i/scripts/package/mkdebian
+index 5044224cf671..21f98ae50be0 100755
+--- c/scripts/package/mkdebian
++++ i/scripts/package/mkdebian
+@@ -238,6 +238,18 @@ Description: Linux support headers for userspace development
+ Multi-Arch: same
+ EOF
+
++cat <<EOF >> debian/control
++
++Package: linux-perf-$version
++Section: devel
++Architecture: $debarch
++Depends: \${shlibs:Depends}
++Description: Performance analysis tools for Linux $version
++ This package contains the 'perf' performance analysis tools for Linux
++ kernel version $version .
++Multi-Arch: same
++EOF
++
+ if is_enabled CONFIG_MODULES; then
+ cat <<EOF >> debian/control
+
diff --git a/scripts/package-build/netfilter/package.toml b/scripts/package-build/netfilter/package.toml
index a39ba8b7..ec28280a 100644
--- a/scripts/package-build/netfilter/package.toml
+++ b/scripts/package-build/netfilter/package.toml
@@ -13,3 +13,9 @@ sudo dpkg -i ../libnftnl*.deb
sudo mk-build-deps --install --tool 'apt-get --yes --no-install-recommends'
dpkg-buildpackage -uc -us -tc -b
"""
+
+[dependencies]
+packages = [
+ "asciidoc-base",
+ "bison"
+]
diff --git a/scripts/package-build/openvpn-otp/package.toml b/scripts/package-build/openvpn-otp/package.toml
index bdbc6d9d..51430864 100644
--- a/scripts/package-build/openvpn-otp/package.toml
+++ b/scripts/package-build/openvpn-otp/package.toml
@@ -17,3 +17,11 @@ fpm --input-type dir --output-type deb --name openvpn-otp \
--depends openvpn --architecture $(dpkg --print-architecture) \
--version $(git describe --tags --always | cut -c2-) --deb-compression gz usr
"""
+
+
+[dependencies]
+packages = [
+ "debhelper",
+ "libssl-dev",
+ "openvpn"
+]
diff --git a/scripts/package-build/udp-broadcast-relay/build.py b/scripts/package-build/udp-broadcast-relay/build.py
new file mode 120000
index 00000000..3c76af73
--- /dev/null
+++ b/scripts/package-build/udp-broadcast-relay/build.py
@@ -0,0 +1 @@
+../build.py \ No newline at end of file
diff --git a/scripts/package-build/udp-broadcast-relay/package.toml b/scripts/package-build/udp-broadcast-relay/package.toml
new file mode 100644
index 00000000..c7bc4323
--- /dev/null
+++ b/scripts/package-build/udp-broadcast-relay/package.toml
@@ -0,0 +1,21 @@
+[[packages]]
+name = "udp-broadcast-relay"
+commit_id = "9a0f13b4b5938bfe0af0d0d4e99dfc127c068e28"
+scm_url = "https://github.com/nomeata/udp-broadcast-relay"
+
+apply_patches = false
+
+build_cmd = """
+for patch in ../patches/udp-broadcast-relay/*.patch; do
+ echo "I: build_cmd applying patch $patch..."
+ git -c user.email=maintainers@vyos.net -c user.name=vyos am "$patch" || { echo "Failed to apply patch $patch"; exit 1; }
+done
+
+dpkg-buildpackage -uc -us -tc -b -d
+"""
+
+[dependencies]
+packages = [
+ "debhelper-compat",
+ "dpkg-dev",
+]
diff --git a/scripts/package-build/udp-broadcast-relay/patches/udp-broadcast-relay/0001-Add-Debian-packaging.patch b/scripts/package-build/udp-broadcast-relay/patches/udp-broadcast-relay/0001-Add-Debian-packaging.patch
new file mode 100644
index 00000000..fb3073c7
--- /dev/null
+++ b/scripts/package-build/udp-broadcast-relay/patches/udp-broadcast-relay/0001-Add-Debian-packaging.patch
@@ -0,0 +1,202 @@
+From f30e9b267d582040df5afeb57ed8a337fba00bfb Mon Sep 17 00:00:00 2001
+From: Daniil Baturin <daniil@vyos.io>
+Date: Mon, 26 May 2025 17:59:39 +0100
+Subject: [PATCH] Add Debian packaging
+
+---
+ Makefile | 9 ++++++
+ debian/changelog | 5 +++
+ debian/compat | 1 +
+ debian/control | 26 +++++++++++++++
+ debian/copyright | 16 +++++++++
+ debian/rules | 63 ++++++++++++++++++++++++++++++++++++
+ udp-broadcast-relay@.service | 14 ++++++++
+ 7 files changed, 134 insertions(+)
+ create mode 100644 debian/changelog
+ create mode 100644 debian/compat
+ create mode 100644 debian/control
+ create mode 100644 debian/copyright
+ create mode 100755 debian/rules
+ create mode 100644 udp-broadcast-relay@.service
+
+diff --git a/Makefile b/Makefile
+index 04ef122..2ff8dbd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,3 +6,12 @@ udp-broadcast-relay: main.c
+
+ clean:
+ rm -f udp-broadcast-relay
++ rm -f build-stamp
++ rm -rf debian/udp-broadcast-relay
++
++
++install:
++ install -d $(DESTDIR)/usr/sbin
++ install -d $(DESTDIR)/lib/systemd/system
++ install -m 0755 udp-broadcast-relay $(DESTDIR)/usr/sbin
++ install -m 0644 udp-broadcast-relay@.service $(DESTDIR)/lib/systemd/system
+diff --git a/debian/changelog b/debian/changelog
+new file mode 100644
+index 0000000..a94fcee
+--- /dev/null
++++ b/debian/changelog
+@@ -0,0 +1,5 @@
++udp-broadcast-relay (0.3+vyos) unstable; urgency=medium
++
++ * Debian packaging for VyOS.
++
++ -- Daniil Baturin <daniil@vyos.io> Mon, 26 May 2025 17:58:33 +0100
+diff --git a/debian/compat b/debian/compat
+new file mode 100644
+index 0000000..f599e28
+--- /dev/null
++++ b/debian/compat
+@@ -0,0 +1 @@
++10
+diff --git a/debian/control b/debian/control
+new file mode 100644
+index 0000000..2528395
+--- /dev/null
++++ b/debian/control
+@@ -0,0 +1,26 @@
++Source: udp-broadcast-relay
++Section: net
++Priority: optional
++Maintainer: VyOS maintainers <maintainers@vyos.io>
++Build-Depends: debhelper (>= 9.2),
++ pkg-config,
++Standards-Version: 3.9.6
++Vcs-Git: https://github.com/nomeata/udp-broadcast-relay
++Homepage: https://github.com/nomeata/udp-broadcast-relay
++
++Package: udp-broadcast-relay
++Architecture: linux-any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: UDP Broadcast Packet Relay
++ This program listens for packets on a specified UDP broadcast port. When
++ a packet is received, it sends that packet to all specified interfaces
++ but the one it came from as though it originated from the original
++ sender.
++ .
++ The primary purpose of this is to allow games on machines on separated
++ local networks (Ethernet, WLAN) that use udp broadcasts to find each
++ other to do so.
++ .
++ It also works on ppp links, so you can log in from windows boxes (e.g.
++ using pptp) and play LAN-based games together. Currently, you have to
++ care about upcoming or downgoing interfaces yourself.
+diff --git a/debian/copyright b/debian/copyright
+new file mode 100644
+index 0000000..1c19114
+--- /dev/null
++++ b/debian/copyright
+@@ -0,0 +1,16 @@
++Copyright (C) 2022 Joachim Breitner
++
++This program is free software; you can redistribute it and/or
++modify it under the terms of the GNU General Public License
++as published by the Free Software Foundation; either version 2
++of the License, or (at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with this program; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
+diff --git a/debian/rules b/debian/rules
+new file mode 100755
+index 0000000..16c5748
+--- /dev/null
++++ b/debian/rules
+@@ -0,0 +1,63 @@
++#!/usr/bin/make -f
++# -*- makefile -*-
++# Sample debian/rules that uses debhelper.
++# This file was originally written by Joey Hess and Craig Small.
++# As a special exception, when this file is copied by dh-make into a
++# dh-make output file, you may use that output file without restriction.
++# This special exception was added by Craig Small in version 0.37 of dh-make.
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++PACKAGE=udp-broadcast-relay
++PKGDIR=$(CURDIR)/debian/$(PACKAGE)
++
++build: build-stamp
++
++build-stamp:
++ dh_testdir
++ $(MAKE)
++ touch $@
++
++clean: clean-patched
++
++# Clean everything up, including everything auto-generated
++# at build time that needs not to be kept around in the Debian diff
++clean-patched:
++ dh_testdir
++ dh_testroot
++ if test -f Makefile ; then $(MAKE) clean ; fi
++ rm -f build-stamp
++ rm -rf config
++ dh_clean
++
++install: build
++ dh_testdir
++ dh_testroot
++ dh_prep
++ dh_installdirs
++
++ $(MAKE) install DESTDIR=$(PKGDIR)
++
++# Build architecture-independent files here.
++binary-indep: build install
++ rm -f debian/files
++ dh_testdir
++ dh_testroot
++ dh_install
++ dh_installdebconf
++ dh_installinit
++ dh_compress
++ dh_fixperms
++ dh_installdeb
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
++
++# Build architecture-dependent files here.
++binary-arch: build install
++# This is an architecture independent package
++# so; we have nothing to do by default.
++
++binary: binary-indep
++.PHONY: build clean binary-indep binary install
+diff --git a/udp-broadcast-relay@.service b/udp-broadcast-relay@.service
+new file mode 100644
+index 0000000..229748c
+--- /dev/null
++++ b/udp-broadcast-relay@.service
+@@ -0,0 +1,14 @@
++[Unit]
++Description=UDP-bcast-relay
++After=network.target
++RequiresMountsFor=/run
++
++[Service]
++Type=simple
++NotifyAccess=main
++EnvironmentFile=-/etc/default/udp-broadcast-relay%I
++ExecStart=/usr/sbin/udp-broadcast-relay $DAEMON_ARGS
++Restart=on-failure
++
++[Install]
++WantedBy=multi-user.target
+--
+2.49.0
+