[arch-commits] Commit in ostree/repos/extra-x86_64 (5 files)
Jan Steffens
heftig at gemini.archlinux.org
Wed Aug 3 14:26:31 UTC 2022
Date: Wednesday, August 3, 2022 @ 14:26:31
Author: heftig
Revision: 452014
archrelease: copy trunk to extra-x86_64
Added:
ostree/repos/extra-x86_64/PKGBUILD
(from rev 452013, ostree/trunk/PKGBUILD)
ostree/repos/extra-x86_64/keys/
ostree/repos/extra-x86_64/unbreak-build.diff
(from rev 452013, ostree/trunk/unbreak-build.diff)
Deleted:
ostree/repos/extra-x86_64/PKGBUILD
ostree/repos/extra-x86_64/keys/
--------------------+
PKGBUILD | 159 ++++++++++++++++++++++++++-------------------------
unbreak-build.diff | 33 ++++++++++
2 files changed, 116 insertions(+), 76 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-03 14:25:32 UTC (rev 452013)
+++ PKGBUILD 2022-08-03 14:26:31 UTC (rev 452014)
@@ -1,76 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Mirco Tischler <mt-ml at gmx dot de>
-
-_name=libostree
-pkgname=ostree
-_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^{}
-pkgver=2022.5
-pkgrel=1
-pkgdesc="Operating system and container binary deployment and upgrades"
-url="https://ostreedev.github.io/ostree/"
-arch=(x86_64)
-license=(GPL)
-depends=(fuse2 glibc libgpg-error libsodium util-linux openssl xz zlib)
-makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc
- libarchive libsoup libxslt mkinitcpio python systemd)
-checkdepends=(cpio elfutils gjs parallel python-yaml syslinux)
-source=(
- git+https://github.com/ostreedev/ostree#commit=$_commit
- git+https://github.com/mendsley/bsdiff
- git+https://gitlab.gnome.org/GNOME/libglnx.git
-)
-b2sums=('SKIP'
- 'SKIP'
- 'SKIP')
-# upstream ticket about chain of trust:
-# https://github.com/ostreedev/ostree/issues/2349
-validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters at redhat.com>
-
-prepare() {
- cd $pkgname
-
- git submodule init
- git submodule set-url bsdiff "$srcdir/bsdiff"
- git submodule set-url libglnx "$srcdir/libglnx"
- git submodule update
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --with-builtin-grub2-mkconfig \
- --with-ed25519-libsodium \
- --with-dracut \
- --with-mkinitcpio \
- --with-openssl \
- --enable-experimental-api \
- --disable-static \
- --enable-gtk-doc
-
- # circumvent overlinking
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-check() {
- make check -k -C $pkgname || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313"
-}
-
-package() {
- depends+=(libarchive.so libavahi-client.so libavahi-common.so
- libavahi-glib.so libgio-2.0.so libglib-2.0.so libgobject-2.0.so
- libgpgme.so libsoup-2.4.so libsystemd.so)
- provides+=(libostree-1.so)
-
- make DESTDIR="$pkgdir" install -C $pkgname
-}
Copied: ostree/repos/extra-x86_64/PKGBUILD (from rev 452013, ostree/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-03 14:26:31 UTC (rev 452014)
@@ -0,0 +1,83 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+
+pkgname=ostree
+_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^0
+pkgver=2022.5
+pkgrel=2
+pkgdesc="Operating system and container binary deployment and upgrades"
+url="https://ostreedev.github.io/ostree/"
+arch=(x86_64)
+license=(GPL)
+depends=(fuse2 glibc libgpg-error libsodium util-linux openssl xz zlib)
+makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc
+ libarchive libsoup libxslt mkinitcpio python systemd)
+checkdepends=(cpio elfutils gjs parallel python-yaml syslinux)
+options=(debug)
+source=(
+ "git+https://github.com/ostreedev/ostree#commit=$_commit"
+ git+https://github.com/mendsley/bsdiff
+ git+https://gitlab.gnome.org/GNOME/libglnx.git
+ unbreak-build.diff
+)
+b2sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ '6ef3bfcada9422ee43576727496947810f8123326320ae515ee1dee441d1c367bf756f76cf486ad3518c04b8e418026a2eb8dc299d55f2f188032d58f02e1fc7')
+# upstream ticket about chain of trust:
+# https://github.com/ostreedev/ostree/issues/2349
+validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters at redhat.com>
+
+prepare() {
+ cd ostree
+
+ # https://github.com/ostreedev/ostree/issues/2685
+ git apply -3 ../unbreak-build.diff
+
+ git submodule init
+ git submodule set-url bsdiff "$srcdir/bsdiff"
+ git submodule set-url libglnx "$srcdir/libglnx"
+ git submodule update
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd ostree
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --with-builtin-grub2-mkconfig \
+ --with-ed25519-libsodium \
+ --with-dracut \
+ --with-mkinitcpio \
+ --with-openssl \
+ --enable-experimental-api \
+ --disable-static \
+ --enable-gtk-doc
+
+ # circumvent overlinking
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd ostree
+ make check -k || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313"
+}
+
+package() {
+ depends+=(libarchive.so libavahi-client.so libavahi-common.so
+ libavahi-glib.so libgio-2.0.so libglib-2.0.so libgobject-2.0.so
+ libgpgme.so libsoup-2.4.so libsystemd.so)
+ provides+=(libostree-1.so)
+
+ cd ostree
+ make DESTDIR="$pkgdir" install
+}
Copied: ostree/repos/extra-x86_64/unbreak-build.diff (from rev 452013, ostree/trunk/unbreak-build.diff)
===================================================================
--- unbreak-build.diff (rev 0)
+++ unbreak-build.diff 2022-08-03 14:26:31 UTC (rev 452014)
@@ -0,0 +1,33 @@
+diff --git i/src/libostree/ostree-sysroot-deploy.c w/src/libostree/ostree-sysroot-deploy.c
+index 2dc9f58b..b565129a 100644
+--- i/src/libostree/ostree-sysroot-deploy.c
++++ w/src/libostree/ostree-sysroot-deploy.c
+@@ -23,7 +23,6 @@
+ #include <gio/gunixoutputstream.h>
+ #include <glib-unix.h>
+ #include <stdint.h>
+-#include <sys/mount.h>
+ #include <sys/statvfs.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+@@ -3504,7 +3503,7 @@ _ostree_sysroot_finalize_staged (OstreeSysroot *self,
+ {
+ g_autoptr(GError) writing_error = NULL;
+ g_assert_cmpint (self->boot_fd, !=, -1);
+- if (!glnx_file_replace_contents_at (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH,
++ if (!glnx_file_replace_contents_at (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH,
+ (guint8*)finalization_error->message, -1,
+ 0, cancellable, &writing_error))
+ {
+diff --git i/src/ostree/ot-main.c w/src/ostree/ot-main.c
+index b7b50d67..7a4405a5 100644
+--- i/src/ostree/ot-main.c
++++ w/src/ostree/ot-main.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+ #include <sys/statvfs.h>
+ #include <sys/mount.h>
+-#include <linux/fs.h>
+
+ #include "ot-main.h"
+ #include "ostree.h"
More information about the arch-commits
mailing list