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

Merge pull request #2534 from jlebon/pr/copr

This commit is contained in:
Jonathan Lebon 2022-02-03 15:36:50 -05:00 committed by GitHub
parent 2de6abfcd0 1e663baad7
commit a588295d3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.copr/Makefile Normal file
View File

@ -0,0 +1,8 @@
srpm:
dnf install -y git
ci/make-git-snapshot.sh
curl -LO https://src.fedoraproject.org/rpms/ostree/raw/rawhide/f/ostree.spec
sed -ie "s,^Version:.*,Version: $$(git describe --always --tags | sed -e 's,-,\.,g' -e 's,^v,,')," ostree.spec
sed -ie 's/^Patch/# Patch/g' ostree.spec # we don't want any downstream patches
rpmbuild -bs --define "_sourcedir ${PWD}" --define "_specdir ${PWD}" --define "_builddir ${PWD}" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" --define "_buildrootdir ${PWD}/.build" ostree.spec
mv *.src.rpm $$outdir

18
ci/libbuild.sh
View File

@ -6,7 +6,7 @@ OS_ID=$(. /etc/os-release; echo $ID)
OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID) OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
pkg_upgrade() { pkg_upgrade() {
yum -y distro-sync dnf -y distro-sync
} }
make() { make() {
@ -20,7 +20,7 @@ build() {
} }
pkg_install() { pkg_install() {
yum -y install "$@" dnf -y install "$@"
} }
pkg_install_if_os() { pkg_install_if_os() {
@ -39,25 +39,15 @@ pkg_install_buildroot() {
# https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89 # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89
# https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups
if rpm -q fedora-release-container; then if rpm -q fedora-release-container; then
yum -y swap fedora-release{-container,} dnf -y swap fedora-release{-container,}
fi fi
pkg_install dnf-plugins-core @buildsys-build;; pkg_install dnf-plugins-core @buildsys-build;;
centos) pkg_install yum-utils
# Base buildroot, copied from the mock config sadly
pkg_install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ \
grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar \
unzip util-linux which xz;;
*) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";;
esac esac
} }
pkg_builddep() { pkg_builddep() {
# This is sadly the only case where it's a different command dnf builddep -y "$@"
if test -x /usr/bin/dnf; then
dnf builddep -y "$@"
else
yum-builddep -y "$@"
fi
} }
# Install both build and runtime dependencies for $pkg # Install both build and runtime dependencies for $pkg

7
ci/make-git-snapshot.sh
View File

@ -5,12 +5,16 @@ TOP=$(git rev-parse --show-toplevel)
GITREV=$(git rev-parse HEAD) GITREV=$(git rev-parse HEAD)
gitdescribe=$(git describe --always --tags $GITREV) gitdescribe=$(git describe --always --tags $GITREV)
version=$(echo "$gitdescribe" | sed -e 's,-,\.,g' -e 's,^v,,') version=$(echo "$gitdescribe" | sed -e 's,-,\.,g' -e 's,^v,,')
name=$(basename $(pwd)) name=libostree
PKG_VER="${name}-${version}" PKG_VER="${name}-${version}"
TARFILE=${PKG_VER}.tar TARFILE=${PKG_VER}.tar
TARFILE_TMP=${TARFILE}.tmp TARFILE_TMP=${TARFILE}.tmp
if ! test -f ${TOP}/libglnx/README.md || ! test -f ${TOP}/bsdiff/README.md; then
git submodule update --init
fi
echo "Archiving ${PKG_VER} at ${GITREV} to ${TARFILE_TMP}" echo "Archiving ${PKG_VER} at ${GITREV} to ${TARFILE_TMP}"
(cd ${TOP}; git archive --format=tar --prefix=${PKG_VER}/ ${GITREV}) > ${TARFILE_TMP} (cd ${TOP}; git archive --format=tar --prefix=${PKG_VER}/ ${GITREV}) > ${TARFILE_TMP}
ls -al ${TARFILE_TMP} ls -al ${TARFILE_TMP}
@ -22,3 +26,4 @@ ls -al ${TARFILE_TMP}
rm submodule.tar rm submodule.tar
done done
mv ${TARFILE_TMP} ${TARFILE} mv ${TARFILE_TMP} ${TARFILE}
xz "${TARFILE}"