From 0c8be83173e79433212c03c15d02a9dd68d63856 Mon Sep 17 00:00:00 2001 From: toto Date: Tue, 3 Mar 2026 22:27:13 +0000 Subject: [PATCH] fix(rpm): remove unnecessary copy step RPMs are already written to /packages/rpm/${DIST_NAME}/ by rpmbuild when using --rpmdir flag. No need to copy from RPMS directory. Co-authored-by: Qwen-Coder --- Dockerfile.package | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile.package b/Dockerfile.package index 6f33408..ab99a2f 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -38,6 +38,7 @@ cp -r /tmp/pkgroot/* /root/rpmbuild/BUILD/ # Build RPM using rpmbuild # Use --noclean to keep BUILD directory contents +# Use --rpmdir to output RPMs directly to /packages/rpm/${DIST_NAME}/ rpmbuild -bb /root/rpmbuild/SPECS/logcorrelator.spec \ --define "version ${VERSION}" \ --define "dist .${DIST_NAME}" \ @@ -45,10 +46,7 @@ rpmbuild -bb /root/rpmbuild/SPECS/logcorrelator.spec \ --define "_rpmdir /packages/rpm/${DIST_NAME}" \ --noclean -# Ensure output directory exists and copy RPM -mkdir -p /packages/rpm/${DIST_NAME} -cp /root/rpmbuild/RPMS/x86_64/*.rpm /packages/rpm/${DIST_NAME}/ - +# RPMs are already in /packages/rpm/${DIST_NAME}/ echo "RPM built for ${DIST_NAME}:" ls -la /packages/rpm/${DIST_NAME}/ EOF