Switch ostree source to git

This commit is contained in:
Felix Krull 2020-08-25 19:54:35 +02:00 committed by Colin Walters
parent e76a6b48ff
commit d8838109f5
2 changed files with 13 additions and 8 deletions

View File

@ -1,17 +1,19 @@
FROM registry.fedoraproject.org/fedora:latest FROM registry.fedoraproject.org/fedora:latest
RUN dnf install -y curl gcc make tar xz 'dnf-command(builddep)' RUN dnf install -y gcc git make 'dnf-command(builddep)'
RUN dnf builddep -y ostree RUN dnf builddep -y ostree
ARG OSTREE_VER ARG OSTREE_REPO
ENV OSTREE_SRC=https://github.com/ostreedev/ostree/releases/download/v${OSTREE_VER}/libostree-${OSTREE_VER}.tar.xz ARG OSTREE_VERSION
RUN mkdir /src && \ RUN mkdir /src && \
cd /src && \ cd /src && \
curl -L -o /ostree.tar.xz ${OSTREE_SRC} && \ git init . && \
tar -xa --strip-components=1 -f /ostree.tar.xz && \ git fetch --depth 1 $OSTREE_REPO $OSTREE_VERSION && \
rm -r /ostree.tar.xz git checkout FETCH_HEAD && \
git submodule update --init
RUN mkdir /build && \ RUN mkdir /build && \
cd /build && \ cd /build && \
NOCONFIGURE=1 /src/autogen.sh && \
/src/configure \ /src/configure \
--with-openssl \ --with-openssl \
--with-curl \ --with-curl \

View File

@ -1,7 +1,8 @@
GIR_REPO := https://github.com/gtk-rs/gir.git GIR_REPO := https://github.com/gtk-rs/gir.git
GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989 GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989
OSTREE_REPO := https://github.com/ostreedev/ostree
OSTREE_VERSION := v2020.4
RUSTDOC_STRIPPER_VERSION := 0.1.13 RUSTDOC_STRIPPER_VERSION := 0.1.13
OSTREE_VER := 2020.4
all: gir all: gir
@ -49,7 +50,9 @@ gir-files:
gir-files/OSTree-1.0.gir: gir-files/OSTree-1.0.gir:
podman build \ podman build \
--build-arg OSTREE_VER=$(OSTREE_VER) \ --pull \
--build-arg OSTREE_REPO=$(OSTREE_REPO) \
--build-arg OSTREE_VERSION=$(OSTREE_VERSION) \
-t ostree-build \ -t ostree-build \
. .
podman run \ podman run \