Changeset 888 in MondoRescue

Timestamp:

Oct 10, 2006, 12:47:14 AM (18 years ago)

Author:

Bruno Cornec

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:

• mindi-busybox/distributions/mandriva/spec.m4 (modified) (1 diff)
• mindi-busybox/distributions/redhat/spec.m4 (modified) (1 diff)
• mindi-busybox/distributions/rpm/mindi-busybox.spec (modified) (1 diff)
• mindi-busybox/distributions/suse/spec.m4 (modified) (1 diff)
• mondo/mondo/common/libmondo-files.c (modified) (1 diff)
• tools/build2pkg (modified) (2 diffs)
• tools/build2qemu (modified) (1 diff)
• tools/qemu-vm.txt (modified) (1 diff)
• website/announces3.sql (modified) ( previous)

branches/stable/mindi-busybox/distributions/mandriva/spec.m4

@@ -5 +5 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Archiving/Backup')dnl
-dnl OBS is replaced with what is being obsoleted
-define(`OBS', `')dnl
+dnl REQ is replaced with what is being required
+define(`REQ', `Buildrequires: glibc-static-devel')dnl

branches/stable/mindi-busybox/distributions/redhat/spec.m4

@@ -5 +5 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Applications/Archiving')dnl
-dnl OBS is replaced with what is being obsoleted
-define(`OBS', )dnl
+dnl REQ is replaced with what is being required
+define(`REQ', )dnl

branches/stable/mindi-busybox/distributions/rpm/mindi-busybox.spec

@@ -11 +11 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+REQ
 ExcludeArch:    ppc
 Conflicts:  busybox

branches/stable/mindi-busybox/distributions/suse/spec.m4

@@ -5 +5 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Productivity/Archiving/Backup')dnl
-dnl OBS is replaced with what is being obsoleted
-define(`OBS', `')dnl
+dnl REQ is replaced with what is being required
+define(`REQ', `')dnl

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -1285 +1285 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
         sprintf(command,
-                "ifconfig %s | awk '{print $5}'", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
         sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev );
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
         strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
         log_to_screen("Replacing it with %s\n", nfs_dev);

branches/stable/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        #rm -f $pkg1
-
-        pkg="$pkg $pkg1"
 
         log=$MONDOTMP/$p-rpm.log
@@ -87 +83 @@
             status=-1
         else
+            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
             if [ -f /usr/bin/rpmlint ]; then
-                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+                /usr/bin/rpmlint $pkg1
             else
                 echo "No rpmlint found, please install it"
             fi
+            export pkg="$pkg `ls $pkg1 | grep -v src.rpm`"
         fi
         rm -rf ${TOPBUILDDIR}/BUILD/*

branches/stable/tools/build2qemu

@@ -61 +61 @@
     $TOOLHOME/file2ftp
 fi
-cd $TOOLHOME/..
-tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $TOPDIR/${VER}-$TAG
+
+# TOPDIR contains ../.. which causes problems to tar
+# so we need to recompute it
+cd $TOPDIR
+dir=`pwd`
+tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $dir/${VER}-$TAG
 
 for m in $VMS; do

branches/stable/tools/qemu-vm.txt

@@ -4 +4 @@
 
 # RPM based : urpmi, yum install, yast2
-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
+urpmi 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
 
 # gentoo