From e1f782a90dd18337519606caf9e15d5456819f4c Mon Sep 17 00:00:00 2001 From: Nicolas MASSE Date: Sat, 1 May 2021 23:33:48 +0200 Subject: [PATCH] improve the build script --- rpmbuild/README.md | 4 ++-- rpmbuild/build.sh | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/rpmbuild/README.md b/rpmbuild/README.md index e907d1e..f99f596 100644 --- a/rpmbuild/README.md +++ b/rpmbuild/README.md @@ -2,8 +2,8 @@ ## Installation -``` -dnf install rpm-build rpm-devel rpmlint coreutils diffutils patch rpmdevtools createrepo rclone go-rpm-macros +```sh +dnf install rpm-build rpm-devel rpmlint coreutils diffutils patch rpmdevtools createrepo rclone go-rpm-macros mock ``` ## Infos packaging diff --git a/rpmbuild/build.sh b/rpmbuild/build.sh index 3efc06b..88c70d3 100755 --- a/rpmbuild/build.sh +++ b/rpmbuild/build.sh @@ -3,16 +3,24 @@ set -Eeuo pipefail mkdir -p RPMS SRPMS BUILD BUILDROOT +tmp_dir=$(mktemp -d -t mock-XXXXXXXXXX) +trap "rm -rf $tmp_dir" EXIT + +function build_pkg () { + spectool -g -R SPECS/$1.spec + rpmbuild -bs SPECS/$1.spec + mock --enable-network -r centos-8-x86_64 --resultdir=$tmp_dir SRPMS/$(ls -1ct SRPMS | head -n1) +} + +# TODO: rewrite this! if [ $# -gt 0 ]; then for pkg; do - spectool -g -R SPECS/$pkg.spec - rpmbuild -ba SPECS/$pkg.spec + build_pkg $pkg done + cp $tmp_dir/*.x86_64.rpm RPMS/x86_64/ else for spec in SPECS/*.spec; do - spectool -g -R $spec - rpmbuild -ba $spec + build_pkg $(basename $spec .spec) done fi -