Commit 7ab85b7a authored by Natanael Copa's avatar Natanael Copa

main/abuild: fix circular dep problem for symlink deps

parent 54da37d0
From 3f3281c87e123d15284e07e80a6ab5ba751463c9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 23 Jun 2015 11:20:29 +0000
Subject: [PATCH] abuild: fix circular dependency for symlink deps
The package should not have itself as dependency.
---
abuild.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/abuild.in b/abuild.in
index 0813dd3..e76d873 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1210,14 +1210,17 @@ scan_symlink_targets() {
local symfile= targetpath=
cd "$datadir"
for symfile in "$pkgbasedir"/.control.*/.symlinks; do
- [ -e "$symfile" ] || continue
+ local d="${symfile%/.symlinks}"
+ if ! [ -e "$symfile" ] || [ "$d" = "$dir" ]; then
+ continue
+ fi
+
while read symlink target; do
if [ "${target#/}" = "$target" ]; then
target="${symlink%/*}/$target"
fi
targetpath="$datadir"/$(normalize_path "$target")
if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then
- local d="${symfile%/.symlinks}"
echo "$name=$pkgver-r$pkgrel" \
>> "$d"/.symlinks-needs
fi
--
2.4.4
......@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.23.0
_ver=${pkgver%_git*}
pkgrel=1
pkgrel=2
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
......@@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan"
options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
0001-abuild-fix-circular-dependency-for-symlink-deps.patch
"
_builddir="$srcdir/$pkgname-$_ver"
......@@ -56,6 +57,9 @@ cpan() {
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
md5sums="864090a6016b3424d7b6bb31e84db3f0 abuild-2.23.0.tar.xz"
sha256sums="4cae7d7035955d23d1f29d4d0cd00ce225b300e6e809ff240101feea97aa7262 abuild-2.23.0.tar.xz"
sha512sums="50fc7649444079e5ba5552c2f4c57dedbdcd7b10727ed7b7bec8b4c85b37bbca1d76ab61bf3ab160520634e1742c3cd91fb294371bf653330ee0047337b6dfa9 abuild-2.23.0.tar.xz"
md5sums="864090a6016b3424d7b6bb31e84db3f0 abuild-2.23.0.tar.xz
c8ef8f4155d445842cc20379dbe01ded 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
sha256sums="4cae7d7035955d23d1f29d4d0cd00ce225b300e6e809ff240101feea97aa7262 abuild-2.23.0.tar.xz
2550d9d0dfeeb214aa0154b281a624f977d3b83ba678dc0f727f0c508996f26e 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
sha512sums="50fc7649444079e5ba5552c2f4c57dedbdcd7b10727ed7b7bec8b4c85b37bbca1d76ab61bf3ab160520634e1742c3cd91fb294371bf653330ee0047337b6dfa9 abuild-2.23.0.tar.xz
4c3d1d778b60de9f9e789501e52ab0f17ef5f2ea5cb05e33cc95d59b98130907bce5ed4c4808244b22f14c17b91682447599aded1579c904cee8cd269bda7c85 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment