summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/libstrongswan.install2
-rwxr-xr-xdebian/rules4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index c1a169e23..a03944f27 100644
--- a/debian/libstrongswan.install
+++ b/debian/libstrongswan.install
@@ -1,5 +1,4 @@
usr/lib/libstrongswan.so* usr/lib/
-usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-gmp.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-x509.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-pubkey.so* usr/lib/ipsec/plugins/
@@ -7,5 +6,4 @@ usr/lib/ipsec/plugins/libstrongswan-hmac.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-xcbc.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-random.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-openssl.so* usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-padlock.so* usr/lib/ipsec/plugins/
etc/strongswan.conf etc/
diff --git a/debian/rules b/debian/rules
index 91a7ac95e..5afa971d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,10 @@ install: build-stamp
# install files from debian/tmp into proper package dirs
dh_install
+ # 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/
+ endif
# and additional files not covered by upstream makefile...
install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets