diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:48:42 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:48:42 +0200 |
| commit | 9223518b1562a066a59666b9b565bd5af7212dc7 (patch) | |
| tree | 129dbf9c6a36c7f144582ae1317153765203bf9f | |
| parent | 56a960605a2d656b5370d95788649c839c8fc190 (diff) | |
| download | vyos-strongswan-9223518b1562a066a59666b9b565bd5af7212dc7.tar.gz vyos-strongswan-9223518b1562a066a59666b9b565bd5af7212dc7.zip | |
Also need to ignore those .so files we install manually or the fail-missing check will fail
| -rw-r--r-- | debian/libstrongswan.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install index 8366298d6..0fee520d5 100644 --- a/debian/libstrongswan.install +++ b/debian/libstrongswan.install @@ -33,5 +33,6 @@ usr/lib/ipsec/plugins/libstrongswan-sql.so* usr/lib/ipsec/plugins/ usr/lib/ipsec/plugins/libstrongswan-ha.so* usr/lib/ipsec/plugins/ usr/lib/ipsec/plugins/libstrongswan-xauth.so* usr/lib/ipsec/plugins/ usr/lib/ipsec/plugins/libstrongswan-revocation.so* usr/lib/ipsec/plugins/ +usr/lib/ipsec/plugins/libstrongswan-constraints.so* usr/lib/ipsec/plugins/ usr/lib/ipsec/plugins/libstrongswan-test-vectors.so* usr/lib/ipsec/plugins/ etc/strongswan.conf etc/ diff --git a/debian/rules b/debian/rules index b0ec84d8a..591025405 100755 --- a/debian/rules +++ b/debian/rules @@ -93,6 +93,9 @@ install: build-stamp dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + # install files from debian/tmp into proper package dirs + dh_install --fail-missing -X\.la -X\.a -Xmedsrv -Xman3 -Xlibstrongswan-padlock.so -Xlibstrongswan-nm.so + # special handling for padlock, as it is only built on i386 ifeq ($(DEB_BUILD_ARCH_CPU),i386) install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-padlock.so* $(CURDIR)/debian/libstrongswan/usr/lib/ipsec/plugins/ @@ -100,9 +103,6 @@ endif # and special handling for network-manager files - only install when built install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-nm.so* $(CURDIR)/debian/strongswan-nm/usr/lib/ipsec/plugins/ - # install files from debian/tmp into proper package dirs - dh_install --fail-missing -X\.la -X\.a -Xmedsrv -Xman3 - # and additional files not covered by upstream makefile... install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets # also "patch" ipsec.conf to include the debconf-managed file |