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

Add an extra var to control patchfile location. This was a must after packing vim.

Browse Source 
Vim provides updates to major release through source patches, we don't want those in src/
since we didn't create them. With patchdir we can easily control where patches should be located.
Made clean() tell what it does.
This commit is contained in:
Tom G. Christensen 2003-07-10 09:07:10 +00:00
parent 8f8403eebb
commit 641026ae54
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buildpkg.functions
View File

@ -17,7 +17,7 @@
# A filename that begin with / will be treated as absolute paths # A filename that begin with / will be treated as absolute paths
# Note! only source[0] will be automatically unpacked # Note! only source[0] will be automatically unpacked
# patch[0..x] = patch filenames - if patch[0] is undefined then generic_prep won't attempt to patch the source # patch[0..x] = patch filenames - if patch[0] is undefined then generic_prep won't attempt to patch the source
# pr. default we expect these to be listed relative to $srcdir # pr. default we expect these to be listed relative to $patchdir (default $srcdir)
# filenames that begin with / will be treated as absolute paths # filenames that begin with / will be treated as absolute paths
# All patching will be done from *within* $srcdir/$topsrcdir directory with patch -p1 # All patching will be done from *within* $srcdir/$topsrcdir directory with patch -p1
# patches must be in uncompressed format # patches must be in uncompressed format
@ -45,6 +45,7 @@ SED=/usr/bin/sed
buildpkgbase=${HOME}/buildpkg buildpkgbase=${HOME}/buildpkg
stagedir=$buildpkgbase/$topdir/stage stagedir=$buildpkgbase/$topdir/stage
srcdir=$buildpkgbase/$topdir/src srcdir=$buildpkgbase/$topdir/src
patchdir=$srcdir # Allow the possibility of easily putting a load of patches in a different location
metadir=$buildpkgbase/$topdir/meta metadir=$buildpkgbase/$topdir/meta
distdir=$buildpkgbase/distfiles distdir=$buildpkgbase/distfiles
topsrcdir=$topdir-$version # it may be necessary to override this topsrcdir=$topdir-$version # it may be necessary to override this
@ -131,7 +132,6 @@ setdir()
fi fi
} }
#
# patch(): patch unpacked source # patch(): patch unpacked source
# params: $1 = patch number (arrayindex) $2 = patch params (defaults to -p1) # params: $1 = patch number (arrayindex) $2 = patch params (defaults to -p1)
# It will verify the existence of the patch file passed to it and # It will verify the existence of the patch file passed to it and
@ -148,7 +148,7 @@ patch()
if [ ! -z ${patch[$pnum]} ]; then # They didn't give us an empty string if [ ! -z ${patch[$pnum]} ]; then # They didn't give us an empty string
if [ "${patch[$pnum]:0:1}" != "/" ]; then # We have a relative pathname if [ "${patch[$pnum]:0:1}" != "/" ]; then # We have a relative pathname
# expand to absolute # expand to absolute
patch[$pnum]=$srcdir/${patch[$pnum]} patch[$pnum]=$patchdir/${patch[$pnum]}
fi # We are now sure that $patch[$pnum] contains file with absolute path fi # We are now sure that $patch[$pnum] contains file with absolute path
echo "Processing patch[$pnum] - ${patch[$pnum]}" echo "Processing patch[$pnum] - ${patch[$pnum]}"
if [ -r ${patch[$pnum]} ]; then # file is readable if [ -r ${patch[$pnum]} ]; then # file is readable
@ -206,20 +206,25 @@ clean()
{ {
case $1 in case $1 in
'source') if [ -d "$srcdir/$topsrcdir" ]; then 'source') if [ -d "$srcdir/$topsrcdir" ]; then
echo "Removing $srcdir/$topsrcdir"
$RM -rf $srcdir/$topsrcdir $RM -rf $srcdir/$topsrcdir
else else
echo "No unpacked source to scrub" echo "No unpacked source to scrub"
fi fi
;; ;;
'stage') if [ -d $stagedir -a "$stagedir" != "/" ]; then 'stage') if [ -d $stagedir -a "$stagedir" != "/" ]; then
echo "Emptying $stagedir"
$RM -rf $stagedir # This is very dangerous! $RM -rf $stagedir # This is very dangerous!
$MKDIR $stagedir $MKDIR $stagedir
else else
error $E_BAD_DIR clean error $E_BAD_DIR clean
fi fi
;; ;;
'meta') $RM -f $metadir/prototype* 'meta') echo "Removing $metadir/prototype*"
$RM -f $metadir/prototype*
echo "Removing $metadir/pkginfo"
$RM -f $metadir/pkginfo $RM -f $metadir/pkginfo
echo "Removing $buildpkgbase/$topdir/$pkgname"
$RM -rf $buildpkgbase/$topdir/$pkgname $RM -rf $buildpkgbase/$topdir/$pkgname
;; ;;