diff options
Diffstat (limited to 'meta-cgl-common/recipes-cgl/racoon2/racoon2/racoon2-DESTDIR.patch')
| -rw-r--r-- | meta-cgl-common/recipes-cgl/racoon2/racoon2/racoon2-DESTDIR.patch | 202 |
1 files changed, 0 insertions, 202 deletions
diff --git a/meta-cgl-common/recipes-cgl/racoon2/racoon2/racoon2-DESTDIR.patch b/meta-cgl-common/recipes-cgl/racoon2/racoon2/racoon2-DESTDIR.patch deleted file mode 100644 index b2a0eac..0000000 --- a/meta-cgl-common/recipes-cgl/racoon2/racoon2/racoon2-DESTDIR.patch +++ /dev/null @@ -1,202 +0,0 @@ -Enable non-standard destdir - -Add in $(DESTDIR) to all the install lines, -so that we can get things installed into a -non-standard location. - -Upstream-Status: Pending - -Signed-of-by: Aws Ismail <aws.ismail@windriver.com> - -diff -r -u a/iked/Makefile.in b/iked/Makefile.in ---- a/iked/Makefile.in -+++ b/iked/Makefile.in -@@ -66,16 +66,16 @@ - install: install-prog install-doc - - install-prog: $(PROG) -- $(INSTALL) -d $(sbindir) -- $(INSTALL_PROGRAM) $(PROG) $(sbindir) -+ $(INSTALL) -d $(DESTDIR)$(sbindir) -+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir) - - install-doc: -- $(INSTALL) -d $(mandir)/man8 -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - # not friendly with -n :-( - sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \ - for f in $(MAN); do \ - sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \ -- $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \ -+ $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \ - rm $${f}.tmp; \ - done - -diff -r -u a/kinkd/Makefile.in b/kinkd/Makefile.in ---- a/kinkd/Makefile.in -+++ b/kinkd/Makefile.in -@@ -46,14 +46,14 @@ - ../lib/libracoon.a: # check its timestamp only when there is. - - install: all -- $(INSTALL) -d $(sbindir) -- $(INSTALL_PROGRAM) $(PROG) $(sbindir) -- $(INSTALL) -d $(mandir)/man8 -+ $(INSTALL) -d $(DESTDIR)$(sbindir) -+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir) -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - # not friendly with -n :-( - sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \ - for f in $(MAN); do \ - sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \ -- $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \ -+ $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \ - rm $${f}.tmp; \ - done - -diff -r -u a/pskgen/Makefile.in b/pskgen/Makefile.in ---- a/pskgen/Makefile.in -+++ b/pskgen/Makefile.in -@@ -17,10 +17,10 @@ - all: - - install: all -- $(INSTALL) -d $(sbindir) -- $(INSTALL_SCRIPT) $(PROG) $(sbindir) -- $(INSTALL_DATA) $(PROG).8 $(mandir)/man8 -- $(INSTALL) -d $(prefix)/etc/racoon2 -+ $(INSTALL) -d $(DESTDIR)$(sbindir) -+ $(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(sbindir) -+ $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8 -+ $(INSTALL) -d $(DESTDIR)$(prefix)/etc/racoon2 - sh ./autogen.spmd.pwd - - depend: -diff -r -u a/samples/Makefile.in b/samples/Makefile.in ---- a/samples/Makefile.in -+++ b/samples/Makefile.in -@@ -12,60 +12,60 @@ - all: - - install: all install-startup-@startup_scripts@ install-samples install-hook -- $(INSTALL) -d -o 0 -g 0 -m 700 /var/run/racoon2 -+ $(INSTALL) -d -o 0 -g 0 -m 700 $(DESTDIR)/var/run/racoon2 - - install-samples: -- $(INSTALL) -d $(sysconfdir) -- $(INSTALL) -m 600 racoon2.conf $(sysconfdir)/racoon2.conf.sample -- $(INSTALL) -m 600 vals.conf $(sysconfdir)/vals.conf.sample -- $(INSTALL) -m 600 default.conf $(sysconfdir)/default.conf.sample -- $(INSTALL) -m 600 transport_ike.conf $(sysconfdir)/transport_ike.conf.sample -- $(INSTALL) -m 600 tunnel_ike.conf $(sysconfdir)/tunnel_ike.conf.sample -- $(INSTALL) -m 600 tunnel_ike_natt.conf $(sysconfdir)/tunnel_ike_natt.conf.sample -- $(INSTALL) -m 600 transport_kink.conf $(sysconfdir)/transport_kink.conf.sample -- $(INSTALL) -m 600 tunnel_kink.conf $(sysconfdir)/tunnel_kink.conf.sample -- $(INSTALL) -m 600 local-test.conf $(sysconfdir)/local-test.conf.sample -- $(INSTALL) -d -m 700 $(sysconfdir)/psk -- $(INSTALL) -d -m 700 $(sysconfdir)/cert -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir) -+ $(INSTALL) -m 600 racoon2.conf $(DESTDIR)$(sysconfdir)/racoon2.conf.sample -+ $(INSTALL) -m 600 vals.conf $(DESTDIR)$(sysconfdir)/vals.conf.sample -+ $(INSTALL) -m 600 default.conf $(DESTDIR)$(sysconfdir)/default.conf.sample -+ $(INSTALL) -m 600 transport_ike.conf $(DESTDIR)$(sysconfdir)/transport_ike.conf.sample -+ $(INSTALL) -m 600 tunnel_ike.conf $(DESTDIR)$(sysconfdir)/tunnel_ike.conf.sample -+ $(INSTALL) -m 600 tunnel_ike_natt.conf $(DESTDIR)$(sysconfdir)/tunnel_ike_natt.conf.sample -+ $(INSTALL) -m 600 transport_kink.conf $(DESTDIR)$(sysconfdir)/transport_kink.conf.sample -+ $(INSTALL) -m 600 tunnel_kink.conf $(DESTDIR)$(sysconfdir)/tunnel_kink.conf.sample -+ $(INSTALL) -m 600 local-test.conf $(DESTDIR)$(sysconfdir)/local-test.conf.sample -+ $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/psk -+ $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/cert - - install-startup-rc-d: -- $(INSTALL) -d $(sysconfdir)/rc.d -- $(INSTALL_SCRIPT) rc.d-iked $(sysconfdir)/rc.d/iked -- $(INSTALL_SCRIPT) rc.d-kinkd $(sysconfdir)/rc.d/kinkd -- $(INSTALL_SCRIPT) rc.d-spmd $(sysconfdir)/rc.d/spmd -- $(INSTALL_SCRIPT) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2 -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/rc.d -+ $(INSTALL_SCRIPT) rc.d-iked $(DESTDIR)$(sysconfdir)/rc.d/iked -+ $(INSTALL_SCRIPT) rc.d-kinkd $(DESTDIR)$(sysconfdir)/rc.d/kinkd -+ $(INSTALL_SCRIPT) rc.d-spmd $(DESTDIR)$(sysconfdir)/rc.d/spmd -+ $(INSTALL_SCRIPT) rc.d-racoon2 $(DESTDIR)$(sysconfdir)/rc.d/racoon2 - - install-startup-init-d: -- $(INSTALL) -d $(sysconfdir)/init.d -- $(INSTALL_SCRIPT) init.d-iked $(sysconfdir)/init.d/iked -- $(INSTALL_SCRIPT) init.d-kinkd $(sysconfdir)/init.d/kinkd -- $(INSTALL_SCRIPT) init.d-spmd $(sysconfdir)/init.d/spmd -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d -+ $(INSTALL_SCRIPT) init.d-iked $(DESTDIR)$(sysconfdir)/init.d/iked -+ $(INSTALL_SCRIPT) init.d-kinkd $(DESTDIR)$(sysconfdir)/init.d/kinkd -+ $(INSTALL_SCRIPT) init.d-spmd $(DESTDIR)$(sysconfdir)/init.d/spmd - - install-startup-none: - - install-hook: -- $(INSTALL) -d $(sysconfdir)/hook -- $(INSTALL_DATA) functions $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/ikesa-up.d -- $(INSTALL_SCRIPT) ikesa-up $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/ikesa-down.d -- $(INSTALL_SCRIPT) ikesa-down $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/ikesa-rekey.d -- $(INSTALL_SCRIPT) ikesa-rekey $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/child-up.d -- $(INSTALL_SCRIPT) child-up $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/child-down.d -- $(INSTALL_SCRIPT) child-down $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/child-rekey.d -- $(INSTALL_SCRIPT) child-rekey $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/migration.d -- $(INSTALL_SCRIPT) migration $(sysconfdir)/hook -- $(INSTALL_SCRIPT) 00ikesaup_sample $(sysconfdir)/hook/ikesa-up.d -- $(INSTALL_SCRIPT) 00childup_sample $(sysconfdir)/hook/child-up.d -- $(INSTALL) -d $(sysconfdir)/hook/ph1-up.d -- $(INSTALL_SCRIPT) ph1-up $(sysconfdir)/hook -- $(INSTALL) -d $(sysconfdir)/hook/ph1-down.d -- $(INSTALL_SCRIPT) ph1-down $(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL_DATA) functions $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/ikesa-up.d -+ $(INSTALL_SCRIPT) ikesa-up $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/ikesa-down.d -+ $(INSTALL_SCRIPT) ikesa-down $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/ikesa-rekey.d -+ $(INSTALL_SCRIPT) ikesa-rekey $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/child-up.d -+ $(INSTALL_SCRIPT) child-up $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/child-down.d -+ $(INSTALL_SCRIPT) child-down $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/child-rekey.d -+ $(INSTALL_SCRIPT) child-rekey $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/migration.d -+ $(INSTALL_SCRIPT) migration $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL_SCRIPT) 00ikesaup_sample $(DESTDIR)$(sysconfdir)/hook/ikesa-up.d -+ $(INSTALL_SCRIPT) 00childup_sample $(DESTDIR)$(sysconfdir)/hook/child-up.d -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/ph1-up.d -+ $(INSTALL_SCRIPT) ph1-up $(DESTDIR)$(sysconfdir)/hook -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/hook/ph1-down.d -+ $(INSTALL_SCRIPT) ph1-down $(DESTDIR)$(sysconfdir)/hook - - # empty - depend: -diff -r -u a/spmd/Makefile.in b/spmd/Makefile.in ---- a/spmd/Makefile.in -+++ b/spmd/Makefile.in -@@ -38,11 +38,11 @@ - spmdctl.o: spmd_internal.h - - install: all -- $(INSTALL_DIR) $(sbindir) -- $(INSTALL_PROGRAM) $(DAEMON) $(sbindir) -- $(INSTALL_PROGRAM) $(COMMAND) $(sbindir) -- $(INSTALL_DIR) $(man8dir) -- $(INSTALL_DATA) $(MANFILES) $(man8dir) -+ $(INSTALL_DIR) $(DESTDIR)$(sbindir) -+ $(INSTALL_PROGRAM) $(DAEMON) $(DESTDIR)$(sbindir) -+ $(INSTALL_PROGRAM) $(COMMAND) $(DESTDIR)$(sbindir) -+ $(INSTALL_DIR) $(DESTDIR)$(man8dir) -+ $(INSTALL_DATA) $(MANFILES) $(DESTDIR)$(man8dir) - - clean: - -rm -f $(TARGET) *.o $(COMMAND) |