From 8af48c5ce286edb301808c8d39e40c3f210f298a Mon Sep 17 00:00:00 2001 From: Anders Blomdell <anders.blomdell@gmail.com> Date: Tue, 12 Jan 2021 15:50:35 +0100 Subject: [PATCH] Switch to plain target --- filter-toml.py | 1 - make-srpms | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/filter-toml.py b/filter-toml.py index 8d0f353..64c5b7a 100755 --- a/filter-toml.py +++ b/filter-toml.py @@ -132,7 +132,6 @@ if __name__ == '__main__': old = open(p).read() new = filter_dependencies(old) if old != new: - print("# ", p, file=sys.stderr) with open(p, 'w') as f: f.write(new) pass diff --git a/make-srpms b/make-srpms index 41c4727..d59f4d1 100755 --- a/make-srpms +++ b/make-srpms @@ -6,8 +6,8 @@ DEFAULT_TARGET=$(eval $(rustc --print cfg | grep target) ; \ echo $target_arch-$target_vendor-$target_os-$target_env) export EDITOR=$(realpath $(dirname $0)/filter-toml.py) -#export TMPDIR=$(mktemp -d /var/tmp/make-srpms-XXXXXX) -export TMPDIR=/var/tmp/make-srpms +export TMPDIR=$(mktemp -d /var/tmp/make-srpms-XXXXXX) +#export TMPDIR=/var/tmp/make-srpms export PROJECTDIR=$(realpath .) export RPMDIR=${PROJECTDIR}/rpms export CARGO_HOME=${TMPDIR}/cargo @@ -22,7 +22,7 @@ for crate in $(find "${PROJECTDIR}/target/package" \ if [[ "$(basename ${crate})" =~ ^(.*)-([^-]*).crate$ ]] ; then NAME=${BASH_REMATCH[1]} VERSION=${BASH_REMATCH[2]} - rust2rpm --target fedora \ + rust2rpm --target plain \ --patch \ --store-crate \ --no-dynamic-buildrequires \ -- GitLab