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).

ci/build-check.sh

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

ci/build-rpm.sh

@@ -4,8 +4,7 @@
 set -xeuo pipefail
 
 dn=$(dirname $0)
-paprcidir=${dn}/libpaprci
-. ${paprcidir}/libbuild.sh
+. ${dn}/libbuild.sh
 
 # Auto-provision bootstrap resources if run as root (normally in CI)
 if test "$(id -u)" == 0; then
@@ -34,13 +33,13 @@ case "${CONFIGOPTS:-}" in
 esac
 
 # 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
     pkg_builddep *.src.rpm
 else
     echo "NOTE: Running as non-root, assuming build dependencies are installed"
 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 {} \;
     exit 1
 fi

ci/build.sh

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

ci/flatpak.sh

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

ci/installdeps.sh

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

ci/provision-prep.sh

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

ci/rpmostree.sh

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