From d6218c04096772289eff1584311738be27bf0300 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 11 Jul 2024 19:19:43 -0400 Subject: [PATCH 1/3] checkdeps: add rsync as required package Signed-off-by: Ian Leonard --- scripts/checkdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/checkdeps b/scripts/checkdeps index fbf4e058e5..2ac7ed65f9 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -70,6 +70,7 @@ dep_map=( [patch]=patch [perl]=perl [rdfind]=rdfind + [rsync]=rsync [sed]=sed [tar]=tar [unzip]=unzip From 56d664d3fc7ff9de821006014033916f07268f08 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 11 Jul 2024 19:20:42 -0400 Subject: [PATCH 2/3] dockerfiles: add rsync to docker build environments Signed-off-by: Ian Leonard --- tools/docker/bookworm/Dockerfile | 2 +- tools/docker/focal/Dockerfile | 2 +- tools/docker/jammy/Dockerfile | 2 +- tools/docker/noble/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/docker/bookworm/Dockerfile b/tools/docker/bookworm/Dockerfile index 988d795778..9554ecba41 100644 --- a/tools/docker/bookworm/Dockerfile +++ b/tools/docker/bookworm/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get install -y \ wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++ xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ - golang-1.21-go/bookworm-backports git openssh-client \ + golang-1.21-go/bookworm-backports git openssh-client rsync \ --no-install-recommends \ && ln -s /usr/lib/go-1.21 /usr/lib/go \ && ln -s /usr/lib/go-1.21/bin/go /usr/bin/go \ diff --git a/tools/docker/focal/Dockerfile b/tools/docker/focal/Dockerfile index 6c1fdd2871..aca5fbc976 100644 --- a/tools/docker/focal/Dockerfile +++ b/tools/docker/focal/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y \ wget bash bc gcc-10 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-10 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl \ - golang-1.18-go git openssh-client \ + golang-1.18-go git openssh-client rsync \ --no-install-recommends \ && ln -s /usr/lib/go-1.18 /usr/lib/go \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile index 111c85a803..04e041b67c 100644 --- a/tools/docker/jammy/Dockerfile +++ b/tools/docker/jammy/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get install -y \ wget bash bc gcc-12 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-12 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ - golang-1.21-go git openssh-client \ + golang-1.21-go git openssh-client rsync \ --no-install-recommends \ && ln -s /usr/lib/go-1.21 /usr/lib/go \ && ln -s /usr/lib/go-1.21/bin/go /usr/bin/go \ diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile index 110e6cb026..815322051e 100644 --- a/tools/docker/noble/Dockerfile +++ b/tools/docker/noble/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get install -y \ wget bash bc gcc-14 cpp-14 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-14 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ - golang-go git openssh-client \ + golang-go git openssh-client rsync \ --no-install-recommends RUN if [ "$(uname -m)" = "aarch64" ]; then \ From b9a39607d83a12b6f8453ac02b88d43fd8a443f4 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 11 Jul 2024 19:22:43 -0400 Subject: [PATCH 3/3] linux: rely on system rsync instead of rsync:host Signed-off-by: Ian Leonard --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7f26d11cb6..4bd5303f4a 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -5,7 +5,7 @@ PKG_NAME="linux" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" -PKG_DEPENDS_HOST="ccache:host rsync:host" +PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="linux:host kmod:host keyutils openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}" PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules."