From ff82900253d001dbeca04c46255e343c2b89df81 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sat, 3 Jan 2026 09:53:56 +1100 Subject: [PATCH] Separate rpm dirs for different Fedora versions --- release.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/release.sh b/release.sh index d93980e..1936eb9 100755 --- a/release.sh +++ b/release.sh @@ -43,14 +43,11 @@ for dist in ${DISTS[@]}; do done # RPM -REPO_ROOT="${HOME}/git/repo_rpm" -RPM_REPO="${REPO_ROOT}/rpm/x86_64" -BUILD_OUTPUT="${HOME}/git/bouquin-sqlcipher4/dist" -REMOTE="letessier.mig5.net:/opt/repo_rpm" -KEYID="00AE817C24A10C2540461A9C1D7CDE0234DB458D" -mkdir -p "$RPM_REPO" - sudo apt-get -y install createrepo-c rpm +BUILD_OUTPUT="${HOME}/git/bouquin-sqlcipher4/dist" +KEYID="00AE817C24A10C2540461A9C1D7CDE0234DB458D" +REPO_ROOT="${HOME}/git/repo_rpm" +REMOTE="letessier.mig5.net:/opt/repo_rpm" DISTS=( fedora:43 @@ -59,14 +56,18 @@ DISTS=( for dist in ${DISTS[@]}; do release=$(echo ${dist} | cut -d: -f2) - docker build -f Dockerfile.rpmbuild \ + REPO_RELEASE_ROOT="${REPO_ROOT}/fc${release}" + RPM_REPO="${REPO_RELEASE_ROOT}/rpm/x86_64" + mkdir -p "$RPM_REPO" + + docker build \ + -f Dockerfile.rpmbuild \ -t bouquin-sqlcipher4-rpm:${release} \ --progress=plain \ --build-arg BASE_IMAGE=${dist} \ . docker run --rm -v "$PWD":/src -v "$PWD/dist/rpm":/out bouquin-sqlcipher4-rpm:${release} - sudo chown -R "${USER}" "$PWD/dist" for file in `ls -1 "${BUILD_OUTPUT}/rpm"`; do