From c6edab59907787c324616fb9320204a10cbef86e Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 1 Jun 2016 10:56:58 +0300 Subject: [PATCH] dist/redhat: Fix RPM package build Commit 12daaf5 ("dist/redhat: fix rpm build error") did not fix the error, at least not on our Jenkins build machines. Looking at the RPM build logs, we create the build directory: + cd /builddir/build/BUILD + mkdir build but then change directory to "scylla-jmx-1.2.rc1": + cd /builddir/build/BUILD + cd scylla-jmx-1.2.rc1 + mvn install and therefore fail the copy: + cp dist/common/systemd/scylla-jmx.service.in build/scylla-jmx.service cp: cannot create regular file 'build/scylla-jmx.service': No such file or directory I don't know why Takuya put the "mkdir" in the "prep" section but something like this should unblock the build. --- dist/redhat/scylla-jmx.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/redhat/scylla-jmx.spec.in b/dist/redhat/scylla-jmx.spec.in index b6e56d4..188251b 100644 --- a/dist/redhat/scylla-jmx.spec.in +++ b/dist/redhat/scylla-jmx.spec.in @@ -16,12 +16,12 @@ Requires: scylla-server java-headless %prep -mkdir build %setup -q %build mvn install +mkdir build cp dist/common/systemd/scylla-jmx.service.in build/scylla-jmx.service sed -i -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" build/scylla-jmx.service