[oe-commits] Chris Larson : openswan: fix build with install wrapper
git version control
git at git.openembedded.org
Sat Jan 29 02:01:59 UTC 2011
Module: openembedded.git
Branch: master
Commit: 84f0a42594111f6f6ddf57f5925cd7848be31ee9
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=84f0a42594111f6f6ddf57f5925cd7848be31ee9
Author: Chris Larson <chris_larson at mentor.com>
Date: Fri Jan 28 20:53:28 2011 -0500
openswan: fix build with install wrapper
Signed-off-by: Chris Larson <chris_larson at mentor.com>
---
recipes/openswan/openswan-2.6.31/installcmd.patch | 17 +++++++++++++++++
recipes/openswan/openswan_2.6.31.bb | 9 +++++----
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/recipes/openswan/openswan-2.6.31/installcmd.patch b/recipes/openswan/openswan-2.6.31/installcmd.patch
new file mode 100644
index 0000000..432757a
--- /dev/null
+++ b/recipes/openswan/openswan-2.6.31/installcmd.patch
@@ -0,0 +1,17 @@
+---
+ Makefile.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- openswan-2.6.31.orig/Makefile.inc
++++ openswan-2.6.31/Makefile.inc
+@@ -163,8 +163,8 @@ INSTALL=install
+ # how backup names are composed.
+ # Note that the install procedures will never overwrite an existing config
+ # file, which is why -b is not specified for them.
+-INSTBINFLAGS=-b --suffix=.old
+-INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
++INSTBINFLAGS=-b
++INSTSUIDFLAGS=-m u+rxs,g+rx,o+rx -g root -b
+ INSTMANFLAGS=
+ INSTCONFFLAGS=
+ # For OSX use
diff --git a/recipes/openswan/openswan_2.6.31.bb b/recipes/openswan/openswan_2.6.31.bb
index bae05d2..cf7c3a7 100644
--- a/recipes/openswan/openswan_2.6.31.bb
+++ b/recipes/openswan/openswan_2.6.31.bb
@@ -6,14 +6,15 @@ LICENSE = "GPLv2"
DEPENDS = "gmp flex-native bison-native"
RRECOMMENDS_${PN} = "kernel-module-ipsec"
RDEPENDS_append_nylon = "perl"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
- file://fix-parser-build-race.patch"
+ file://fix-parser-build-race.patch \
+ file://installcmd.patch"
EXTRA_OEMAKE = "DESTDIR=${D} \
- USERCOMPILE="${CFLAGS}" \
- USERLINK="${LDFLAGS}" \
+ USERCOMPILE='${CFLAGS}' \
+ USERLINK='${LDFLAGS}' \
FINALCONFDIR=${sysconfdir}/ipsec \
FINALLIBDIR=${libdir}/ipsec \
FINALLIBEXECDIR=${libexecdir}/ipsec \
More information about the Openembedded-commits
mailing list