From d9906a9bfff3837acb4eaf9b1891c18c225342aa Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 14 Apr 2022 10:23:59 -0700 Subject: rust/pkg.sh: support overriding config, copy not move diff so we can use it in COPR builds Signed-off-by: Michel Alexandre Salim --- rust/pkg.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rust/pkg.sh b/rust/pkg.sh index 9315ed8..e3dee7c 100755 --- a/rust/pkg.sh +++ b/rust/pkg.sh @@ -4,12 +4,17 @@ set -o errtrace set -o nounset set -o pipefail +MOCK_ARGS="--chain --localrepo=./repo" CRATE=$1 shift +if [ -f $(pwd)/pkg.conf ]; then + source $(pwd)/pkg.conf +fi + rust2rpm -s ${CRATE} $@ mv ${CRATE}*.crate ~/rpmbuild/SOURCES/ PATCH=${CRATE}-fix-metadata.diff -[ -f ${PATCH} ] && mv ${PATCH} ~/rpmbuild/SOURCES/ +[ -f ${PATCH} ] && cp -p ${PATCH} ~/rpmbuild/SOURCES/ rpmbuild -bs rust-${CRATE}.spec -mock --chain --localrepo=./repo/ ~/rpmbuild/SRPMS/rust-${CRATE}*.src.rpm +mock ${MOCK_ARGS} ~/rpmbuild/SRPMS/rust-${CRATE}*.src.rpm -- cgit