diff options
Diffstat (limited to 'usr/src/tools/scripts/makebfu.sh')
| -rw-r--r-- | usr/src/tools/scripts/makebfu.sh | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/usr/src/tools/scripts/makebfu.sh b/usr/src/tools/scripts/makebfu.sh index 8ac08a7c52..10b88f4764 100644 --- a/usr/src/tools/scripts/makebfu.sh +++ b/usr/src/tools/scripts/makebfu.sh @@ -21,11 +21,9 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # Builds bfu archives. If no arguments, uses the environment variables # already set (by bldenv). One argument specifies an environment file @@ -92,32 +90,25 @@ fi export I_REALLY_WANT_TO_RUN_MKBFU=YES echo "Making ${archivetype}archives from $ROOT in $CPIODIR." -if [ "$o_FLAG" != "y" -a -n "$MACH" -a -n "$SRC" -a -d "$SRC/pkgdefs" ]; then - pkg=$SRC/pkgdefs - if [[ -d $SRC/../closed/pkgdefs && \ - "$CLOSED_IS_PRESENT" != no ]]; then - cpkg=$SRC/../closed/pkgdefs - else - cpkg="" +if [ "$o_FLAG" != "y" -a -n "$MACH" -a -n "$SRC" -a -d "$SRC/pkg" ]; then + cpioxlatecmd="cpiotranslate" + exc=$CODEMGR_WS/exception_lists + if [ -f $exc/packaging.cpiotranslate ]; then + cpioxlatecmd="$cpioxlatecmd -e $exc/packaging.cpiotranslate" fi - exc=etc/exception_list_$MACH - if [ "$X_FLAG" = "y" ]; then - ipkg=$IA32_IHV_WS/usr/src/pkgdefs - bpkgargs="-e $ipkg/$exc $ipkg" + if [ -f $exc/packaging ]; then + cpioxlatecmd="$cpioxlatecmd -e $exc/packaging" + fi + if [ "$CLOSED_IS_PRESENT" = "yes" ]; then + suffix=".closed" else - bpkgargs="" + suffix=".open" + fi + if [ -f $exc/packaging$suffix ]; then + cpioxlatecmd="$cpioxlatecmd -e $exc/packaging$suffix" fi - mkbfu -f "cpiotranslate -e $pkg/$exc $bpkgargs $pkg $cpkg" \ - $zflag $ROOT $CPIODIR + cpioxlatecmd="$cpioxlatecmd $SRC/pkg/proto_list_$MACH" + mkbfu -f "$cpioxlatecmd" $zflag $ROOT $CPIODIR else mkbfu $zflag $ROOT $CPIODIR fi - -if [ -n "$MACH" -a -n "$SRC" -a -d "$SRC/pkgdefs" ]; then - mkacr $SRC $MACH $CPIODIR -else - cat >&2 <<'EOF' -$SRC and $MACH need to be set to create a conflict resolution archive. -EOF -fi - |