[pacman-dev] [PATCH] Portability fixes for makepkg
From: Jeremy Huntwork
On 04/05/12 11:49, jhuntwork@lightcubesolutions.com wrote:
From: Jeremy Huntwork
Update to last patch submitted to use a templated stat command instead of ls to collect inodes.
Allow makepkg to work correctly when used with find from busybox. The switches -empty, -samefile and -lname are not available. To replace -samefile, it is required to collect inode information and compare.
Signed-off-by: Jeremy Huntwork
---
ls -lR pkg/usr/share/man/
This patch failed on the first package I tested it on... ==> Finished making: gimp 2.8.0-1 (Tue May 8 18:03:05 EST 2012) pkg/usr/share/man/: total 8 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man1 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man5 pkg/usr/share/man/man1: total 12 lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp.1.gz -> usr/share/man/man1/gimp-2.8.1.gz -rw-r--r-- 1 allan allan 4531 May 8 18:02 gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 21 May 8 18:02 gimp-console.1.gz -> gimp-console-2.8.1.gz lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp-console-2.8.1.gz -> usr/share/man/man1/gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 17 May 8 18:02 gimptool.1.gz -> gimptool-2.0.1.gz -rw-r--r-- 1 allan allan 2098 May 8 18:02 gimptool-2.0.1.gz pkg/usr/share/man/man5: total 8 -rw-r--r-- 1 allan allan 7000 May 8 18:02 gimprc-2.8.5.gz lrwxrwxrwx 1 allan allan 34 May 8 18:02 gimprc.5.gz -> usr/share/man/man5/gimprc-2.8.5.gz This looks quite similar to the issue fixed in https://bugs.archlinux.org/task/18568 (which is the reason I picked this package to test with...) but I have not looked into it further to confirm. Allan
On 5/8/12 4:16 AM, Allan McRae wrote:
ls -lR pkg/usr/share/man/ pkg/usr/share/man/: total 8 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man1 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man5
pkg/usr/share/man/man1: total 12 lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp.1.gz -> usr/share/man/man1/gimp-2.8.1.gz -rw-r--r-- 1 allan allan 4531 May 8 18:02 gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 21 May 8 18:02 gimp-console.1.gz -> gimp-console-2.8.1.gz lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp-console-2.8.1.gz -> usr/share/man/man1/gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 17 May 8 18:02 gimptool.1.gz -> gimptool-2.0.1.gz -rw-r--r-- 1 allan allan 2098 May 8 18:02 gimptool-2.0.1.gz
pkg/usr/share/man/man5: total 8 -rw-r--r-- 1 allan allan 7000 May 8 18:02 gimprc-2.8.5.gz lrwxrwxrwx 1 allan allan 34 May 8 18:02 gimprc.5.gz -> usr/share/man/man5/gimprc-2.8.5.gz
Sorry, but the failure here isn't obvious to me. Is it that gimp-console-2.8.1.gz is symlinked to gimp-2.8.1.gz? What does the directory structure look like before compression? JH
On Tue, May 8, 2012 at 9:53 AM, Jeremy Huntwork
On 5/8/12 4:16 AM, Allan McRae wrote:
ls -lR pkg/usr/share/man/
pkg/usr/share/man/: total 8 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man1 drwxr-xr-x 2 allan allan 4096 May 8 18:02 man5
pkg/usr/share/man/man1: total 12 lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp.1.gz -> usr/share/man/man1/gimp-2.8.1.gz -rw-r--r-- 1 allan allan 4531 May 8 18:02 gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 21 May 8 18:02 gimp-console.1.gz -> gimp-console-2.8.1.gz lrwxrwxrwx 1 allan allan 32 May 8 18:02 gimp-console-2.8.1.gz -> usr/share/man/man1/gimp-2.8.1.gz lrwxrwxrwx 1 allan allan 17 May 8 18:02 gimptool.1.gz -> gimptool-2.0.1.gz -rw-r--r-- 1 allan allan 2098 May 8 18:02 gimptool-2.0.1.gz
pkg/usr/share/man/man5: total 8 -rw-r--r-- 1 allan allan 7000 May 8 18:02 gimprc-2.8.5.gz lrwxrwxrwx 1 allan allan 34 May 8 18:02 gimprc.5.gz -> usr/share/man/man5/gimprc-2.8.5.gz
Sorry, but the failure here isn't obvious to me. Is it that gimp-console-2.8.1.gz is symlinked to gimp-2.8.1.gz?
What does the directory structure look like before compression?
It looks to me like it is symlinked to a relative path that makes no sense; e.g., will be resolved like this: /usr/share/man/man1/gimp-console-2.8.1.gz -> /usr/share/man/man1/usr/share/man/man1/gimp-2.8.1.gz -Dan
On 5/8/12 10:57 AM, Dan McGee wrote:
It looks to me like it is symlinked to a relative path that makes no sense; e.g., will be resolved like this: /usr/share/man/man1/gimp-console-2.8.1.gz -> /usr/share/man/man1/usr/share/man/man1/gimp-2.8.1.gz
Ah, thanks - I'll dig in a bit. JH
participants (4)
-
Allan McRae
-
Dan McGee
-
Jeremy Huntwork
-
jhuntwork@lightcubesolutions.com