diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
| commit | ca79d2393519759d3fbe84472ab8bfa359c08592 (patch) | |
| tree | 3d7ba19e17cc066b327ae62d004164a61ba39d9b /package/vtun/vtun-001-fix-installation.patch | |
| parent | 37d2ab569d83845a86b980bf4e27e27755294538 (diff) | |
| parent | 1942836999ad64b7a84bd95a6bd1f5c75b81bf45 (diff) | |
| download | buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.tar.gz buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.zip | |
Merge branch 'next'
Diffstat (limited to 'package/vtun/vtun-001-fix-installation.patch')
| -rw-r--r-- | package/vtun/vtun-001-fix-installation.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/vtun/vtun-001-fix-installation.patch b/package/vtun/vtun-001-fix-installation.patch new file mode 100644 index 000000000..d9659fa88 --- /dev/null +++ b/package/vtun/vtun-001-fix-installation.patch @@ -0,0 +1,44 @@ +Makefile.in: fix installation steps + +Not sure what the reason for that patch is, but originally added by Ulf +Samuelsson <ulf.samuelsson@atmel.com>, when upgrading from 2.6.x to 3.0.2. + +yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the +SoB by Ulf, but it was not explicitly reproduced here in the patch; so I +added it here directly in the patch. + +Somewhat-signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in +--- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200 ++++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100 +@@ -28,7 +28,7 @@ + LEXFLAGS = -t + + INSTALL = @INSTALL@ +-INSTALL_OWNER = -o root -g 0 ++INSTALL_OWNER = + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +@@ -89,16 +89,15 @@ + + install_config: + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) +- if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ +- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \ +- fi ++ $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); ++ $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR); + + install: vtund install_config install_man +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) + $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) + $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) +- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund ++ $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \ ++ $(DESTDIR)$(ETC_DIR)/init.d/S90vtun + + # DO NOT DELETE THIS LINE -- make depend depends on it. |