X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 083D1DC0214 for ; Thu, 21 Jan 2016 07:23:47 +0000 (UTC) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 826E3DC017A for ; Thu, 21 Jan 2016 07:23:45 +0000 (UTC) Received: by mail-wm0-f43.google.com with SMTP id 123so161933838wmz.0 for ; Wed, 20 Jan 2016 23:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=DhLZXpDvuhYHz/s0QYR5S3zjya58A+hlIDIP3veIYEU=; b=VAr+pUaY8bCnnwnS7cZC9G3yvHUHLZS0esBTUb0zI1MG+imw9X0P2mgCylWdWcCus7 HRSXRwiuT8q7n/U5wBxrDYpeONJGsPnf/5e3ao2FGefazGsDtbi/52xt5JrWRELrGAXS a/F9PkZxVbUbc4Z4MffXgz656sClVVO3aOSDkDyWRPp+/4r+BCJ7mDILeFWxofxvqYHz BgL7/GvT4XYxEo4v/AIYrU7Hu3vHXDUWfjcKOQv56nzRAEGkAME8F5L1Gvri57pJvBTV OIJL3H3Z8dkFH4I7gCJn82oY+dFZrxOtBWWtAy15O53hOzQrnjZM0K5Tq/ngdyIF17uj FCig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=DhLZXpDvuhYHz/s0QYR5S3zjya58A+hlIDIP3veIYEU=; b=WMzhe+6Z47Ff+L01P1UBUOL5bpRI45jUbJI5GTP0udTZe4FGp58GsPYdPvDPPa1oks MkdRFv8djlpca8yv7INwdJNlB73461NDJRaQJJQ7fEb0m+/k88dAYNFWurPX7rCe18G/ d7RFIXePhIjPHpqj0CzbEZRp6IbBxwD0rQMZrj9RqUXJkuwR454ltTmI+YE2lhFgQwuC 2O12XTdBSOnoLhtxsweZRkfO9T5cpCRtaV/aeVogMWgKEhCsCssL/aWA5iNJr4MfB/S2 arhU5AtsqWrYT4xlWirW4Q0AyYwMzk3eT4Xpo2XtKWKy0GVlikiDkGnNZ9eZqJHaU51y QKuQ== X-Gm-Message-State: ALoCoQl6nrBSbEPlErqXTMKTlv3c0ifk7oKQRh2z8INH1D6A93TMqh2ibOCELxcdJWKbvHZ9k1Uxf7n1kjg1X4C3asW3RgSQ9A== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.194.156.199 with SMTP id wg7mr46973232wjb.114.1453361024470; Wed, 20 Jan 2016 23:23:44 -0800 (PST) Received: by 10.28.6.193 with HTTP; Wed, 20 Jan 2016 23:23:44 -0800 (PST) In-Reply-To: <20160121084008.19689e2c@vostro> References: <1453303190-30557-1-git-send-email-valery.kartel@gmail.com> <20160121084008.19689e2c@vostro> Date: Thu, 21 Jan 2016 09:23:44 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/file: libmagic library moved to separate subpackage. minor APKBUILD cleanups From: Valery Kartel To: Timo Teras Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=089e0122ebe69816b00529d2fbb1 X-Virus-Scanned: ClamAV using ClamSMTP --089e0122ebe69816b00529d2fbb1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I remove --build & --host because ./configure knows nothing about linux-musl system type. I just made a patch, which follows the previous, that fix it. 21 =D1=81=D1=96=D1=87. 2016 08:40 "Timo Teras" =D0=BF= =D0=B8=D1=88=D0=B5: > On Wed, 20 Jan 2016 17:19:50 +0200 > Valery Kartel wrote: > > > --- > > main/file/APKBUILD | 28 ++++++++++++---------------- > > 1 file changed, 12 insertions(+), 16 deletions(-) > > Looks mostly good. There's one comment inline that needs changing. > > Additionally, could you format the commit message so that the > first line of the commit message is a concise abbreviation, and > the explanation goes on lines 3+. > > So for example on this commit, just: > > main/file: split libmagic and cleanups > > ... would be sufficient. We usually don't use dots on the first line. > > The main reason is that 'git shortlog' will show only the first line, > and it should not be too long. 'git log' will show the full commit log > and e.g. cgit formats it so that the first line is in bold, the line 2 > is expected empty, and line 3+ is plain text. > > Thanks. > > > > diff --git a/main/file/APKBUILD b/main/file/APKBUILD > > index ceff2e6..6fdc2e5 100644 > > --- a/main/file/APKBUILD > > +++ b/main/file/APKBUILD > > @@ -1,32 +1,22 @@ > > +# Contributor: Valery Kartel > > # Maintainer: Natanael Copa > > pkgname=3Dfile > > pkgver=3D5.25 > > -pkgrel=3D0 > > +pkgrel=3D1 > > pkgdesc=3D"File type identification utility" > > url=3D"http://www.darwinsys.com/file/" > > arch=3D"all" > > license=3D"BSD" > > depends=3D"" > > -source=3D"ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz > > - " > > -subpackages=3D"$pkgname-dev $pkgname-doc" > > +source=3D"ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz" > > > > -_builddir=3D"$srcdir/$pkgname-$pkgver" > > -prepare() { > > - cd "$_builddir" > > - update_config_sub || return 1 > > - for i in $source; do > > - case $i in > > - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return > > 1;; > > - esac > > - done > > -} > > +subpackages=3D"$pkgname-dev $pkgname-doc libmagic" > > + > > +_builddir=3D"$srcdir"/$pkgname-$pkgver > > > > build() { > > cd "$_builddir" > > ./configure \ > > - --build=3D$CBUILD \ > > - --host=3D$CHOST \ > > Please don't remove --build and --host. They are needed for > bootstrapping new architectures. And if and when we want to support > cross-building. > > > --prefix=3D/usr \ > > --datadir=3D/usr/share \ > > || return 1 > > @@ -39,6 +29,12 @@ package() { > > make DESTDIR=3D"$pkgdir" install || return 1 > > } > > > > +libmagic() { > > + pkgdesc=3D"File type identification library" > > + mkdir -p "$subpkgdir"/usr > > + mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr > > +} > > + > > md5sums=3D"e6a972d4e10d9e76407a432f4a63cd4c file-5.25.tar.gz" > > > sha256sums=3D"3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b8= 90eca > > file-5.25.tar.gz" > > > sha512sums=3D"4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf92f= f619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402 > > file-5.25.tar.gz" > > --089e0122ebe69816b00529d2fbb1 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

I remove --build & --host because ./con= figure knows nothing about linux-musl system type.

I just made a patc= h, which fo= llows the previous, that fix it.
<= /p>

21 =D1=81=D1=96=D1=87. 2016 08:40 "Timo Ter= as" <timo.te= ras@iki.fi> =D0=BF=D0=B8=D1=88=D0=B5:
On Wed, 20 Jan 2016 17:19:50 +0= 200
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>=C2=A0 main/file/APKBUILD | 28 ++++++++++++----------------
>=C2=A0 1 file changed, 12 insertions(+), 16 deletions(-)

Looks mostly good. There's one comment inline that needs changing.

Additionally, could you format the commit message so that the
first line of the commit message is a concise abbreviation, and
the explanation goes on lines 3+.

So for example on this commit, just:

main/file: split libmagic and cleanups

... would be sufficient. We usually don't use dots on the first line.
The main reason is that 'git shortlog' will show only the first lin= e,
and it should not be too long. 'git log' will show the full commit = log
and e.g. cgit formats it so that the first line is in bold, the line 2
is expected empty, and line 3+ is plain text.

Thanks.


> diff --git a/main/file/APKBUILD b/main/file/APKBUILD
> index ceff2e6..6fdc2e5 100644
> --- a/main/file/APKBUILD
> +++ b/main/file/APKBUILD
> @@ -1,32 +1,22 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
>=C2=A0 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>=C2=A0 pkgname=3Dfile
>=C2=A0 pkgver=3D5.25
> -pkgrel=3D0
> +pkgrel=3D1
>=C2=A0 pkgdesc=3D"File type identification utility"
>=C2=A0 url=3D"http://www.darwinsys.com/file/"
>=C2=A0 arch=3D"all"
>=C2=A0 license=3D"BSD"
>=C2=A0 depends=3D""
> -source=3D"ftp://ftp.astron.com/pub/file/= file-$pkgver.tar.gz
> -=C2=A0 =C2=A0 =C2=A0"
> -subpackages=3D"$pkgname-dev $pkgname-doc"
> +source=3D"ftp://ftp.astron.com/pub/file/= file-$pkgver.tar.gz"
>
> -_builddir=3D"$srcdir/$pkgname-$pkgver"
> -prepare() {
> -=C2=A0 =C2=A0 =C2=A0cd "$_builddir"
> -=C2=A0 =C2=A0 =C2=A0update_config_sub || return 1
> -=C2=A0 =C2=A0 =C2=A0for i in $source; do
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case $i in
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*.patch) msg $i; patc= h -p1 -i "$srcdir"/$i || return
> 1;;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0esac
> -=C2=A0 =C2=A0 =C2=A0done
> -}
> +subpackages=3D"$pkgname-dev $pkgname-doc libmagic"
> +
> +_builddir=3D"$srcdir"/$pkgname-$pkgver
>
>=C2=A0 build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$_builddir"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0./configure \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--build=3D$CBUILD \ > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--host=3D$CHOST \

Please don't remove --build and --host. They are needed for
bootstrapping new architectures. And if and when we want to support
cross-building.

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--prefix=3D/usr = \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--datadir=3D/usr= /share \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|| return 1
> @@ -39,6 +29,12 @@ package() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0make DESTDIR=3D"$pkgdir" install |= | return 1
>=C2=A0 }
>
> +libmagic() {
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"File type identification library&= quot;
> +=C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr
> +=C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib "$pkgdir"= ;/usr/share "$subpkgdir"/usr
> +}
> +
>=C2=A0 md5sums=3D"e6a972d4e10d9e76407a432f4a63cd4c=C2=A0 file-5.25= .tar.gz"
>=C2=A0 sha256sums=3D"3735381563f69fb4239470b8c51b876a80425348b8285= a7cded8b61d6b890eca
> file-5.25.tar.gz"
> sha512sums=3D"4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146af= cbdcf92ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e134= 02
> file-5.25.tar.gz"

--089e0122ebe69816b00529d2fbb1-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---