Skip to content
Snippets Groups Projects
Commit cb58a148 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Modify post-packaging rules

parent d7f51d2b
Branches
No related tags found
No related merge requests found
...@@ -5,15 +5,6 @@ set -e ...@@ -5,15 +5,6 @@ set -e
DEFAULT_TARGET=$(eval $(rustc --print cfg | grep target) ; \ DEFAULT_TARGET=$(eval $(rustc --print cfg | grep target) ; \
echo $target_arch-$target_vendor-$target_os-$target_env) echo $target_arch-$target_vendor-$target_os-$target_env)
post_package() {
if [ -x post-package-$1-$2 ] ; then
$(realpath post-package-$1-$2) $3
elif [ -x post-package-$1 ] ; then
$(realpath post-package-$1) $3
fi
}
export EDITOR=$(realpath $(dirname $0)/filter-toml.py) export EDITOR=$(realpath $(dirname $0)/filter-toml.py)
#export TMPDIR=$(mktemp -d /var/tmp/make-srpms-XXXXXX) #export TMPDIR=$(mktemp -d /var/tmp/make-srpms-XXXXXX)
export TMPDIR=/var/tmp/make-srpms export TMPDIR=/var/tmp/make-srpms
...@@ -26,10 +17,9 @@ mkdir -p "${RPMDIR}" ...@@ -26,10 +17,9 @@ mkdir -p "${RPMDIR}"
cargo fetch --target ${DEFAULT_TARGET} cargo fetch --target ${DEFAULT_TARGET}
cargo package cargo package
cd ${TMPDIR} cd ${TMPDIR}
for crate in $(find "${CARGO_HOME}" \ for crate in $(find "${PROJECTDIR}/target/package" \
"${PROJECTDIR}/target/package" -name '*.crate') ; do "${CARGO_HOME}" -name '*.crate' ) ; do
if [[ "$(basename ${crate})" =~ ^(.*)-([^-]*)$ ]] ; then if [[ "$(basename ${crate})" =~ ^(.*)-([^-]*).crate$ ]] ; then
set -x
NAME=${BASH_REMATCH[1]} NAME=${BASH_REMATCH[1]}
VERSION=${BASH_REMATCH[2]} VERSION=${BASH_REMATCH[2]}
rust2rpm --target fedora \ rust2rpm --target fedora \
...@@ -37,13 +27,18 @@ for crate in $(find "${CARGO_HOME}" \ ...@@ -37,13 +27,18 @@ for crate in $(find "${CARGO_HOME}" \
--store-crate \ --store-crate \
--no-dynamic-buildrequires \ --no-dynamic-buildrequires \
${crate} ${crate}
SPEC="${TMPDIR}/rust-${NAME}.spec"
sed -i -re 's/(BuildRequires:\s*)\((crate[\(][^\)]+\)).*/&\n\1\2/' \ sed -i -re 's/(BuildRequires:\s*)\((crate[\(][^\)]+\)).*/&\n\1\2/' \
"${TMPDIR}/rust-${NAME}.spec" "${SPEC}"
post_package ${NAME} ${VERSION} rust-${NAME}.spec if [ -x ${PROJECTDIR}/post-package-${NAME}-${VERSION} ] ; then
$(realpath ${PROJECTDIR}/post-package-${NAME}-${VERSION}) ${SPEC}
elif [ -x ${PROJECTDIR}/post-package-${NAME} ] ; then
$(realpath ${PROJECTDIR}/post-package-${NAME}) ${SPEC}
fi
rpmbuild -bs \ rpmbuild -bs \
--define "_sourcedir ${TMPDIR}" \ --define "_sourcedir ${TMPDIR}" \
--define "_srcrpmdir ${TMPDIR}" \ --define "_srcrpmdir ${TMPDIR}" \
"${TMPDIR}/rust-${NAME}.spec" "${SPEC}"
fi fi
done done
mv ${TMPDIR}/*.src.rpm ${RPMDIR}/ mv ${TMPDIR}/*.src.rpm ${RPMDIR}/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment