diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-12 07:10:57 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-12 07:11:27 +0000 |
commit | 4f9ab154eb561c78077811bbd7e9d65f133e3a16 (patch) | |
tree | 9efb6868b342151b6affe0789ef0d2fb39961f2e | |
parent | 7c32921c55fa9551a4f5619ec8fc02492e781a14 (diff) | |
download | alpine_aports-4f9ab154eb561c78077811bbd7e9d65f133e3a16.tar.bz2 alpine_aports-4f9ab154eb561c78077811bbd7e9d65f133e3a16.tar.xz alpine_aports-4f9ab154eb561c78077811bbd7e9d65f133e3a16.zip |
main/abuild: upgrade to 2.5
-rw-r--r-- | main/abuild/APKBUILD | 8 | ||||
-rw-r--r-- | main/abuild/abuild-conflict-message.patch | 30 | ||||
-rw-r--r-- | main/abuild/remove-mkalpine.patch | 65 |
3 files changed, 3 insertions, 100 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index d123e77540..f1d6b6cd8f 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD | |||
@@ -1,11 +1,10 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgdesc="Script to build Alpine Packages" | 2 | pkgdesc="Script to build Alpine Packages" |
3 | pkgname=abuild | 3 | pkgname=abuild |
4 | pkgver=2.4 | 4 | pkgver=2.5 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | url=http://git.alpinelinux.org/cgit/abuild/ | 6 | url=http://git.alpinelinux.org/cgit/abuild/ |
7 | source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 | 7 | source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 |
8 | remove-mkalpine.patch | ||
9 | " | 8 | " |
10 | depends="fakeroot file sudo pax-utils openssl apk-tools" | 9 | depends="fakeroot file sudo pax-utils openssl apk-tools" |
11 | makedepends="openssl-dev pkgconfig" | 10 | makedepends="openssl-dev pkgconfig" |
@@ -34,5 +33,4 @@ package() { | |||
34 | install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf | 33 | install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf |
35 | } | 34 | } |
36 | 35 | ||
37 | md5sums="84cde3b9c263b91b2381591a6342aaa6 abuild-2.4.tar.bz2 | 36 | md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2" |
38 | feea2c852e422e910613c5528b40c5d5 remove-mkalpine.patch" | ||
diff --git a/main/abuild/abuild-conflict-message.patch b/main/abuild/abuild-conflict-message.patch deleted file mode 100644 index b560634adb..0000000000 --- a/main/abuild/abuild-conflict-message.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | commit c30c346362223658980275d54d5b7911a3a7486c | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Wed Jun 30 14:59:07 2010 +0000 | ||
4 | |||
5 | abuild: detect and report conflicting dependencies properly | ||
6 | |||
7 | diff --git a/abuild.in b/abuild.in | ||
8 | index 0c94653..4034a86 100755 | ||
9 | --- a/abuild.in | ||
10 | +++ b/abuild.in | ||
11 | @@ -841,15 +841,16 @@ builddeps() { | ||
12 | # find which deps are missing | ||
13 | for i in $deps; do | ||
14 | if [ "${i#\!}" != "$i" ]; then | ||
15 | - list_has ${i#\!} $installed_deps \ | ||
16 | + $APK info -q -e "${i#\!}" \ | ||
17 | && conflicts="$conflicts ${i#\!}" | ||
18 | elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then | ||
19 | missing="$missing $i" | ||
20 | fi | ||
21 | done | ||
22 | - | ||
23 | + | ||
24 | if [ -n "$conflicts" ]; then | ||
25 | - die "Conflicting package(s) installed:$conflics" | ||
26 | + error "Conflicting package(s) installed:$conflicts" | ||
27 | + return 1 | ||
28 | fi | ||
29 | |||
30 | if [ -z "$install_deps" ] && [ -z "$recursive" ]; then | ||
diff --git a/main/abuild/remove-mkalpine.patch b/main/abuild/remove-mkalpine.patch deleted file mode 100644 index 867b0033b1..0000000000 --- a/main/abuild/remove-mkalpine.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | commit af22a92fa6f4e787ac6c4a22bedb65b66786427a | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue Jul 20 11:31:43 2010 +0000 | ||
4 | |||
5 | mkalpine: removed | ||
6 | |||
7 | diff --git a/Makefile b/Makefile | ||
8 | index 7f20208..da99953 100644 | ||
9 | --- a/Makefile | ||
10 | +++ b/Makefile | ||
11 | @@ -7,7 +7,7 @@ sysconfdir ?= /etc | ||
12 | datadir ?= $(prefix)/share/$(PACKAGE) | ||
13 | abuildrepo ?= ~/.cache/apks | ||
14 | |||
15 | -SCRIPTS := abuild devbuild mkalpine buildrepo abuild-keygen \ | ||
16 | +SCRIPTS := abuild devbuild buildrepo abuild-keygen \ | ||
17 | abuild-sign newapkbuild | ||
18 | USR_BIN_FILES := $(SCRIPTS) abuild-tar | ||
19 | SAMPLES := sample.APKBUILD sample.initd sample.confd \ | ||
20 | diff --git a/mkalpine.in b/mkalpine.in | ||
21 | deleted file mode 100755 | ||
22 | index e31980a..0000000 | ||
23 | --- a/mkalpine.in | ||
24 | +++ /dev/null | ||
25 | @@ -1,40 +0,0 @@ | ||
26 | -#!/bin/sh | ||
27 | - | ||
28 | -# check if what we need is here | ||
29 | -needed="cramfs syslinux cdrkit" | ||
30 | -for i in $needed; do | ||
31 | - if ! apk info -e $i; then | ||
32 | - missing="$missing $i" | ||
33 | - fi | ||
34 | -done | ||
35 | - | ||
36 | -# try install the missing parts | ||
37 | -if [ -n "$missing" ]; then | ||
38 | - if ! sudo apk add $missing; then | ||
39 | - echo "Need $missing to build alpine" >&2 | ||
40 | - exit 1 | ||
41 | - fi | ||
42 | -fi | ||
43 | - | ||
44 | -# first look for alpine.mk in current dir. Fallback to /usr/share/abuild | ||
45 | -mk=./alpine.mk | ||
46 | -if ! [ -f $mk ]; then | ||
47 | - mk=/usr/share/abuild/alpine.mk | ||
48 | -fi | ||
49 | - | ||
50 | -make -f "$mk" APK_BIN= $@ | ||
51 | -rc=$? | ||
52 | - | ||
53 | -# beep when done | ||
54 | -if [ $rc -eq 0 ]; then | ||
55 | - for i in $(seq 0 3); do | ||
56 | - echo -n -e "\007" | ||
57 | - sleep 0.2 | ||
58 | - done | ||
59 | -fi | ||
60 | - | ||
61 | -# uninstall the stuff we installed | ||
62 | -[ -n "$missing" ] && sudo apk del $missing | ||
63 | - | ||
64 | - | ||
65 | -exit $? | ||