summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rsync/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-11-07 13:31:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-11-07 13:31:53 +0000
commit8c22ff0d8b70d9b12f0487ef696a7e915b9e3173 (patch)
treeefdc32587159d0050a69009bdf2330a531727d95 /meta/recipes-devtools/rsync/files
parentd412d2747595c1cc4a5e3ca975e3adc31b2f7891 (diff)
downloadpoky-8c22ff0d8b70d9b12f0487ef696a7e915b9e3173.tar.gz
The poky repository master branch is no longer being updated.
You can either: a) switch to individual clones of bitbake, openembedded-core, meta-yocto and yocto-docs b) use the new bitbake-setup You can find information about either approach in our documentation: https://docs.yoctoproject.org/ Note that "poky" the distro setting is still available in meta-yocto as before and we continue to use and maintain that. Long live Poky! Some further information on the background of this change can be found in: https://lists.openembedded.org/g/openembedded-architecture/message/2179 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rsync/files')
-rw-r--r--meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch125
-rw-r--r--meta/recipes-devtools/rsync/files/determism.patch42
-rw-r--r--meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch79
-rw-r--r--meta/recipes-devtools/rsync/files/rsyncd.conf15
4 files changed, 0 insertions, 261 deletions
diff --git a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch
deleted file mode 100644
index 3011308c61..0000000000
--- a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch
+++ /dev/null
@@ -1,125 +0,0 @@
1From 073caa67f2aa221de113a21f8105940421a2da90 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 29 Aug 2022 19:53:28 -0700
4Subject: [PATCH] Add missing prototypes to function declarations
5
6With Clang 15+ compiler -Wstrict-prototypes is triggering warnings which
7are turned into errors with -Werror, this fixes the problem by adding
8missing prototypes
9
10Fixes errors like
11| log.c:134:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
12| static void syslog_init()
13| ^
14| void
15
16Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032858.html]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
19---
20 checksum.c | 2 +-
21 exclude.c | 2 +-
22 log.c | 2 +-
23 main.c | 2 +-
24 zlib/crc32.c | 2 +-
25 zlib/trees.c | 2 +-
26 zlib/zutil.c | 4 ++--
27 7 files changed, 8 insertions(+), 8 deletions(-)
28
29diff --git a/checksum.c b/checksum.c
30index 66e8089..b24b202 100644
31--- a/checksum.c
32+++ b/checksum.c
33@@ -779,7 +779,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list)
34 }
35 #endif
36
37-void init_checksum_choices()
38+void init_checksum_choices(void)
39 {
40 #if defined SUPPORT_XXH3 || defined USE_OPENSSL
41 struct name_num_item *nni;
42diff --git a/exclude.c b/exclude.c
43index 87edbcf..ae0de2f 100644
44--- a/exclude.c
45+++ b/exclude.c
46@@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end)
47 memcpy(partial_string_buf, s_start, partial_string_len);
48 }
49
50-void free_implied_include_partial_string()
51+void free_implied_include_partial_string(void)
52 {
53 if (partial_string_buf) {
54 if (partial_string_len)
55diff --git a/log.c b/log.c
56index e4ba1cc..8482b71 100644
57--- a/log.c
58+++ b/log.c
59@@ -131,7 +131,7 @@ static void logit(int priority, const char *buf)
60 }
61 }
62
63-static void syslog_init()
64+static void syslog_init(void)
65 {
66 int options = LOG_PID;
67
68diff --git a/main.c b/main.c
69index 4f070ac..f59eaec 100644
70--- a/main.c
71+++ b/main.c
72@@ -246,7 +246,7 @@ void read_del_stats(int f)
73 stats.deleted_files += stats.deleted_specials = read_varint(f);
74 }
75
76-static void become_copy_as_user()
77+static void become_copy_as_user(void)
78 {
79 char *gname;
80 uid_t uid;
81diff --git a/zlib/crc32.c b/zlib/crc32.c
82index 05733f4..50c6c02 100644
83--- a/zlib/crc32.c
84+++ b/zlib/crc32.c
85@@ -187,7 +187,7 @@ local void write_table(out, table)
86 /* =========================================================================
87 * This function can be used by asm versions of crc32()
88 */
89-const z_crc_t FAR * ZEXPORT get_crc_table()
90+const z_crc_t FAR * ZEXPORT get_crc_table(void)
91 {
92 #ifdef DYNAMIC_CRC_TABLE
93 if (crc_table_empty)
94diff --git a/zlib/trees.c b/zlib/trees.c
95index 9c66770..0d9047e 100644
96--- a/zlib/trees.c
97+++ b/zlib/trees.c
98@@ -231,7 +231,7 @@ local void send_bits(s, value, length)
99 /* ===========================================================================
100 * Initialize the various 'constant' tables.
101 */
102-local void tr_static_init()
103+local void tr_static_init(void)
104 {
105 #if defined(GEN_TREES_H) || !defined(STDC)
106 static int static_init_done = 0;
107diff --git a/zlib/zutil.c b/zlib/zutil.c
108index bbba7b2..61f8dc9 100644
109--- a/zlib/zutil.c
110+++ b/zlib/zutil.c
111@@ -27,12 +27,12 @@ z_const char * const z_errmsg[10] = {
112 ""};
113
114
115-const char * ZEXPORT zlibVersion()
116+const char * ZEXPORT zlibVersion(void)
117 {
118 return ZLIB_VERSION;
119 }
120
121-uLong ZEXPORT zlibCompileFlags()
122+uLong ZEXPORT zlibCompileFlags(void)
123 {
124 uLong flags;
125
diff --git a/meta/recipes-devtools/rsync/files/determism.patch b/meta/recipes-devtools/rsync/files/determism.patch
deleted file mode 100644
index f915d658c8..0000000000
--- a/meta/recipes-devtools/rsync/files/determism.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 41b859a9df9611b7b3f6cbe28af47118d947080f Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Sun, 21 Feb 2021 09:45:48 +0000
4Subject: [PATCH] rsync: Fix a file sorting determinism issue
5
6The Makefile calls awk on a "*.c" glob. The results of this glob are sorted
7but the order depends on the locale settings, particularly whether
8"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8
9they sort one way, in C, they sort the other. The sorting order changes
10the output binaries. The behaviour also changes dependning on whether
11SHELL (/bin/sh) is dash or bash.
12
13Specify a C locale setting to be deterministic.
14
15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
16Submitted: https://github.com/WayneD/rsync/pull/155
17
18Upstream-Status: Backport [ish, see below]
19
20After discussion upstream renamed util.c to util1.c which avoids the problem
21in a different way. This patch can be dropped when we upgrade to include:
22https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d
23---
24 Makefile.in | 5 +++++
25 1 file changed, 5 insertions(+)
26
27diff --git a/Makefile.in b/Makefile.in
28index 1d13e8c..2c5cf99 100644
29--- a/Makefile.in
30+++ b/Makefile.in
31@@ -27,6 +27,11 @@ MKDIR_P=@MKDIR_P@
32 VPATH=$(srcdir)
33 SHELL=/bin/sh
34
35+# We use globbing in commands, need to be deterministic
36+unexport LC_ALL
37+LC_COLLATE=C
38+export LC_COLLATE
39+
40 .SUFFIXES:
41 .SUFFIXES: .c .o
42
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
deleted file mode 100644
index 42af4c55d0..0000000000
--- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From 603e5862cca832ae925d0c92a8654a57caff5910 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 12 Apr 2016 15:51:54 +0100
4Subject: [PATCH] rsync: remove upstream's rebuild logic
5
6Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and
7generally overcomplicated, and we ensure that autoreconf is invoked if required.
8
9Upstream-Status: Inappropriate
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11---
12 Makefile.in | 54 -----------------------------------------------------
13 1 file changed, 54 deletions(-)
14
15diff --git a/Makefile.in b/Makefile.in
16index 7c75c26..1d13e8c 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -184,60 +184,6 @@ conf: configure.sh config.h.in
20 .PHONY: gen
21 gen: conf proto.h man git-version.h
22
23-aclocal.m4: $(srcdir)/m4/*.m4
24- aclocal -I $(srcdir)/m4
25-
26-configure.sh config.h.in: configure.ac aclocal.m4
27- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
28- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
29- autoconf -o configure.sh
30- autoheader && touch config.h.in
31- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
32- echo "configure.sh is unchanged."; \
33- rm configure.sh.old; \
34- else \
35- echo "configure.sh has CHANGED."; \
36- fi
37- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
38- echo "config.h.in is unchanged."; \
39- rm config.h.in.old; \
40- else \
41- echo "config.h.in has CHANGED."; \
42- fi
43- @if test -f configure.sh.old || test -f config.h.in.old; then \
44- if test "$(MAKECMDGOALS)" = reconfigure; then \
45- echo 'Continuing with "make reconfigure".'; \
46- else \
47- echo 'You may need to run:'; \
48- echo ' make reconfigure'; \
49- exit 1; \
50- fi \
51- fi
52-
53-.PHONY: reconfigure
54-reconfigure: configure.sh
55- ./config.status --recheck
56- ./config.status
57-
58-.PHONY: restatus
59-restatus:
60- ./config.status
61-
62-Makefile: Makefile.in config.status configure.sh config.h.in
63- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
64- @./config.status
65- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
66- echo "Makefile is unchanged."; \
67- rm Makefile.old; \
68- else \
69- if test "$(MAKECMDGOALS)" = reconfigure; then \
70- echo 'Continuing with "make reconfigure".'; \
71- else \
72- echo "Makefile updated -- rerun your make command."; \
73- exit 1; \
74- fi \
75- fi
76-
77 stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
78 sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
79
diff --git a/meta/recipes-devtools/rsync/files/rsyncd.conf b/meta/recipes-devtools/rsync/files/rsyncd.conf
deleted file mode 100644
index 845f5b33f5..0000000000
--- a/meta/recipes-devtools/rsync/files/rsyncd.conf
+++ /dev/null
@@ -1,15 +0,0 @@
1# /etc/rsyncd.conf
2
3# Minimal configuration file for rsync daemon
4# See rsync(1) and rsyncd.conf(5) man pages for help
5
6# This file is required by rsync --daemon
7pid file = /var/run/rsyncd.pid
8use chroot = yes
9read only = yes
10
11# Simple example for enabling your own local rsync server
12#[everything]
13# path = /
14# comment = Everything except /etc exposed
15# exclude = /etc