packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Remove libpaprci/ directory 

And move everything that was in it directly in `ci/`. There's a bunch
more cleanups here that we need to do (and more changes to upstream from
the rpm-ostree copies of this).
This commit is contained in:
Jonathan Lebon 2020-06-17 15:48:31 -04:00
parent eb3fe35b06
commit 516c1340b3
11 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ci/libpaprci/Makefile.dist-packaging → ci/Makefile.dist-packaging
View File

2
ci/build-check.sh
View File

@ -4,7 +4,7 @@
set -xeuo pipefail set -xeuo pipefail
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
${dn}/build.sh ${dn}/build.sh
topdir=$(git rev-parse --show-toplevel) topdir=$(git rev-parse --show-toplevel)
resultsdir=$(mktemp -d) resultsdir=$(mktemp -d)

7
ci/build-rpm.sh
View File

@ -4,8 +4,7 @@
set -xeuo pipefail set -xeuo pipefail
dn=$(dirname $0) dn=$(dirname $0)
paprcidir=${dn}/libpaprci . ${dn}/libbuild.sh
. ${paprcidir}/libbuild.sh
# Auto-provision bootstrap resources if run as root (normally in CI) # Auto-provision bootstrap resources if run as root (normally in CI)
if test "$(id -u)" == 0; then if test "$(id -u)" == 0; then
@ -34,13 +33,13 @@ case "${CONFIGOPTS:-}" in
esac esac
# TODO: Use some form of rpm's --build-in-place to skip archive-then-unpack? # TODO: Use some form of rpm's --build-in-place to skip archive-then-unpack?
make -f ${paprcidir}/Makefile.dist-packaging srpm PACKAGE=libostree DISTGIT_NAME=ostree make -f ${dn}/Makefile.dist-packaging srpm PACKAGE=libostree DISTGIT_NAME=ostree
if test "$(id -u)" == 0; then if test "$(id -u)" == 0; then
pkg_builddep *.src.rpm pkg_builddep *.src.rpm
else else
echo "NOTE: Running as non-root, assuming build dependencies are installed" echo "NOTE: Running as non-root, assuming build dependencies are installed"
fi fi
if ! ${paprcidir}/rpmbuild-cwd --rebuild *.src.rpm; then if ! ${dn}/rpmbuild-cwd --rebuild *.src.rpm; then
find . -type f -name config.log -exec cat {} \; find . -type f -name config.log -exec cat {} \;
exit 1 exit 1
fi fi

2
ci/build.sh
View File

@ -4,7 +4,7 @@
set -xeuo pipefail set -xeuo pipefail
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
${dn}/installdeps.sh ${dn}/installdeps.sh

2
ci/flatpak.sh
View File

@ -9,7 +9,7 @@ set -xeuo pipefail
FLATPAK_TAG=1.4.1 FLATPAK_TAG=1.4.1
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
codedir=$(pwd) codedir=$(pwd)

2
ci/installdeps.sh
View File

@ -12,7 +12,7 @@ if [ -n "${SKIP_INSTALLDEPS:-}" ]; then
fi fi
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
pkg_upgrade pkg_upgrade
pkg_install_buildroot pkg_install_buildroot

0
ci/libpaprci/libbuild.sh → ci/libbuild.sh
View File

0
ci/libpaprci/make-git-snapshot.sh → ci/make-git-snapshot.sh
View File

2
ci/provision-prep.sh
View File

@ -4,7 +4,7 @@
set -xeuo pipefail set -xeuo pipefail
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
pkg_upgrade pkg_upgrade
pkg_install_buildroot pkg_install_buildroot
pkg_install sudo which attr fuse strace \ pkg_install sudo which attr fuse strace \

0
ci/libpaprci/rpmbuild-cwd → ci/rpmbuild-cwd
View File

2
ci/rpmostree.sh
View File

@ -9,7 +9,7 @@ set -xeuo pipefail
RPMOSTREE_TAG=v2019.4 RPMOSTREE_TAG=v2019.4
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh . ${dn}/libbuild.sh
codedir=$(pwd) codedir=$(pwd)