Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Fri, 4 Nov 2016 22:05:47 +0200
From: Timo Teras <timo.teras@iki.fi>
To: Laurent Bercot <ska-devel@skarnet.org>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH 9/9] main/s6-linux-init: allow patching,
 fix broken deps, add doc subpackage
Message-ID: <20161104220547.3598c6b2@vostro>
In-Reply-To: <20161104181641.23056-9-ska-devel@skarnet.org>
References: <20161104181641.23056-1-ska-devel@skarnet.org>
	<20161104181641.23056-9-ska-devel@skarnet.org>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Fri,  4 Nov 2016 19:16:41 +0100
Laurent Bercot <ska-devel@skarnet.org> wrote:

> ---
>  main/s6-linux-init/APKBUILD | 29 ++++++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
> 
> diff --git a/main/s6-linux-init/APKBUILD b/main/s6-linux-init/APKBUILD
> index 46c893f..1be58e9 100644
> --- a/main/s6-linux-init/APKBUILD
> +++ b/main/s6-linux-init/APKBUILD
> @@ -2,21 +2,30 @@
>  # Contributor: Laurent Bercot <ska-devel@skarnet.org>
>  pkgname=s6-linux-init
>  pkgver=0.2.0.0
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="A set of tools to create and run an s6-based init system."
>  url="http://skarnet.org/software/$pkgname/"
>  arch="all"
>  license="ISC"
>  depends="skalibs"
> -depends_dev="skalibs-dev"
> -makedepends="$depends_dev"
> +makedepends="skalibs-dev"
>  install=""
> -subpackages="$pkgname-dev"
> +subpackages="$pkgname-doc"
>  source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
>  
> -builddir="$srcdir/$pkgname-$pkgver"
> +_builddir="$srcdir/$pkgname-$pkgver"

'builddir' is now used by abuild, and default_prepare will apply all
patches needed. So explicit prepare is not needed unless it does
something in addition to patching.

> +prepare() {
> +	local i
> +	cd "$_builddir"
> +	for i in $source; do
> +		case $i in
> +		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return
> 1;;
> +		esac
> +	done
> +}
> +
>  build() {
> -	cd "$builddir"
> +	cd "$_builddir"
>  	./configure \
>  		--enable-shared \
>  		--enable-static \
> @@ -28,10 +37,16 @@ build() {
>  }
>  
>  package() {
> -	cd "$builddir"
> +	cd "$_builddir"
>  	make DESTDIR="$pkgdir" install || return 1
>  }
>  
> +doc() {
> +	default_doc
> +	mkdir -p "$subpkgdir/usr/share/doc"
> +	cp -a "$_builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
> +}
> +
>  md5sums="24b9b232a5bcbb6be1c592ae1c23eb6d
> s6-linux-init-0.2.0.0.tar.gz"
> sha256sums="131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9
> s6-linux-init-0.2.0.0.tar.gz"
> sha512sums="16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e
> s6-linux-init-0.2.0.0.tar.gz"



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---