Changeset 888


Ignore:
Timestamp:
Oct 10, 2006, 12:47:14 AM (12 years ago)
Author:
bruno
Message:
  • Build process improved following 2.2.0 delivery
  • Announce of 2.2.0
  • On mandriva we need a BuildRequire? on glibc-static-devel for mindi-busybox
  • Fix again a remaining bug on #25 (Thanks Michael Shapiro again !)
Location:
branches/stable
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/distributions/mandriva/spec.m4

    r833 r888  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Archiving/Backup')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', `')dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', `Buildrequires: glibc-static-devel')dnl
  • branches/stable/mindi-busybox/distributions/redhat/spec.m4

    r833 r888  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Applications/Archiving')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', )dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', )dnl
  • branches/stable/mindi-busybox/distributions/rpm/mindi-busybox.spec

    r845 r888  
    1111Source:     SSS
    1212BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
     13REQ
    1314ExcludeArch:    ppc
    1415Conflicts:  busybox
  • branches/stable/mindi-busybox/distributions/suse/spec.m4

    r833 r888  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Productivity/Archiving/Backup')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', `')dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', `')dnl
  • branches/stable/mondo/mondo/common/libmondo-files.c

    r879 r888  
    12851285        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
    12861286        sprintf(command,
    1287                 "ifconfig %s | awk '{print $5}'", nfs_dev);
     1287                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
    12881288        strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
    12891289        sprintf(command,
    1290                 "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev );
     1290                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
    12911291        strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
    12921292        log_to_screen("Replacing it with %s\n", nfs_dev);
  • branches/stable/tools/build2pkg

    r882 r888  
    6363            ar=$ARCH
    6464        fi
    65         pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
    66         #rm -f $pkg1
    67 
    68         pkg="$pkg $pkg1"
    6965
    7066        log=$MONDOTMP/$p-rpm.log
     
    8783            status=-1
    8884        else
     85            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
    8986            if [ -f /usr/bin/rpmlint ]; then
    90                 /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
     87                /usr/bin/rpmlint $pkg1
    9188            else
    9289                echo "No rpmlint found, please install it"
    9390            fi
     91            export pkg="$pkg `ls $pkg1 | grep -v src.rpm`"
    9492        fi
    9593        rm -rf ${TOPBUILDDIR}/BUILD/*
  • branches/stable/tools/build2qemu

    r882 r888  
    6161    $TOOLHOME/file2ftp
    6262fi
    63 cd $TOOLHOME/..
    64 tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $TOPDIR/${VER}-$TAG
     63
     64# TOPDIR contains ../.. which causes problems to tar
     65# so we need to recompute it
     66cd $TOPDIR
     67dir=`pwd`
     68tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $dir/${VER}-$TAG
    6569
    6670for m in $VMS; do
  • branches/stable/tools/qemu-vm.txt

    r753 r888  
    44
    55# RPM based : urpmi, yum install, yast2
    6 urpmi neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
     6urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
    77
    88# gentoo
Note: See TracChangeset for help on using the changeset viewer.