--- /dev/null
+# -*- mode: Makefile -*-
+
+mypath = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+topsrcdir = $(shell git rev-parse --show-toplevel)
+GITREV = $(shell git describe --always --tags)
+GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
+
+PACKAGE ?= $(shell basename $(topsrcdir))
+DISTGIT_NAME ?= $(PACKAGE)
+DISTGIT ?= https://src.fedoraproject.org/rpms/$(DISTGIT_NAME)
+SPEC ?= $(topsrcdir)/$(DISTGIT_NAME).spec
+
+PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
+PKG_CLIENT_VER = $(PACKAGE)-client-$(GITREV_FOR_PKG)
+
+dist-snapshot:
+ if ! test -f $(PKG_VER).tar.xz; then \
+ $(mypath)/make-git-snapshot.sh "$(topsrcdir)" "$(PKG_VER)" "$(GITREV)" && \
+ rm -f $(PKG_VER).tar.xz && \
+ xz $(PKG_VER).tar; \
+ fi
+
+srpm: dist-snapshot
+ if test -f "$(SPEC)"; then \
+ sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(SPEC) > $(DISTGIT_NAME).spec && \
+ $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec ; \
+ else \
+ test -d $(DISTGIT_NAME) || git clone --depth=1 $(DISTGIT) && \
+ mv $(PKG_VER).tar.xz $(DISTGIT_NAME) && \
+ origdir=$$(pwd); \
+ cd $(DISTGIT_NAME) && \
+ git stash && git pull -r && \
+ sed -i -e '/^Patch/d' -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \
+ rm -f *.src.rpm && \
+ $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \
+ fi
+
+rpm: srpm
+ ./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm
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)
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
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
set -xeuo pipefail
dn=$(dirname $0)
-. ${dn}/libpaprci/libbuild.sh
+. ${dn}/libbuild.sh
${dn}/installdeps.sh
FLATPAK_TAG=1.4.1
dn=$(dirname $0)
-. ${dn}/libpaprci/libbuild.sh
+. ${dn}/libbuild.sh
codedir=$(pwd)
fi
dn=$(dirname $0)
-. ${dn}/libpaprci/libbuild.sh
+. ${dn}/libbuild.sh
pkg_upgrade
pkg_install_buildroot
--- /dev/null
+#!/usr/bin/bash
+
+dn=$(cd $(dirname $0) && pwd)
+
+OS_ID=$(. /etc/os-release; echo $ID)
+OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
+
+pkg_upgrade() {
+ yum -y distro-sync
+}
+
+make() {
+ /usr/bin/make -j $(getconf _NPROCESSORS_ONLN) "$@"
+}
+
+build() {
+ env NOCONFIGURE=1 ./autogen.sh
+ ./configure --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib64 "$@"
+ make V=1
+}
+
+pkg_install() {
+ yum -y install "$@"
+}
+
+pkg_install_if_os() {
+ local os=$1
+ shift
+ if test "${os}" = "${OS_ID}"; then
+ pkg_install "$@"
+ else
+ echo "Skipping installation targeted for ${os} (current OS: ${OS_ID}): $@"
+ fi
+}
+
+pkg_install_buildroot() {
+ case "${OS_ID}" in
+ fedora)
+ # 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
+ if rpm -q fedora-release-container; then
+ yum -y swap fedora-release{-container,}
+ fi
+ 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}";;
+ esac
+}
+
+pkg_builddep() {
+ # This is sadly the only case where it's a different command
+ if test -x /usr/bin/dnf; then
+ dnf builddep -y "$@"
+ else
+ yum-builddep -y "$@"
+ fi
+}
+
+# Install both build and runtime dependencies for $pkg
+pkg_builddep_runtimedep() {
+ local pkg=$1
+ pkg_builddep $pkg
+ pkg_install $pkg
+ rpm -e $pkg
+}
+++ /dev/null
-# -*- mode: Makefile -*-
-
-mypath = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-topsrcdir = $(shell git rev-parse --show-toplevel)
-GITREV = $(shell git describe --always --tags)
-GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
-
-PACKAGE ?= $(shell basename $(topsrcdir))
-DISTGIT_NAME ?= $(PACKAGE)
-DISTGIT ?= https://src.fedoraproject.org/rpms/$(DISTGIT_NAME)
-SPEC ?= $(topsrcdir)/$(DISTGIT_NAME).spec
-
-PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
-PKG_CLIENT_VER = $(PACKAGE)-client-$(GITREV_FOR_PKG)
-
-dist-snapshot:
- if ! test -f $(PKG_VER).tar.xz; then \
- $(mypath)/make-git-snapshot.sh "$(topsrcdir)" "$(PKG_VER)" "$(GITREV)" && \
- rm -f $(PKG_VER).tar.xz && \
- xz $(PKG_VER).tar; \
- fi
-
-srpm: dist-snapshot
- if test -f "$(SPEC)"; then \
- sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(SPEC) > $(DISTGIT_NAME).spec && \
- $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec ; \
- else \
- test -d $(DISTGIT_NAME) || git clone --depth=1 $(DISTGIT) && \
- mv $(PKG_VER).tar.xz $(DISTGIT_NAME) && \
- origdir=$$(pwd); \
- cd $(DISTGIT_NAME) && \
- git stash && git pull -r && \
- sed -i -e '/^Patch/d' -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \
- rm -f *.src.rpm && \
- $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \
- fi
-
-rpm: srpm
- ./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm
+++ /dev/null
-#!/usr/bin/bash
-
-dn=$(cd $(dirname $0) && pwd)
-
-OS_ID=$(. /etc/os-release; echo $ID)
-OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
-
-pkg_upgrade() {
- yum -y distro-sync
-}
-
-make() {
- /usr/bin/make -j $(getconf _NPROCESSORS_ONLN) "$@"
-}
-
-build() {
- env NOCONFIGURE=1 ./autogen.sh
- ./configure --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib64 "$@"
- make V=1
-}
-
-pkg_install() {
- yum -y install "$@"
-}
-
-pkg_install_if_os() {
- local os=$1
- shift
- if test "${os}" = "${OS_ID}"; then
- pkg_install "$@"
- else
- echo "Skipping installation targeted for ${os} (current OS: ${OS_ID}): $@"
- fi
-}
-
-pkg_install_buildroot() {
- case "${OS_ID}" in
- fedora)
- # 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
- if rpm -q fedora-release-container; then
- yum -y swap fedora-release{-container,}
- fi
- 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}";;
- esac
-}
-
-pkg_builddep() {
- # This is sadly the only case where it's a different command
- if test -x /usr/bin/dnf; then
- dnf builddep -y "$@"
- else
- yum-builddep -y "$@"
- fi
-}
-
-# Install both build and runtime dependencies for $pkg
-pkg_builddep_runtimedep() {
- local pkg=$1
- pkg_builddep $pkg
- pkg_install $pkg
- rpm -e $pkg
-}
+++ /dev/null
-#!/bin/sh
-
-srcdir=$1
-shift
-PKG_VER=$1
-shift
-GITREV=$1
-shift
-
-TARFILE=${PKG_VER}.tar
-TARFILE_TMP=${TARFILE}.tmp
-
-set -x
-set -e
-
-test -n "${srcdir}"
-test -n "${PKG_VER}"
-test -n "${GITREV}"
-
-TOP=$(git rev-parse --show-toplevel)
-
-echo "Archiving ${PKG_VER} at ${GITREV} to ${TARFILE_TMP}"
-(cd ${TOP}; git archive --format=tar --prefix=${PKG_VER}/ ${GITREV}) > ${TARFILE_TMP}
-ls -al ${TARFILE_TMP}
-(cd ${TOP}; git submodule status) | while read line; do
- rev=$(echo ${line} | cut -f 1 -d ' '); path=$(echo ${line} | cut -f 2 -d ' ')
- echo "Archiving ${path} at ${rev}"
- (cd ${srcdir}/${path}; git archive --format=tar --prefix=${PKG_VER}/${path}/ ${rev}) > submodule.tar
- tar -A -f ${TARFILE_TMP} submodule.tar
- rm submodule.tar
-done
-mv ${TARFILE_TMP} ${TARFILE}
+++ /dev/null
-#!/bin/sh
-# rpmbuild-cwd:
-# Run "rpmbuild", defining all RPM variables to use the current directory.
-# This matches Fedora's system.
-#
-# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
-# Copyright (C) 2010 Red Hat, Inc.
-# Written by Colin Walters <walters@verbum.org>
-
-pwd=$(pwd)
-exec rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" "$@"
--- /dev/null
+#!/bin/sh
+
+srcdir=$1
+shift
+PKG_VER=$1
+shift
+GITREV=$1
+shift
+
+TARFILE=${PKG_VER}.tar
+TARFILE_TMP=${TARFILE}.tmp
+
+set -x
+set -e
+
+test -n "${srcdir}"
+test -n "${PKG_VER}"
+test -n "${GITREV}"
+
+TOP=$(git rev-parse --show-toplevel)
+
+echo "Archiving ${PKG_VER} at ${GITREV} to ${TARFILE_TMP}"
+(cd ${TOP}; git archive --format=tar --prefix=${PKG_VER}/ ${GITREV}) > ${TARFILE_TMP}
+ls -al ${TARFILE_TMP}
+(cd ${TOP}; git submodule status) | while read line; do
+ rev=$(echo ${line} | cut -f 1 -d ' '); path=$(echo ${line} | cut -f 2 -d ' ')
+ echo "Archiving ${path} at ${rev}"
+ (cd ${srcdir}/${path}; git archive --format=tar --prefix=${PKG_VER}/${path}/ ${rev}) > submodule.tar
+ tar -A -f ${TARFILE_TMP} submodule.tar
+ rm submodule.tar
+done
+mv ${TARFILE_TMP} ${TARFILE}
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 \
--- /dev/null
+#!/bin/sh
+# rpmbuild-cwd:
+# Run "rpmbuild", defining all RPM variables to use the current directory.
+# This matches Fedora's system.
+#
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
+# Copyright (C) 2010 Red Hat, Inc.
+# Written by Colin Walters <walters@verbum.org>
+
+pwd=$(pwd)
+exec rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" "$@"
RPMOSTREE_TAG=v2019.4
dn=$(dirname $0)
-. ${dn}/libpaprci/libbuild.sh
+. ${dn}/libbuild.sh
codedir=$(pwd)
projects / ostree.git / commitdiff