David Runge pushed to branch main at Arch Linux / Packaging / Packages / ostree


Commits:
cb7342ab by David Runge at 2024-05-18T16:51:39+02:00
upgpkg: 2024.6-1

Replace vendored composefs with system-provided version.

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = ostree
        pkgdesc = Operating system and container binary deployment and upgrades
-       pkgver = 2024.5
+       pkgver = 2024.6
        pkgrel = 1
        url = https://ostreedev.github.io/ostree/
        arch = x86_64
@@ -28,6 +28,7 @@ pkgbase = ostree
        makedepends = systemd
        makedepends = xz
        depends = bash
+       depends = composefs
        depends = fuse3
        depends = gcc-libs
        depends = glibc
@@ -38,20 +39,19 @@ pkgbase = ostree
        depends = which
        depends = zlib
        provides = libostree-1.so
-       source = git+https://github.com/ostreedev/ostree#tag=v2024.5
-       source = git+https://github.com/containers/composefs.git
+       source = git+https://github.com/ostreedev/ostree#tag=v2024.6
        source = git+https://github.com/mendsley/bsdiff
        source = git+https://gitlab.gnome.org/GNOME/libglnx.git
        source = ostree-2023.1-use_fuse3.patch
        validpgpkeys = 1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291
-       b2sums = 
25dd16ad1356ec22807242a210f60482d28893250f9c23f861887406e5ba947fc2f41dfba2082dce7cbb3ea675f3b799a58dfda141c5ae8b537bd1393d942f47
-       b2sums = SKIP
+       b2sums = 
0d26fc4686e2aef9789aeb34717ea78e21c734929d641e3928c7cf401b5b975e8ef2b6c2549c8243a7bca4cc20c8b326ba9ce49a14b972ed25f25539b5c0d31b
        b2sums = SKIP
        b2sums = SKIP
        b2sums = 
cfff162120f70995e18ec56454711501391b97456e2a0f34643c9d2a9c2b50b4d76afc2e2fc50ea28e8a773c618215d6cb855b96663f69dc5cc93bc5766f3f28
 
 pkgname = ostree
        depends = bash
+       depends = composefs
        depends = fuse3
        depends = gcc-libs
        depends = glibc


=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 
 pkgname=ostree
-pkgver=2024.5
+pkgver=2024.6
 pkgrel=1
 pkgdesc="Operating system and container binary deployment and upgrades"
 url="https://ostreedev.github.io/ostree/";
@@ -11,6 +11,7 @@ arch=(x86_64)
 license=(LGPL-2.0-or-later)
 depends=(
   bash
+  composefs
   fuse3
   gcc-libs
   glibc
@@ -50,13 +51,11 @@ checkdepends=(
 provides=(libostree-1.so)
 source=(
   git+https://github.com/ostreedev/ostree#tag=v$pkgver
-  git+https://github.com/containers/composefs.git
   git+https://github.com/mendsley/bsdiff
   git+https://gitlab.gnome.org/GNOME/libglnx.git
   $pkgname-2023.1-use_fuse3.patch
 )
-b2sums=('25dd16ad1356ec22807242a210f60482d28893250f9c23f861887406e5ba947fc2f41dfba2082dce7cbb3ea675f3b799a58dfda141c5ae8b537bd1393d942f47'
-        'SKIP'
+b2sums=('0d26fc4686e2aef9789aeb34717ea78e21c734929d641e3928c7cf401b5b975e8ef2b6c2549c8243a7bca4cc20c8b326ba9ce49a14b972ed25f25539b5c0d31b'
         'SKIP'
         'SKIP'
         
'cfff162120f70995e18ec56454711501391b97456e2a0f34643c9d2a9c2b50b4d76afc2e2fc50ea28e8a773c618215d6cb855b96663f69dc5cc93bc5766f3f28')
@@ -76,7 +75,6 @@ prepare() {
   git apply -3 ../$pkgname-2023.1-use_fuse3.patch
 
   git submodule init
-  git submodule set-url composefs "$srcdir/composefs"
   git submodule set-url bsdiff "$srcdir/bsdiff"
   git submodule set-url libglnx "$srcdir/libglnx"
   git -c protocol.file.allow=always submodule update



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/ostree/-/commit/cb7342ab362b535a12a1894ef34978b66ffd72e9

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/ostree/-/commit/cb7342ab362b535a12a1894ef34978b66ffd72e9
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to