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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   30-Sep-2005 13:34:07
  Branch: HEAD                             Handle: 2005093012340700

  Modified files:
    openpkg-tools/cmd       bf-mk.pl

  Log:
    the buildfarm "slave" command now accepts multiple targets (before
    this change it could only build everything or a single specified
    target)

  Summary:
    Revision    Changes     Path
    1.27        +20 -13     openpkg-tools/cmd/bf-mk.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/bf-mk.pl
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 bf-mk.pl
  --- openpkg-tools/cmd/bf-mk.pl        28 Apr 2005 11:42:19 -0000      1.26
  +++ openpkg-tools/cmd/bf-mk.pl        30 Sep 2005 11:34:07 -0000      1.27
  @@ -510,10 +510,10 @@
   
   cmd_oneshot ()
   {
  -    if [ ".$1" = . ]; then
  -        package="try-build-latest"
  +    if [ $# -eq 0 ]; then
  +        packages="try-build-latest"
       else
  -        package="build-$1"
  +        packages="$@"
       fi
   
       #   prepare SRPMs for SLAVE
  @@ -554,16 +554,23 @@
   
       #   SLAVE building packages
       %{driver.shtool} echo -e "%B++ [EMAIL PROTECTED]:%{shared.prefix}: SLAVE 
building packages%b"
  -    ( cd $target && %{driver.make} \
  -        LOG="%{shared.prefix}/log/$HOST-$ARCH-$OS" \
  -        SRC="%{shared.prefix}/src/$HOST-$ARCH-$OS" \
  -        DST="%{shared.prefix}/dst/$HOST-$ARCH-$OS" \
  -        TMP="%{slaves.ltmp}/$HOST-$ARCH-$OS" \
  -        EXEC_BFDB="%{slaves.bfdb}" \
  -        EXEC_ROOT="%{driver.sudo}" \
  -        EXEC_HOST="$HOST" \
  -        $package \
  -    )
  +    for package in $packages; do
  +        case $package in
  +            try-build-latest ) : ;;
  +            build-latest ) : ;;
  +            * ) package="build-$package" ;;
  +        esac
  +        ( cd $target && nice -20 /usr/opkg/bin/make \
  +            LOG="/v/openpkg/bf/log/$HOST-$ARCH-$OS" \
  +            SRC="/v/openpkg/bf/src/$HOST-$ARCH-$OS" \
  +            DST="/v/openpkg/bf/dst/$HOST-$ARCH-$OS" \
  +            TMP="/ltmp/openpkg-bf/$HOST-$ARCH-$OS" \
  +            EXEC_BFDB="/usr/opkg/bin/ssh [EMAIL PROTECTED] 
/v/rel/sw/bin/openpkg bf-db" \
  +            EXEC_ROOT="/usr/opkg/bin/sudo" \
  +            EXEC_HOST="$HOST" \
  +            $package \
  +        )
  +    done
   }
   
   cmd_support ()
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to