Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
639
Issues
639
List
Boards
Labels
Service Desk
Milestones
Merge Requests
193
Merge Requests
193
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
a9536b7f
Commit
a9536b7f
authored
Jun 14, 2016
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/abuild: upgrade to 2.27.2
parent
59845bc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
35 deletions
+5
-35
main/abuild/0001-abuild-fix-apk_up2date-check.patch
main/abuild/0001-abuild-fix-apk_up2date-check.patch
+0
-26
main/abuild/APKBUILD
main/abuild/APKBUILD
+5
-9
No files found.
main/abuild/0001-abuild-fix-apk_up2date-check.patch
deleted
100644 → 0
View file @
59845bc5
From 15fedf5f425b562b5793e430ef422b0bbf1050ed Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 18 May 2016 06:59:47 +0000
Subject: [PATCH] abuild: fix apk_up2date check
fix check that all subpackages exists, not only main package
---
abuild.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abuild.in b/abuild.in
index d6cdf6c..db82cfd 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1622,7 +1622,7 @@
apk_up2date() {
local i s
cd "$startdir"
for i in $pkgname $subpackages; do
- [ -f "$PKGDEST/$pkgname-$pkgver-r$pkgrel.apk" ] || return 1
+ [ -f "$PKGDEST/${i%:*}-$pkgver-r$pkgrel.apk" ] || return 1
done
[ -n "$keep" ] && return 0
--
2.8.2
main/abuild/APKBUILD
View file @
a9536b7f
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
abuild
pkgver
=
2.27.
1
pkgver
=
2.27.
2
_ver
=
${
pkgver
%_git*
}
pkgrel
=
1
pkgrel
=
0
pkgdesc
=
"Script to build Alpine Packages"
url
=
"http://git.alpinelinux.org/cgit/abuild/"
arch
=
"all"
...
...
@@ -20,7 +20,6 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems"
options
=
"suid"
pkggroups
=
"abuild"
source
=
"http://dev.alpinelinux.org/archive/abuild/abuild-
$_ver
.tar.xz
0001-abuild-fix-apk_up2date-check.patch
"
_builddir
=
"
$srcdir
/
$pkgname
-
$_ver
"
...
...
@@ -65,9 +64,6 @@ gems() {
mv
"
$pkgdir
"
/usr/bin/apkbuild-gem-resolver
"
$subpkgdir
"
/usr/bin/
}
md5sums
=
"7fd3556f17d2ca1d663bdb8259ad1b13 abuild-2.27.1.tar.xz
bca264e091cc2fbda111adeb65a75809 0001-abuild-fix-apk_up2date-check.patch"
sha256sums
=
"fe4edac6ab43de765d9efc009278247ecab0dab1177a61e174a7e427edb6c723 abuild-2.27.1.tar.xz
538241b8c5a86b2bf3b48e20f60995ced90b1bf893385a2e76942b5d4e6ebafe 0001-abuild-fix-apk_up2date-check.patch"
sha512sums
=
"9bad79a2a24f3df0ef7323f2c6fa8f597ebfd93b2cc1a156d559ccd69f0d94958ba3b76febcf553cdd0173bcdd5d8ddf6ab2eca03f5737a523aefc8e6809a9f9 abuild-2.27.1.tar.xz
a5af9fe55bd36db8bcb407826520250e41d2c5b99054ef0a6cfb87d428064286c6cbe8144e269175d361822d0a4a220211302dc16e4342916238bc802bedf309 0001-abuild-fix-apk_up2date-check.patch"
md5sums
=
"cabaec423ced69b85aac19583a11af84 abuild-2.27.2.tar.xz"
sha256sums
=
"8b84207e7588991929570845f6f73c6e3b0fc87ed3823c5096a41d355b331175 abuild-2.27.2.tar.xz"
sha512sums
=
"60f47a0f103c7b7d0f5bd6aea2030971d91dec1ba3d7ffb3ebacd4bba6d5666927ec7e8ecf969ca8acdb345d01cd953a04bab593334b89587b238af603b4d6d5 abuild-2.27.2.tar.xz"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment