Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

topinstalldir is a global so adding / to it on every invocation of

Browse Source 
add_files was not very bright :(
Permission in distfiles should be 0644 as everywhere else.
This commit is contained in:
Tom G. Christensen 2004-10-10 11:03:15 +00:00
parent 36e25bc278
commit 2bde37eb9c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildpkg.packaging.irix
View File

@ -201,8 +201,9 @@ add_files()
local owner=$4 local owner=$4
local group=$5 local group=$5
local specattr=$6 local specattr=$6
local slash=''
[ ! "$topinstalldir" == "/" ] && topinstalldir="${topinstalldir}/" [ ! "$topinstalldir" == "/" ] && slash='/' #="${topinstalldir}/"
local FILES=$($FIND $fspec -type f -print|$TEE -a $metadir/files.tmp) local FILES=$($FIND $fspec -type f -print|$TEE -a $metadir/files.tmp)
OIFS=$IFS # We play IFS tricks so we can handle filenames with embedded spaces OIFS=$IFS # We play IFS tricks so we can handle filenames with embedded spaces
@ -220,12 +221,12 @@ add_files()
doop=$(check_ops "$i") doop=$(check_ops "$i")
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
if [ ! -z "$specattr" ]; then if [ ! -z "$specattr" ]; then
echo "f $perm $owner $group ${topinstalldir:1}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile
else else
if [ ! -z "$doop" ]; then if [ ! -z "$doop" ]; then
echo "f $perm $owner $group ${topinstalldir:1}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile
else else
echo "f $perm $owner $group ${topinstalldir:1}$fname $i ${pkgname}.${prodcat}" >>$idbfile echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile
fi fi
fi fi
@ -248,7 +249,7 @@ add_files()
local temp=`$LS -l "$i"|$CUT -d '>' -f 2` local temp=`$LS -l "$i"|$CUT -d '>' -f 2`
local symval=${temp# } local symval=${temp# }
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
echo "l $perm $owner $group ${topinstalldir:1}$fname $i ${pkgname}.${prodcat} symval($symval)" >>$idbfile echo "l $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} symval($symval)" >>$idbfile
done done
IFS=$OIFS IFS=$OIFS
} }
@ -460,8 +461,8 @@ create_idb()
# add_files "dist" opt.dist - root sys "" # add_files "dist" opt.dist - root sys ""
pc[$pcpos]="opt.dist" pc[$pcpos]="opt.dist"
# Add entries for the spec & idb files (opt.dist), they will be installed later, after they've actually been created # Add entries for the spec & idb files (opt.dist), they will be installed later, after they've actually been created
echo "f 644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.idb ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb ${pkgname}.opt.dist" >>$idbfile echo "f 0644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.idb ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb ${pkgname}.opt.dist" >>$idbfile
echo "f 644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.spec ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec ${pkgname}.opt.dist" >>$idbfile echo "f 0644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.spec ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec ${pkgname}.opt.dist" >>$idbfile
echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb" >> $metadir/files.tmp echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb" >> $metadir/files.tmp
echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec" >> $metadir/files.tmp echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec" >> $metadir/files.tmp
# fi # fi