summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-01-25 11:05:52 +0100
committerChristian Poessinger <christian@poessinger.com>2020-01-25 11:05:52 +0100
commitb818b5cdae5bfc46d7f65c7f398fe37485513dd1 (patch)
treec662b419ecea8804aa433cbbb8d841c89ce764a9
parent6fe14cca59966ed3ecd482c0042b935bfb78c6cb (diff)
downloadvyos-1x-b818b5cdae5bfc46d7f65c7f398fe37485513dd1.tar.gz
vyos-1x-b818b5cdae5bfc46d7f65c7f398fe37485513dd1.zip
Debian: fix package generation after adding vyos-1x-vmware
Commit 7e00ffa ("Debian: add vyos-1x-vmware package") added a new subpackage, but by adding this package it was forgotton to create the appropriate vyos-1x.install file.
-rw-r--r--.gitignore3
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/vyos-1x.install4
3 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e69e64a58..43f9ab108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,8 +112,7 @@ tests/templates/*
# Debian packaging
debian/files
-debian/vyos-1x
-debian/vyos-1x.*
+debian/tmp
debian/debhelper-build-stamp
debian/.debhelper/
diff --git a/debian/rules b/debian/rules
index 24cb00fdb..d529c9b4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_build:
make all
override_dh_auto_install:
- dh_install -pvyos-1x
+ dh_auto_install
cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
# Install scripts
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
new file mode 100644
index 000000000..97076d338
--- /dev/null
+++ b/debian/vyos-1x.install
@@ -0,0 +1,4 @@
+etc/
+lib/
+opt/
+usr/