summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-18 17:13:13 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-19 21:56:19 +0100
commitb5c80d310527223b93e4133ac2f4c8c063c70a98 (patch)
tree48ae9e2752b4b94c07f767a019c99a8c2460c014 /debian
parent22308b05dfbcd8da0230bbd8ba3bbc2a55da7786 (diff)
downloadvyos-1x-b5c80d310527223b93e4133ac2f4c8c063c70a98.tar.gz
vyos-1x-b5c80d310527223b93e4133ac2f4c8c063c70a98.zip
xdp: T2666: switch to example code provided by xdp-tutorial
Diffstat (limited to 'debian')
-rw-r--r--debian/control11
-rwxr-xr-xdebian/rules7
-rw-r--r--debian/vyos-1x.install2
3 files changed, 10 insertions, 10 deletions
diff --git a/debian/control b/debian/control
index f29d84bd0..724367952 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,11 @@ Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
Build-Depends:
debhelper (>= 9),
fakeroot,
- libbpf-dev,
- gcc-multilib,
- clang,
- llvm,
- libelf-dev (>= 0.2),
- libpcap-dev,
+ gcc-multilib [amd64],
+ clang [amd64],
+ llvm [amd64],
+ libelf-dev (>= 0.2) [amd64],
+ libpcap-dev [amd64],
build-essential,
libvyosconfig0 (>= 0.0.7),
libzmq3-dev,
diff --git a/debian/rules b/debian/rules
index 599572358..ab0df7201 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,9 +78,10 @@ override_dh_auto_install:
mkdir -p $(DIR)/$(VYOS_DATA_DIR)
cp -r data/* $(DIR)/$(VYOS_DATA_DIR)
- # Install eBPF plugins
- mkdir -p $(DIR)/$(VYOS_DATA_DIR)/ebpf
- cp -r src/ebpf/*.o $(DIR)/$(VYOS_DATA_DIR)/ebpf
+ # Install XDP plugins
+ mkdir -p $(DIR)/$(VYOS_DATA_DIR)/xdp
+ cp -r src/xdp/xdp_prog_kern.o $(DIR)/$(VYOS_DATA_DIR)/xdp
+ find src/xdp -perm /a+x -exec cp {} $(DIR)/$(VYOS_SBIN_DIR) \;
# Install etc configuration files
mkdir -p $(DIR)/etc
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index e69d85b66..bfc30f7e6 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -8,7 +8,7 @@ etc/udev
etc/vyos
lib/
opt/
-usr/sbin/vyshim
+usr/sbin
usr/bin/initial-setup
usr/bin/vyos-config-file-query
usr/bin/vyos-config-to-commands