Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
ac60d9a4
Commit
ac60d9a4
authored
3 months ago
by
achill (fossdd)
Committed by
A. Klitzing
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
community/ostree: upgrade to 2025.1
https://github.com/ostreedev/ostree/releases/tag/v2025.1
parent
f422aaf1
No related branches found
Branches containing commit
No related tags found
1 merge request
!79073
community/ostree: upgrade to 2025.1
Pipeline
#302352
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/ostree/APKBUILD
+6
-3
6 additions, 3 deletions
community/ostree/APKBUILD
community/ostree/prctl.patch
+31
-0
31 additions, 0 deletions
community/ostree/prctl.patch
with
37 additions
and
3 deletions
community/ostree/APKBUILD
+
6
−
3
View file @
ac60d9a4
# Contributor: André Klitzing <aklitzing@gmail.com>
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname
=
ostree
pkgver
=
202
4
.1
0
pkgver
=
202
5
.1
pkgrel
=
0
pkgdesc
=
"Operating system and container binary deployment and upgrades"
url
=
"https://github.com/ostreedev/ostree"
...
...
@@ -34,7 +34,9 @@ subpackages="
$pkgname
-grub:grub:noarch
$pkgname
-bash-completion:bashcomp:noarch
"
source
=
"https://github.com/ostreedev/ostree/releases/download/v
$pkgver
/libostree-
$pkgver
.tar.xz"
source
=
"https://github.com/ostreedev/ostree/releases/download/v
$pkgver
/libostree-
$pkgver
.tar.xz
prctl.patch
"
builddir
=
"
$srcdir
/lib
$pkgname
-
$pkgver
"
# todo: fails to make stuff in var/tmp in root
options
=
"!check"
...
...
@@ -109,5 +111,6 @@ gir() {
}
sha512sums
=
"
5930ea484a3befbcb720147636797429affe4013e2ddc8e39b6ed0de5d4ea56e8ec6fda5b1552ac4e431cb342413808d337426c89447c1ee208ec090790087fd libostree-2024.10.tar.xz
ed699c9143a819ef289846ba4c10fc57af298f2d996982192091813a4e085e3e61faf04167d02c19b6bcf0efce64aa78658e3003558b33c5d09161c93ef728c0 libostree-2025.1.tar.xz
58699a87db03a10dab50b16736d536edd24fc87487569ad7137c3d70f05a6b56bdb8a2609de5b0bf77f1e8f25e6b5475e1fffa66f79f0cd19d8a9744a699b9cf prctl.patch
"
This diff is collapsed.
Click to expand it.
community/ostree/prctl.patch
0 → 100644
+
31
−
0
View file @
ac60d9a4
From e82bb38adfc9edfacfe7118592eb4b4357cc687b Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Mon, 27 Jan 2025 17:49:39 +0100
Subject: [PATCH] libotutil: Remove redundant import of prctl.h
sys/prctl.h already provides prctl.h and adding both imports fails on
musl libc:
/usr/include/sys/prctl.h:88:8: error: redefinition of 'struct prctl_mm_map'
88 | struct prctl_mm_map {
| ^~~~~~~~~~~~
In file included from src/libotutil/ot-unix-utils.c:33:
/usr/include/linux/prctl.h:134:8: note: originally defined here
134 | struct prctl_mm_map {
| ^~~~~~~~~~~~
---
src/libotutil/ot-unix-utils.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/libotutil/ot-unix-utils.c b/src/libotutil/ot-unix-utils.c
index 551cc8789d..eee3a44f57 100644
--- a/src/libotutil/ot-unix-utils.c
+++ b/src/libotutil/ot-unix-utils.c
@@ -30,7 +30,6 @@
#include <errno.h>
#include <fcntl.h>
#include <linux/capability.h>
-#include <linux/prctl.h>
#include <stdlib.h>
#include <string.h>
#include <sys/prctl.h>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment