From 771cf6ea50618c7a0679dd172b35b15b16b6d916 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 11 Dec 2019 04:14:41 +0900 Subject: [PATCH] dist/redhat: force xz compression on rpm binary payload Same as https://github.com/scylladb/scylla/commit/301c835cbfb0596f0df1db4ef444ac8eb3af5a2e, Fedora 31 switched the default compression to zstd, which isn't readable by some older rpm distributions (CentOS 7 in particular). Tell it to use the older xz compression instead, so packages produced on Fedora 31 can be installed on older distributions. See: https://github.com/scylladb/scylla/pull/5310 Signed-off-by: Takuya ASADA Message-Id: <20191210191441.108774-1-syuu@scylladb.com> --- dist/redhat/build_rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh index cd9a234..0cc93a4 100755 --- a/dist/redhat/build_rpm.sh +++ b/dist/redhat/build_rpm.sh @@ -72,4 +72,4 @@ ln -fv $RELOC_PKG $RPMBUILD/SOURCES/ pystache dist/redhat/scylla-jmx.spec.mustache "{ \"version\": \"$SCYLLA_VERSION\", \"release\": \"$SCYLLA_RELEASE\", \"product\": \"$PRODUCT\", \"$PRODUCT\": true }" > $RPMBUILD/SPECS/scylla-jmx.spec # this rpm can be install on both fedora / centos7, so drop distribution name from the file name -rpmbuild -ba --define "_topdir $RPMBUILD" --undefine "dist" $RPM_JOBS_OPTS $RPMBUILD/SPECS/scylla-jmx.spec +rpmbuild -ba --define '_binary_payload w2.xzdio' --define "_topdir $RPMBUILD" --undefine "dist" $RPM_JOBS_OPTS $RPMBUILD/SPECS/scylla-jmx.spec