summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/trigger_rebuild_packages.yml6
-rw-r--r--scripts/package-build/linux-kernel/config/x86/vyos_defconfig4
-rw-r--r--scripts/package-build/squid/.gitignore1
l---------scripts/package-build/squid/build.py1
-rw-r--r--scripts/package-build/squid/package.toml23
5 files changed, 34 insertions, 1 deletions
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml
index e5fa4c20..2a1f9e87 100644
--- a/.github/workflows/trigger_rebuild_packages.yml
+++ b/.github/workflows/trigger_rebuild_packages.yml
@@ -86,6 +86,8 @@ jobs:
- 'scripts/package-build/radvd/**'
shim-signed:
- 'scripts/package-build/shim-signed/**'
+ squid:
+ - 'scripts/package-build/squid/**'
strongswan:
- 'scripts/package-build/strongswan/**'
tacacs:
@@ -247,6 +249,10 @@ jobs:
trigger_build "shim-signed"
fi
+ if [ "${{ steps.changes.outputs.squid }}" == "true" ]; then
+ trigger_build "squid"
+ fi
+
if [ "${{ steps.changes.outputs.strongswan }}" == "true" ]; then
trigger_build "strongswan"
fi
diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
index 3ce5b449..d36bc1f9 100644
--- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
@@ -1040,6 +1040,7 @@ CONFIG_PCI_IOV=y
CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
# CONFIG_PCIE_BUS_TUNE_OFF is not set
CONFIG_PCIE_BUS_DEFAULT=y
# CONFIG_PCIE_BUS_SAFE is not set
@@ -1058,6 +1059,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
# PCI controller drivers
#
CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
#
# DesignWare-based PCIe controllers
@@ -4099,7 +4101,7 @@ CONFIG_VHOST_VDPA=m
# Microsoft Hyper-V guest support
#
CONFIG_HYPERV=y
-CONFIG_HYPERV_VTL_MODE=y
+# CONFIG_HYPERV_VTL_MODE is not set
CONFIG_HYPERV_TIMER=y
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_BALLOON=m
diff --git a/scripts/package-build/squid/.gitignore b/scripts/package-build/squid/.gitignore
new file mode 100644
index 00000000..0b00d9fb
--- /dev/null
+++ b/scripts/package-build/squid/.gitignore
@@ -0,0 +1 @@
+/squid/
diff --git a/scripts/package-build/squid/build.py b/scripts/package-build/squid/build.py
new file mode 120000
index 00000000..3c76af73
--- /dev/null
+++ b/scripts/package-build/squid/build.py
@@ -0,0 +1 @@
+../build.py \ No newline at end of file
diff --git a/scripts/package-build/squid/package.toml b/scripts/package-build/squid/package.toml
new file mode 100644
index 00000000..fc693be0
--- /dev/null
+++ b/scripts/package-build/squid/package.toml
@@ -0,0 +1,23 @@
+[[packages]]
+name = "squid"
+commit_id = "debian/7.6-2"
+scm_url = "https://salsa.debian.org/squid-team/squid"
+
+[dependencies]
+ packages = [
+ "libltdl-dev",
+ "dh-apparmor",
+ "libcppunit-dev",
+ "libcap2-dev",
+ "libecap3-dev",
+ "libgnutls28-dev",
+ "libldap2-dev",
+ "libnetfilter-conntrack-dev",
+ "libpam0g-dev",
+ "libsasl2-dev",
+ "libsystemd-dev",
+ "libtdb-dev",
+ "nettle-dev",
+ "libssl-dev"
+ ]
+