openswan 2.6.31: split package

Split examples to ${PN}-examples, and KLIPS scripts to ${PN}-klips.
Saves about 400K in the main package for NETKEY users.

Also pass down some paths in case libdir, libexecdir, sbindir are
non-standard.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/openswan/openswan_2.6.31.bb b/recipes/openswan/openswan_2.6.31.bb
index df3fe8b..94b45aa 100644 (file)
--- a/recipes/openswan/openswan_2.6.31.bb
+++ b/recipes/openswan/openswan_2.6.31.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native bison-native"
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
 RDEPENDS_append_nylon = "perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz"
 
@@ -14,6 +14,9 @@ EXTRA_OEMAKE = "DESTDIR=${D} \
                 USERCOMPILE="${CFLAGS}" \
                 USERLINK="${LDFLAGS}" \
                 FINALCONFDIR=${sysconfdir}/ipsec \
+                FINALLIBDIR=${libdir}/ipsec \
+                FINALLIBEXECDIR=${libexecdir}/ipsec \
+                FINALSBINDIR=${sbindir} \
                 INC_RCDEFAULT=${sysconfdir}/init.d \
                 INC_USRLOCAL=${prefix} \
                 INC_MANDIR=share/man WERROR=''"
@@ -26,10 +29,29 @@ do_install () {
        oe_runmake install
 }
 
+PACKAGES =+ "${PN}-examples ${PN}-test ${PN}-klips"
+
 FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
 FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
 
 CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
 
+FILES_${PN}-examples = "${sysconfdir}/ipsec.d/examples"
+
+# KLIPS requires some binaries and scripts that NETKEY users don't need.
+FILES_${PN}-klips = " \
+        ${libexecdir}/ipsec/eroute \
+        ${libexecdir}/ipsec/klipsdebug \
+        ${libexecdir}/ipsec/spi \
+        ${libexecdir}/ipsec/spigrp \
+        ${libexecdir}/ipsec/tncfg \
+        ${libdir}/ipsec/_updown.klips \
+"
+
+FILES_${PN}-test = " \
+        ${libexecdir}/ipsec/showpolicy \
+        ${libexecdir}/ipsec/verify \
+"
+
 SRC_URI[md5sum] = "1f508adf9d0be4f34c003b833d8fce4a"
 SRC_URI[sha256sum] = "bddd2ca79fec2326a69904b59df15753e59b1bf02882416b19507516e9cfcc21"