mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 05:17:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/abuild: add support for provider_priority

Browse Source
This commit is contained in:
Jakub Jirutka 2017-12-30 10:49:38 +01:00
parent c7c225106d
commit 2b5c38eddb
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
main/abuild/0001-abuild-add-support-for-provider_priority.patch Normal file
View File

@ -0,0 +1,40 @@
From 4b24af9e9f3524550a4b8f5666c10315a45dfe05 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 2 Nov 2017 04:51:51 +0000
Subject: [PATCH] abuild: add support for provider_priority
provider_priority is a number which determines what priority a package should be
given when solving a dependency graph using a provides entry instead of a direct
package, in the event of conflicts.
---
abuild.in | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/abuild.in b/abuild.in
index 3f083b2..87aeb66 100644
--- a/abuild.in
+++ b/abuild.in
@@ -139,6 +139,12 @@ default_sanitycheck() {
&& ! echo $replaces_priority | egrep -q '^[0-9]+$'; then
die "replaces_priority must be a number"
fi
+
+ if [ -n "$provider_priority" ] \
+ && ! echo $provider_priority | egrep -q '^[0-9]+$'; then
+ die "provider_priority must be a number"
+ fi
+
# check so no package names starts with -
for i in $pkgname $subpackages; do
case $i in
@@ -927,6 +933,10 @@ prepare_metafiles() {
echo "replaces_priority = $replaces_priority" >> "$pkginfo"
fi
+ if [ -n "$provider_priority" ]; then
+ echo "provider_priority = $provider_priority" >> "$pkginfo"
+ fi
+
echo "license = $license" >> "$pkginfo"
for i in $replaces; do
echo "replaces = $i" >> "$pkginfo"

6
main/abuild/APKBUILD
View File

@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.1.0
_ver=${pkgver%_git*}
pkgrel=3
pkgrel=4
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@ -23,6 +23,7 @@ pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
0001-abuild-add-env-option-to-require-tests.patch
0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
0001-abuild-add-support-for-provider_priority.patch
"
builddir="$srcdir/$pkgname-$_ver"
@ -71,4 +72,5 @@ _rootbld() {
sha512sums="bb9093d67942e3a63e4e053692c0bca30940cae05955518206cd9f7029211a188b7f442456ae126e61cbdca224eddb31e967d5cf0637e16893163cc963871a52 abuild-3.1.0.tar.xz
e02cc44c8ad9dd61c9b80684b8cf5b64477a6fd6221cde9efea2a7594c6e7ce01a51f8bd4b80d72f82f7caf93217979fb0b354c420983891fa93f34c4252a035 0001-abuild-add-env-option-to-require-tests.patch
5d196f302715f5f12ca13b70baea59f49bf3180e35e7a15849e9f9bc24b42a13666ee96666eae02bd31d54f227bb7c1fd5ae2e06dcfe1d7eb41ecfd6b9b3d28e 0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch"
5d196f302715f5f12ca13b70baea59f49bf3180e35e7a15849e9f9bc24b42a13666ee96666eae02bd31d54f227bb7c1fd5ae2e06dcfe1d7eb41ecfd6b9b3d28e 0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
1d452e85d2677b91001033441ac275318db2a7f699461aaf2a9ea37d260864fed6f1cea4798c6e2c84010ba534808fae16a3a9b15056fe74ee33c5e23f8cfffa 0001-abuild-add-support-for-provider_priority.patch"