OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   31-Oct-2003 17:29:38
  Branch: HEAD                             Handle: 2003103116293701

  Modified files:
    openpkg-src/openpkg     HISTORY aux.wrapbin.sh aux.wrapsrc.sh openpkg.boot

  Log:
    completely work-off aux.wrap{src,bin}.sh scripts

  Summary:
    Revision    Changes     Path
    1.85        +1  -0      openpkg-src/openpkg/HISTORY
    1.12        +120 -72    openpkg-src/openpkg/aux.wrapbin.sh
    1.11        +59 -52     openpkg-src/openpkg/aux.wrapsrc.sh
    1.39        +71 -4      openpkg-src/openpkg/openpkg.boot
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.84 -r1.85 HISTORY
  --- openpkg-src/openpkg/HISTORY       29 Oct 2003 16:33:49 -0000      1.84
  +++ openpkg-src/openpkg/HISTORY       31 Oct 2003 16:29:37 -0000      1.85
  @@ -2,6 +2,7 @@
   2003
   ====
   
  +20031031 work-off aux.wrap{src,bin}.sh scripts and internal documentation in README
   20031029 switch from uncompressed binary tarball to compressed tarball in tarball 
encapsulation
   20031029 switch from uuencoded to raw tarballs for source/binary .sh files (30% 
space reduction)
   20031028 remove problematic INCPATH stuff in RPM configure which picks up external 
stuff
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/aux.wrapbin.sh
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 aux.wrapbin.sh
  --- openpkg-src/openpkg/aux.wrapbin.sh        29 Oct 2003 16:33:49 -0000      1.11
  +++ openpkg-src/openpkg/aux.wrapbin.sh        31 Oct 2003 16:29:37 -0000      1.12
  @@ -1,6 +1,6 @@
   #!/bin/sh
   ##
  -##  Shell-based package for OpenPKG BINARY bootstrap installation
  +##  OpenPKG Binary Bootstrap Package (self-extracting shell script)
   ##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
   ##  Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
   ##  Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
  @@ -24,98 +24,105 @@
   ##  SUCH DAMAGE.
   ##
   
  -#   defaults
  -me="$0"
  -help=0
  -verbose=0
  -prefix='@l_prefix@'
  -susr='@SUSR@'
  -sgrp='@SGRP@'
  -musr='@MUSR@'
  -mgrp='@MGRP@'
  -rusr='@RUSR@'
  -rgrp='@RGRP@'
  -nusr='@NUSR@'
  -ngrp='@NGRP@'
  -suid='@SUID@'
  -sgid='@SGID@'
  -muid='@MUID@'
  -mgid='@MGID@'
  -ruid='@RUID@'
  -rgid='@RGID@'
  -nuid='@NUID@'
  -ngid='@NGID@'
  +#   configuration
  +l_me="$0"
  +o_help=no
  +o_version=no
  +l_prefix='@l_prefix@'
  +l_musr='@MUSR@'
  +l_mgrp='@MGRP@'
  +l_platform="@l_platform@"
  +l_release="@l_release@"
  +l_version="@l_version@"
   
   #   establish standard environment
   LC_CTYPE=C
   export LC_CTYPE
   umask 022
   
  -#   make sure all essential unpacking tools are available
  +#   parse command line options
  +for opt
  +do
  +    case $opt in
  +        -*=*) arg=`echo "$opt" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
  +           *) arg='' ;;
  +    esac
  +    case $opt in
  +        -h | --help    ) o_help=yes     ;;
  +        -v | --version ) o_version=yes  ;;
  +        --prefix=*     ) l_prefix=$arg  ;;
  +        *              ) o_help=yes     ;;
  +    esac
  +done
  +if [ ".$o_version" = .no -a ".$l_prefix" = . ]; then
  +    o_help=yes
  +fi
  +if [ ".$o_help" = .yes ]; then
  +    echo "Usage: sh $l_me [--prefix=<prefix>]" 2>&1
  +    echo "       [-h|--help] [-v|--version]" 2>&1
  +    exit 1
  +fi
  +
  +#   display version and copyright header
  +echo "OpenPKG ${l_release} Binary Bootstrap Package, version ${l_version}"
  +echo "Built for prefix ${l_prefix} on target platform ${l_platform}"
  +if [ ".$o_version" = .yes ]; then
  +    exit 0
  +fi
  +
  +#   make sure all essential installation tools are available
   for tool in sed mkdir dd tar chown chgrp; do
  -    found=0
  +    found=no
       case $tool in
           /* )
               if [ -f $tool ]; then
  -                found=1
  +                found=yes
               fi
               ;;
           * )
               for p in `IFS=:; echo $PATH`; do
                   if [ -f "$p/$tool" ]; then
  -                    found=1
  +                    found=yes
                       break
                   fi
               done
               ;;
       esac
  -    if [ $found -eq 0 ]; then
  -        echo "$me: unable to find tool \"$tool\"" 1>&2
  +    if [ ".$found" = .no ]; then
  +        echo "$l_me:ERROR: unable to find installation tool \"$tool\"" 1>&2
           exit 1
       fi
   done
   
  -#   parse command line options
  -for opt
  -do
  -    case $opt in
  -        -*=*) arg=`echo "$opt" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
  -           *) arg='' ;;
  -    esac
  -    case $opt in
  -        -h | --help    ) help=1      ;;
  -        -v | --verbose ) verbose=1   ;;
  -        --prefix=*     ) prefix=$arg ;;
  -        *              ) help=1      ;;
  -    esac
  -done
  -if [ ".$prefix" = . ]; then
  -    help=1
  -fi
  -if [ ".$help" = .1 ]; then
  -    echo "Usage: sh $me [-h|--help] [-v|--verbose] [--prefix=<prefix>]" 2>&1
  -    exit 1
  -fi
  -
   #   determine current username
   cusr=`(id -un) 2>/dev/null ||\
         (id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\
         (whoami) 2>/dev/null ||\
         (who am i | cut "-d " -f1) 2>/dev/null ||\
  -      echo $LOGNAME`
  +      echo ${LOGNAME-"NN"}`
   
  -#   the reason of the following magic you certainly don't want to understand ;)
  -echo "++ hooking into system environment"
  -set -- 1
  +#   running the embedded %pre script for hooking into the system environment
  +echo "++ hooking OpenPKG instance into system environment"
  +susr='@SUSR@'; sgrp='@SGRP@'
  +musr='@MUSR@'; mgrp='@MGRP@'
  +rusr='@RUSR@'; rgrp='@RGRP@'
  +nusr='@NUSR@'; ngrp='@NGRP@'
  +suid='@SUID@'; sgid='@SGID@'
  +muid='@MUID@'; mgid='@MGID@'
  +ruid='@RUID@'; rgid='@RGID@'
  +nuid='@NUID@'; ngid='@NGID@'
  +set -- 1 # emulate RPM's $1 when executing scripts
  +#   ---- BEGIN EMBEDDED %pre SCRIPT ----
   @PRE@
  +#   ---- END EMBEDDED %pre SCRIPT ----
   
   #   make sure prefix/root directory exists
   #   and has correct permissions and owner/group
  -if [ ! -d $prefix ]; then
  +if [ ! -d $l_prefix ]; then
       #   create prefix/root directory from scratch
  -    echo "++ creating OpenPKG instance root $prefix"
  +    echo "++ creating OpenPKG instance root directory \"$l_prefix\""
       d=''
  -    for c in `IFS=/; echo $prefix`; do
  +    for c in `IFS=/; echo $l_prefix`; do
           d="$d/$c"
           if [ ! -d $d ]; then
               mkdir $d || exit 1
  @@ -128,35 +135,76 @@
       done
   else
       #   adjust already existing prefix/root directory
  -    echo "++ fixating OpenPKG instance root $prefix"
  -    chmod 755 $prefix || exit 1
  -    if [ ".$cusr" = .root ]; then
  -        chown $musr $prefix >/dev/null 2>&1 || true
  -        chgrp $mgrp $prefix >/dev/null 2>&1 || true
  -    fi
  +    echo "++ fixating OpenPKG instance root directory \"$l_prefix\""
  +    ( cd $l_prefix || exit 1
  +      chmod 755 . || exit 1
  +      if [ ".$cusr" = .root ]; then
  +          chown $musr . >/dev/null 2>&1 || true
  +          chgrp $mgrp . >/dev/null 2>&1 || true
  +      fi
  +    ) || exit 1
   fi
   
   #   extract and install binary distribution files
  -echo "++ extracting binary distribution"
  -dd if=$me bs=8192 skip=8 2>/dev/null |\
  -    (cd $prefix; tar x${v}f - 2>/dev/null)
  -echo "++ installing binary distribution"
  -( cd $prefix || exit 1
  -  ./openpkg.bzip2 -d -c openpkg.tar.bz2 | ./openpkg.tar x${v}f - 2>/dev/null
  +echo "++ extracting OpenPKG binary distribution"
  +dd if=$l_me bs=8192 skip=8 2>/dev/null |\
  +    (cd $l_prefix; tar xf - 2>/dev/null)
  +echo "++ installing OpenPKG binary distribution"
  +( cd $l_prefix || exit 1
  +  ./openpkg.bzip2 -d -c openpkg.tar.bz2 | ./openpkg.tar xf - 2>/dev/null
     rm -f openpkg.tar openpkg.bzip2 openpkg.tar.bz2 >/dev/null 2>&1 || true
   ) || exit 1
   
   #   fixate installation files
  -echo "++ fixating OpenPKG installation files"
  +echo "++ fixating OpenPKG instance filesystem hierarchy"
   ( echo 'fixate () {'
     echo '    chmod "$1" "$4"'
     echo '    chown "$2" "$4"'
     echo '    chgrp "$3" "$4"'
     echo '}'
  -  $prefix/bin/rpm -qa \
  +  $l_prefix/bin/rpm -qa \
         --qf '[fixate %7.7{FILEMODES:octal} %{FILEUSERNAME:shescape} 
%{FILEGROUPNAME:shescape} ::%{FILENAMES:shescape}\n]' |\
  -      grep -v '(none)' | sed 's/^fixate .../fixate /' | sed -e "s; 
::\\(.\\)@l_prefix@; \\1$prefix;"
  +      grep -v '(none)' | sed 's/^fixate .../fixate /' | sed -e "s; 
::\\(.\\)@l_prefix@; \\1$l_prefix;"
   ) | sh 2>/dev/null || true
  +
  +#   display final information
  +( echo "Congratulations!"
  +  echo ""
  +  echo "You have successfully installed an OpenPKG ${l_release} instance"
  +  echo "under prefix ${l_prefix} on target platform ${l_platform}."
  +  echo ""
  +  echo "Details about this installed OpenPKG instance you can easily"
  +  echo "determine by running the following typical RPM query commands:"
  +  echo ""
  +  echo "    \$ ${l_prefix}/bin/rpm -qa"
  +  echo "    \$ ${l_prefix}/bin/rpm -qi  openpkg"
  +  echo "    \$ ${l_prefix}/bin/rpm -qlv openpkg"
  +  echo ""
  +  echo "The integrity of the whole OpenPKG instance you can check at any"
  +  echo "time by running the RPM verify command:"
  +  echo ""
  +  echo "    \$ ${l_prefix}/bin/rpm -Va"
  +  echo ""
  +  echo "For installing software packages into this OpenPKG instance, just run"
  +  echo "the following two RPM build commands for each package:"
  +  echo ""
  +  echo "    \$ ${l_prefix}/bin/rpm --rebuild /path/to/foo-*.src.rpm"
  +  echo "    \$ ${l_prefix}/bin/rpm -Uvh ${l_prefix}/RPM/PKG/foo-*.rpm"
  +  echo ""
  +  echo "If you later want to remove a software package, just run:"
  +  echo ""
  +  echo "    \$ ${l_prefix}/bin/rpm -e foo"
  +  echo ""
  +  echo "For removing the whole OpenPKG instance under prefix ${l_prefix},"
  +  echo "just remove every package. Once you finally removed the package"
  +  echo "\"openpkg\", the whole OpenPKG instance will be unlinked from the"
  +  echo "system and removed, too."
  +  echo ""
  +  echo "Thank you for flying OpenPKG..."
  +  echo "                                        Ralf S. Engelschall"
  +  echo "                                        The OpenPKG Project"
  +  echo "                                        [EMAIL PROTECTED]"
  +) | $l_prefix/lib/openpkg/rpmtool msg -b -t info
   
   #   die explicitly just before the shell would discover
   #   that we carry mega-bytes of data with us... ;-)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/aux.wrapsrc.sh
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 aux.wrapsrc.sh
  --- openpkg-src/openpkg/aux.wrapsrc.sh        29 Oct 2003 12:57:04 -0000      1.10
  +++ openpkg-src/openpkg/aux.wrapsrc.sh        31 Oct 2003 16:29:37 -0000      1.11
  @@ -1,6 +1,6 @@
   #!/bin/sh
   ##
  -##  Shell-based package for OpenPKG SOURCE bootstrap procedure
  +##  OpenPKG Source Bootstrap Package (self-extracting shell script)
   ##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
   ##  Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
   ##  Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
  @@ -24,66 +24,77 @@
   ##  SUCH DAMAGE.
   ##
   
  -#   program parameters
  -me="$0"
  -dir='@DIR@'
  +#   configuration
  +l_me="$0"
  +o_help=no
  +o_version=no
  +l_prefix=''
  +l_dir='@l_dir@'
  +l_release="@l_release@"
  +l_version="@l_version@"
   
   #   establish standard environment
   LC_CTYPE=C
   export LC_CTYPE
   umask 022
   
  +#   pre-parse command line options
  +for opt
  +do
  +    case $opt in
  +        -*=*) arg=`echo "$opt" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
  +           *) arg='' ;;
  +    esac
  +    case $opt in
  +        -h | --help     ) o_help=yes    ;;
  +        -v | --version  ) o_version=yes ;;
  +        --prefix=*      ) l_prefix=$arg ;;
  +    esac
  +done
  +if [ ".$o_version" = .no -a ".$l_prefix" = . ]; then
  +    o_help=yes
  +fi
  +if [ ".$o_help" = .yes ]; then
  +    echo "Usage: sh $l_me --prefix=<prefix>" 2>&1
  +    echo "       [--user=<usr>] [--group=<grp>]" 2>&1
  +    echo "       [--{s,m,r,n}usr=<usr>] [--{s,m,r,n}grp=<grp>]" 2>&1
  +    echo "       [--{s,m,r,n}uid=<uid>] [--{s,m,r,n}gid=<gid>]" 2>&1
  +    echo "       [-h|--help] [-v|--version]" 2>&1
  +    exit 1
  +fi
  +
  +#   display version and copyright header
  +echo "OpenPKG ${l_release} Source Bootstrap Package, version ${l_version}"
  +if [ ".$o_version" = .yes ]; then
  +    exit 0
  +fi
  +echo "Building for prefix ${l_prefix} on current platform"
  +
   #   make sure all essential unpacking tools are available
   #   (the build tools are checked later from within openpkg.spec)
   for tool in /bin/sh mkdir cat tar rm chown chgrp sed dd; do
  -    found=0
  +    found=no
       case $tool in
           /* )
               if [ -f $tool ]; then
  -                found=1
  +                found=yes
               fi
               ;;
           * )
               for p in `IFS=:; echo $PATH`; do
                   if [ -f "$p/$tool" ]; then
  -                    found=1
  +                    found=yes
                       break
                   fi
               done
               ;;
       esac
  -    if [ $found -eq 0 ]; then
  -        echo "$me: unable to find bootstrap tool \"$tool\"" 1>&2
  +    if [ ".$found" = .no ]; then
  +        echo "$l_me:ERROR: unable to find bootstrap tool \"$tool\"" 1>&2
           exit 1
       fi
   done
   
  -#   pre-parse command line options
  -help=0
  -prefix=''
  -for opt
  -do
  -    case $opt in
  -        -*=*) arg=`echo "$opt" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
  -           *) arg='' ;;
  -    esac
  -    case $opt in
  -        -h | --help          ) help=1      ;;
  -        --prefix=*           ) prefix=$arg ;;
  -    esac
  -done
  -if [ ".$prefix" = . ]; then
  -    help=1
  -fi
  -if [ ".$help" = .1 ]; then
  -    echo "Usage: sh $me" 2>&1
  -    echo "       --prefix=<prefix> [--user=<usr>] [--group=<grp>]" 2>&1
  -    echo "       [--{s,m,r,n}usr=<usr>] [--{s,m,r,n}grp=<grp>]" 2>&1
  -    echo "       [--{s,m,r,n}uid=<uid>] [--{s,m,r,n}gid=<gid>]" 2>&1
  -    echo "       [-h|--help] [-v|--verbose]" 2>&1
  -    exit 1
  -fi
  -
   #   determine current user/group
   cusr=`(id -un) 2>/dev/null ||\
         (id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\
  @@ -100,34 +111,30 @@
       cgrp="$cusr"
   fi
   
  -#   extract the tarball
  -echo "$me: extracting to $dir..."
  -rm -rf $dir >/dev/null 2>&1
  -mkdir $dir || exit 1
  -dd if=$me bs=8192 skip=8 2>/dev/null | (cd $dir; tar x${v}f - 2>/dev/null)
  +#   extract the source distribution files
  +echo "++ extracting OpenPKG source distribution"
  +rm -rf $l_dir >/dev/null 2>&1
  +mkdir $l_dir || exit 1
  +dd if=$l_me bs=8192 skip=8 2>/dev/null | (cd $l_dir; tar xf - 2>/dev/null)
   if [ ".$cusr" = .root ]; then
  -    ( cd $dir || exit 1
  +    ( cd $l_dir || exit 1
         chown -R -h $cusr . >/dev/null 2>&1 || true
         chgrp -R -h $cgrp . >/dev/null 2>&1 || true
       ) || exit 1
   fi
  -if [ ! -f $dir/openpkg.boot ]; then
  -    echo "$me: failed to unpack into directory \"$dir\"" 1>&2
  +if [ ! -f $l_dir/openpkg.boot ]; then
  +    echo "$l_me:ERROR: failed to unpack into directory \"$l_dir\"" 1>&2
       exit 1
   fi
  -echo "$me: extraction done."
   
   #   perform bootstrap procedure
  -echo "$me: building for $prefix..."
  -cd $dir || exit 1
  -/bin/sh ./openpkg.boot "$@" || exit 1
  -echo "$me: building done."
  +echo "++ building OpenPKG binary distribution"
  +( cd $l_dir || exit 1
  +  ./openpkg.boot ${1+"$@"} || exit 1
  +) || exit 1
   
   #   cleanup
  -echo "$me: cleaning up..."
  -cd ..
  -rm -rf $dir >/dev/null 2>&1
  -echo "$me: cleaned up."
  +rm -rf $l_dir >/dev/null 2>&1
   
   #   die explicitly just before the shell would discover
   #   that we carry mega-bytes of data with us...
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.boot
  ============================================================================
  $ cvs diff -u -r1.38 -r1.39 openpkg.boot
  --- openpkg-src/openpkg/openpkg.boot  29 Oct 2003 16:33:49 -0000      1.38
  +++ openpkg-src/openpkg/openpkg.boot  31 Oct 2003 16:29:38 -0000      1.39
  @@ -174,8 +174,23 @@
       ) >$tmpdir/.sh
       sh $tmpdir/.sh
       rm -f $tmpdir/.sh
  +    l_version="$release"
  +    case "${l_version}" in
  +        [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
  +            l_release="CURRENT"
  +            ;;
  +        * ) 
  +            l_release=`echo "${l_version}" |\
  +                sed -e 's;^;#;' \
  +                    -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
  +                    -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
  +                    -e 's;^#.*;UNKNOWN;'`
  +            ;;
  +    esac
       sed <$srcdir/aux.wrapsrc.sh >$tmpdir/openpkg.boot.tmp \
  -        -e "s;@DIR@;$name-$version-$release.src;"
  +        -e "s;@l_dir@;$name-$version-$release.src;" \
  +        -e "s;@l_release@;$l_release;" \
  +        -e "s;@l_version@;$l_version;"
       echo . | awk '{
           for (i = 0; i < 8192; i++) {
               printf("        ");
  @@ -444,6 +459,7 @@
       -e "s;@LOC@;$loc;" \
       -e "s;^\\(%l_root_install *\\)@l_prefix@;\\1 $prefix;" \
       -e "s;^\\(%l_root_rpm *\\)@l_prefix@;\\1 $RPM_BUILD_ROOT$prefix;" \
  +    -e "s;@l_prefix@;$RPM_BUILD_ROOT$prefix;" \
       -e "s;^\\(%_specdir *\\).*;\\1 `pwd`;" \
       -e "s;^\\(%_sourcedir *\\).*;\\1 $distdir;" \
       -e "s;^\\(%_builddir *\\).*;\\1 $tmpdir;" \
  @@ -507,7 +523,7 @@
   ##  permanent location.
   
   v="$version-$release"
  -t="`$tmpdir/rpm --eval '%{_target}'`-$loc"
  +t="`$tmpdir/rpm --eval '%{l_platform -p}'`-$loc"
   
   #   find a reasonable destination directory for packages
   if [ -d ../PKG/BIN ]; then
  @@ -559,6 +575,20 @@
       $RPM_BUILD_ROOT$prefix/openpkg.tar
   cp -p $RPM_BUILD_ROOT$prefix/lib/openpkg/bzip2 \
       $RPM_BUILD_ROOT$prefix/openpkg.bzip2
  +l_platform=`$tmpdir/rpm --eval '%{l_platform -p}'`
  +l_version=`$tmpdir/rpm -q --qf '%{version}' openpkg`
  +case "${l_version}" in
  +    [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
  +        l_release="CURRENT"
  +        ;;
  +    * ) 
  +        l_release=`echo "${l_version}" |\
  +            sed -e 's;^;#;' \
  +                -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
  +                -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
  +                -e 's;^#.*;UNKNOWN;'`
  +        ;;
  +esac
   cat $spec |\
       sed -e "/^%pre$/,/^%/ p" -e 'd' |\
       sed -e '/^%/d' -e 's/^   //' |\
  @@ -578,6 +608,9 @@
       -e "s;@RUID@;$ruid;" -e "s;@RGID@;$rgid;" \
       -e "s;@NUID@;$nuid;" -e "s;@NGID@;$ngid;" \
       -e "s;@l_prefix@;$prefix;" \
  +    -e "s;@l_platform@;$l_platform;" \
  +    -e "s;@l_release@;$l_release;" \
  +    -e "s;@l_version@;$l_version;" \
       -e "/[EMAIL PROTECTED]@/r $tmpdir/rpm.pre" |\
       sed -e '/[EMAIL PROTECTED]@/d' >$tmpdir/openpkg.boot.tmp
   echo . | awk '{
  @@ -596,13 +629,47 @@
   
   #   cleanup
   echo "++ cleaning up"
  +cp `SOURCE rpmtool` $tmpdir/rpmtool
   rm -rf $RPM_BUILD_ROOT
   rm -rf $tmpdir/$name-$version
   rm -f $tmpdir/rpm $tmpdir/rpm.[123] $tmpdir/.popt $tmpdir/rpm.pre
   rm -f $prolog
   
   #   final hint about results
  -set +x
  -echo "++ resulting files (placed into $dstdir):"
  +echo "++ resulting OpenPKG bootstrap package files:"
   (cd $dstdir; ls -l openpkg-$v.$t.sh openpkg-$v.$t.rpm openpkg-$v.src.rpm)
  +set +x
  +( echo "You have successfully built the OpenPKG bootstrap packages from scratch"
  +  echo "for prefix $prefix on target platform $l_platform. The input"
  +  echo "was the OpenPKG Source Bootstrap Package in file:"
  +  echo ""
  +  echo "    openpkg-$v.src.sh"
  +  echo ""
  +  echo "The results are the following three files:"
  +  echo ""
  +  echo "    openpkg-$v.src.rpm"
  +  echo "    openpkg-$v.$t.rpm"
  +  echo "    openpkg-$v.$t.sh"
  +  echo ""
  +  echo "The first result file is the OpenPKG Source Package, containing just"
  +  echo "the same contents than the OpenPKG Source Bootstrap Package, but now in"
  +  echo "RPM format. Optionally use this after the installation of the OpenPKG"
  +  echo "Binary Bootstrap Package if you want to rebuild from source again (but"
  +  echo "then with RPM available)."
  +  echo ""
  +  echo "The second result file is the OpenPKG Binary Package, containing the"
  +  echo "installation files in RPM format for the OpenPKG instance $prefix."
  +  echo "Optionally use this after the installation of the OpenPKG Binary"
  +  echo "Bootstrap Package if you want (usually for fixing something) to"
  +  echo "reinstall (but then with RPM available)."
  +  echo ""
  +  echo "The third result file is the OpenPKG Binary Bootstrap Package,"
  +  echo "containing the installation files as a self-extracting shell script for"
  +  echo "the OpenPKG instance $prefix. Use this in YOUR NEXT STEP to initially"
  +  echo "create the OpenPKG instance from scratch. Hence, proceed now by running"
  +  echo "the following command:"
  +  echo ""
  +  echo "    \$ sh openpkg-$v.$t.sh"
  +) | sh $tmpdir/rpmtool msg -b -t info
  +rm -f $tmpdir/rpmtool
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to