Revert LOCALSOURCE change, pipe install rpmdevtools to null to reduce

log output
This commit is contained in:
2026-03-30 00:53:42 -04:00
parent d6ecf97a04
commit e81633af8b
2 changed files with 9 additions and 14 deletions

View File

@@ -40,10 +40,10 @@ runs:
env: env:
SOURCE_DIRECTORY: ${{ inputs.extra-source-directory }} SOURCE_DIRECTORY: ${{ inputs.extra-source-directory }}
run: | run: |
mkdir -p ./rpmbuild/LOCALSOURCE mkdir -p ./rpmbuild/SOURCES
BASENAME=$(basename "${SOURCE_DIRECTORY}") BASENAME=$(basename "${SOURCE_DIRECTORY}")
DIRNAME=$(dirname "${SOURCE_DIRECTORY}") DIRNAME=$(dirname "${SOURCE_DIRECTORY}")
tar -czf ./rpmbuild/LOCALSOURCE/source.tar.gz -C ${DIRNAME} ${BASENAME} tar -czf ./rpmbuild/SOURCES/source.tar.gz -C ${DIRNAME} ${BASENAME}
- name: Add extra patch files - name: Add extra patch files
shell: bash shell: bash

View File

@@ -4,23 +4,18 @@ echo "--- Start adding repos and priorities ---"
dnf5 -y config-manager addrepo --from-repofile=https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo dnf5 -y config-manager addrepo --from-repofile=https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo
echo "--- Setup workspace and packages ---" echo "--- Setup workspace and packages ---"
dnf5 -y install rpmdevtools dnf5 -y -q install rpmdevtools > /dev/null 2>&1
rpmdev-setuptree rpmdev-setuptree
dnf5 -y builddep $1 dnf5 -y builddep $1
if [[ -f "~/rpmbuild/LOCALSOURCE/source.tar.gz" ]]; then echo "--- Download sources ---"
echo "--- Peaking inside source.tar.gz ---" rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1
tar -rf ~/rpmbuild/LOCALSOURCE/source.tar.gz
mv ~/rpmbuild/LOCALSOURCE/source.tar.gz ~/rpmbuild/SOURCES/source.tar.gz
else
echo "--- source.tar.gz not found ---"
echo "--- Download sources ---"
rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1
fi
echo "--- Add patches ---" if [[ -d ~/rpmbuild/PATCHES ]]; then
cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES echo "--- Add patches ---"
cp ~/rpmbuild/PATCHES/* ~/rpmbuild/SOURCES
fi
echo "--- Build RPM packages ---" echo "--- Build RPM packages ---"
rpmbuild --nodebuginfo --bb $1 && echo "--- Done! ---" rpmbuild --nodebuginfo --bb $1 && echo "--- Done! ---"