[pacman-dev] 3.1 release, pacman-git builds, etc.

Xavier shiningxc at gmail.com
Thu Aug 23 14:04:40 EDT 2007


On Wed, Aug 22, 2007 at 06:13:16AM +0100, Andrew Fyfe wrote:
> I've built quite a few packages with makepkg-3.1 and it appears to be 
> working ok :)
> 

I thought it worked since I first tried it on pacman-git PKGBUILD.
But it actually fails with most PKGBUILDs using source tarballs.


>From 223d5606cab31c8695b9516ba21434da5529dedf Mon Sep 17 00:00:00 2001
From: Chantry Xavier <shiningxc at gmail.com>
Date: Thu, 23 Aug 2007 20:00:41 +0200
Subject: [PATCH] makepkg : add -L (--dereference) to file.

makepkg didn't correctly detect the type of the archive
since it didn't dereference symlinks, and so failed
to extract the source tarball.

Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
---
 scripts/makepkg.sh.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index eb42cef..e9578b2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -611,7 +611,7 @@ extract_sources() {
 		fi
 
 		# fix flyspray #6246
-		local file_type=$(file -biz "$file")
+		local file_type=$(file -bizL "$file")
 		local cmd=''
 		case "$file_type" in
 			*application/x-tar*|*application/x-zip*|*application/x-cpio*)
-- 
1.5.2.5





More information about the pacman-dev mailing list