diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-05-20 02:12:19 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-05-20 02:12:19 -0500 |
| commit | 7f7f868269c2b7bac5771822e08fa58f8878668f (patch) | |
| tree | b3bc12553583aa0d983025b06541ea33442c057e | |
| parent | 6a9b6c9d44711b15ffa435b8cb9d8e16b4d4f2b8 (diff) | |
| download | packages-7f7f868269c2b7bac5771822e08fa58f8878668f.tar.gz packages-7f7f868269c2b7bac5771822e08fa58f8878668f.tar.bz2 packages-7f7f868269c2b7bac5771822e08fa58f8878668f.tar.xz packages-7f7f868269c2b7bac5771822e08fa58f8878668f.zip | |
system/abuild: ensure abuild runs on Adélie
| -rw-r--r-- | system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch | 31 | ||||
| -rw-r--r-- | system/abuild/APKBUILD | 6 |
2 files changed, 35 insertions, 2 deletions
diff --git a/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch b/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch new file mode 100644 index 000000000..d3bcb70ca --- /dev/null +++ b/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch @@ -0,0 +1,31 @@ +From 2a696e782445c020db606e92f49a7afb8b9bda1a Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sun, 20 May 2018 02:10:36 -0500 +Subject: [PATCH] abuild: continue faking POSIX support for now + +--- + abuild.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index bd32f4e..e3a35ca 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1,4 +1,4 @@ +-#!/bin/ash -e ++#!/bin/sh -e + + # abuild - build apk packages (light version of makepkg) + # Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org> +@@ -441,7 +441,7 @@ default_unpack() { + tar -C "$srcdir" -xf "$s" || return 1;; + *.tar.gz|*.tgz) + msg "Unpacking $s..." +- $gunzip -c "$s" | tar -C "$srcdir" -x || return 1;; ++ $gunzip -c "$s" | tar -C "$srcdir" -f - -x || return 1;; + *.tar.bz2) + msg "Unpacking $s..." + tar -C "$srcdir" -jxf "$s" || return 1;; +-- +2.15.0 + diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 5db264711..98e34f201 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild pkgver=3.2.0_rc1 -pkgrel=0 +pkgrel=1 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/aports" arch="all" @@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch options="suid !check" pkggroups="abuild" source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz + 0001-abuild-continue-faking-POSIX-support-for-now.patch " builddir="$srcdir/$pkgname-$pkgver+adelie" @@ -66,4 +67,5 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343cec4840fb61a5812eb4879e61c106adbdd286e63d9cfc4f8b66b6cad79557b abuild-3.2.0_rc1+adelie.tar.xz" +sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343cec4840fb61a5812eb4879e61c106adbdd286e63d9cfc4f8b66b6cad79557b abuild-3.2.0_rc1+adelie.tar.xz +b7aa7ff9858eee2ff20eeed3b8da60d40e608b4da2676acb9c8b16ca6639283e5d70884888efd505fcd239bb462f726203e4773a4f706b16d07742b2a8631b6c 0001-abuild-continue-faking-POSIX-support-for-now.patch" |