From d54eaaa4c87a5acf9a2d04f516be68a8bf55abd0 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 11 Jun 2020 15:48:06 +0200 Subject: [PATCH] add rsync to copy local patchfiles --- Dockerfile | 1 + overlay/bin/rpmbuild | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c2d9db..6c15978 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,6 +34,7 @@ RUN yum install -q -y \ wget curl \ automake autoconf \ yum-utils rpm-build rpmdevtools \ + rsync \ epel-release && \ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \ yum clean all diff --git a/overlay/bin/rpmbuild b/overlay/bin/rpmbuild index 0fb64f5..1cd25a7 100755 --- a/overlay/bin/rpmbuild +++ b/overlay/bin/rpmbuild @@ -4,7 +4,8 @@ set -eo pipefail DIR=$(pwd) mkdir ./dist -echo '%_topdir '"${DIR}"'/dist' > /root/.rpmmacros +echo '%_topdir '"${DIR%/}"'/dist' > /root/.rpmmacros rpmdev-setuptree +rsync -q -av "${DIR%/}/patch/" "${DIR%/}/dist/SOURCES" exec /usr/bin/rpmbuild "$@"