diff options
Diffstat (limited to 'main/abuild')
| -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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.4 -pkgrel=1 +pkgver=2.5 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - remove-mkalpine.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -34,5 +33,4 @@ package() { install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="84cde3b9c263b91b2381591a6342aaa6 abuild-2.4.tar.bz2 -feea2c852e422e910613c5528b40c5d5 remove-mkalpine.patch" +md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2" 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 @@ -commit c30c346362223658980275d54d5b7911a3a7486c -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed Jun 30 14:59:07 2010 +0000 - - abuild: detect and report conflicting dependencies properly - -diff --git a/abuild.in b/abuild.in -index 0c94653..4034a86 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -841,15 +841,16 @@ builddeps() { - # find which deps are missing - for i in $deps; do - if [ "${i#\!}" != "$i" ]; then -- list_has ${i#\!} $installed_deps \ -+ $APK info -q -e "${i#\!}" \ - && conflicts="$conflicts ${i#\!}" - elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then - missing="$missing $i" - fi - done -- -+ - if [ -n "$conflicts" ]; then -- die "Conflicting package(s) installed:$conflics" -+ error "Conflicting package(s) installed:$conflicts" -+ return 1 - fi - - 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 @@ -commit af22a92fa6f4e787ac6c4a22bedb65b66786427a -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue Jul 20 11:31:43 2010 +0000 - - mkalpine: removed - -diff --git a/Makefile b/Makefile -index 7f20208..da99953 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,7 @@ sysconfdir ?= /etc - datadir ?= $(prefix)/share/$(PACKAGE) - abuildrepo ?= ~/.cache/apks - --SCRIPTS := abuild devbuild mkalpine buildrepo abuild-keygen \ -+SCRIPTS := abuild devbuild buildrepo abuild-keygen \ - abuild-sign newapkbuild - USR_BIN_FILES := $(SCRIPTS) abuild-tar - SAMPLES := sample.APKBUILD sample.initd sample.confd \ -diff --git a/mkalpine.in b/mkalpine.in -deleted file mode 100755 -index e31980a..0000000 ---- a/mkalpine.in -+++ /dev/null -@@ -1,40 +0,0 @@ --#!/bin/sh -- --# check if what we need is here --needed="cramfs syslinux cdrkit" --for i in $needed; do -- if ! apk info -e $i; then -- missing="$missing $i" -- fi --done -- --# try install the missing parts --if [ -n "$missing" ]; then -- if ! sudo apk add $missing; then -- echo "Need $missing to build alpine" >&2 -- exit 1 -- fi --fi -- --# first look for alpine.mk in current dir. Fallback to /usr/share/abuild --mk=./alpine.mk --if ! [ -f $mk ]; then -- mk=/usr/share/abuild/alpine.mk --fi -- --make -f "$mk" APK_BIN= $@ --rc=$? -- --# beep when done --if [ $rc -eq 0 ]; then -- for i in $(seq 0 3); do -- echo -n -e "\007" -- sleep 0.2 -- done --fi -- --# uninstall the stuff we installed --[ -n "$missing" ] && sudo apk del $missing -- -- --exit $? |