diff options
Diffstat (limited to 'meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch')
-rw-r--r-- | meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index 3d27fe72cc..038a672095 100644 --- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | |||
@@ -1,20 +1,26 @@ | |||
1 | From 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 | ||
4 | Subject: [PATCH] rsync: remove upstream's rebuild logic | ||
5 | |||
1 | Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and | 6 | Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and |
2 | generally overcomplicated, and we ensure that autoreconf is invoked if required. | 7 | generally overcomplicated, and we ensure that autoreconf is invoked if required. |
3 | 8 | ||
4 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
6 | 11 | ||
12 | --- | ||
13 | Makefile.in | 50 -------------------------------------------------- | ||
14 | 1 file changed, 50 deletions(-) | ||
15 | |||
7 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
8 | index 151247d..8f3fdb6 100644 | 17 | index 31ddc43..41c9a93 100644 |
9 | --- a/Makefile.in | 18 | --- a/Makefile.in |
10 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
11 | @@ -141,58 +141,6 @@ gen: conf proto.h man | 20 | @@ -167,56 +167,6 @@ gen: conf proto.h man |
12 | gensend: gen | 21 | gensend: gen |
13 | rsync -aivzc $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ | 22 | rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ |
14 | 23 | ||
15 | -conf: | ||
16 | - cd $(srcdir) && $(MAKE) -f prepare-source.mak conf | ||
17 | - | ||
18 | -aclocal.m4: $(srcdir)/m4/*.m4 | 24 | -aclocal.m4: $(srcdir)/m4/*.m4 |
19 | - aclocal -I $(srcdir)/m4 | 25 | - aclocal -I $(srcdir)/m4 |
20 | - | 26 | - |
@@ -45,6 +51,7 @@ index 151247d..8f3fdb6 100644 | |||
45 | - fi \ | 51 | - fi \ |
46 | - fi | 52 | - fi |
47 | - | 53 | - |
54 | -.PHONY: reconfigure | ||
48 | -reconfigure: configure.sh | 55 | -reconfigure: configure.sh |
49 | - ./config.status --recheck | 56 | - ./config.status --recheck |
50 | - ./config.status | 57 | - ./config.status |
@@ -64,6 +71,6 @@ index 151247d..8f3fdb6 100644 | |||
64 | - fi \ | 71 | - fi \ |
65 | - fi | 72 | - fi |
66 | - | 73 | - |
67 | rsync-ssl: $(srcdir)/rsync-ssl.in Makefile | 74 | stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile |
68 | sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl | 75 | sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf |
69 | @chmod +x rsync-ssl | 76 | |