diff --git a/build.sh.generic b/build.sh.generic index 5e7d5c6..122e16e 100644 --- a/build.sh.generic +++ b/build.sh.generic @@ -15,7 +15,7 @@ source[0]=$topdir-$version.tar.gz patch[0]= # Source function library -. ${HOME}/buildpkg/scripts/buildpkg.functions +. ${BUILDPKG_BASE}/scripts/buildpkg.functions # Fill in pkginfo values if necessary # using pkgname,name,pkgcat,pkgvendor & pkgdesc diff --git a/buildpkg.functions b/buildpkg.functions index 6e5756d..538c3e1 100644 --- a/buildpkg.functions +++ b/buildpkg.functions @@ -2,7 +2,15 @@ # Global function library for buildpkg # # This file is designed to be sourced by pr. package buildscripts +# +# We rely on an environment variable called BUILDPKG_BASE to +# define the root of the buildpkg tree # +buildpkgbase=${BUILDPKG_BASE-'x'} +if [ "$buildpkgbase" == "x" ]; then + echo "You *Must* define BUILDPKG_BASE environment variable" + exit 1 +fi # Variables that *must* be overridden pr. package # They are used to construct paths and more so they @@ -44,7 +52,7 @@ LS=/usr/bin/ls EXPR=/usr/bin/expr # Define defaults -buildpkgbase=${HOME}/buildpkg +buildpkgbase=$BUILDPKG_BASE stagedir=$buildpkgbase/$topdir/stage srcdir=$buildpkgbase/$topdir/src patchdir=$srcdir # Allow the possibility of easily putting a load of patches in a different location diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix index 67502a8..bde5a90 100644 --- a/buildpkg.packaging.irix +++ b/buildpkg.packaging.irix @@ -24,7 +24,7 @@ declare -a pctop # Array of toplevel product categories (image) declare -a pdtop # Array of matching descriptions #override defaults -pkgprefix=sb_ +pkgprefix=tgc_ pkgname=$pkgprefix$topdir os=irix`$UNAME -r` diff --git a/subsys.conf b/subsys.conf index 46f4233..1b2b49b 100644 --- a/subsys.conf +++ b/subsys.conf @@ -1,4 +1,6 @@ bin sw.base keep root sys Base Software +sbin sw.base 0744 root sys Base Software +etc sw.base keep root sys Base Software libexec sw.base keep root sys Base Software mips-sgi-irix5.3 sw.base keep root sys Base Software mips-sgi-irix6.2 sw.base keep root sys Base Software @@ -8,3 +10,4 @@ info man.doc keep root sys Documentation man man.manpages keep root sys Manpages doc man.doc keep root sys Documentation share sw.base keep root sys Base Software +ssl sw.base keep root sys Base Software