Changeset 825 in MondoRescue

Timestamp:

Sep 24, 2006, 12:42:16 AM (18 years ago)

Author:

Bruno Cornec

Message:

• mindi-busybox added to build process scripts
• RPM spec file updated with realistic content
• mondo spec file adapted with fedora feedback (​https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187318)

Location:

branches/stable

Files:

• mindi-busybox/VERSION (added)
• mindi-busybox/distributions/rpm/mindi-busybox.spec (modified) (1 diff)
• mindi-kernel/VERSION (modified) (1 diff)
• mondo/distributions/rpm/mondo.spec (modified) (3 diffs)
• tools/DISTROS (modified) (1 diff)
• tools/build2pkg (modified) (1 diff)
• tools/file2ftp (modified) (1 diff)
• tools/mknewtag (modified) (1 diff)
• tools/mknewversion (modified) (1 diff)
• tools/pkg2ftp (modified) (1 diff)
• tools/pkg2mdv (modified) (1 diff)
• tools/svn2build (modified) (1 diff)

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

@@ -24 +24 @@
 
 %build
+%configure
+make busybox
 
 %install
 %{__rm}  -rf $RPM_BUILD_ROOT
-export DONT_RELINK=1
-export RPMBUILDMINDI="true"
-./install.sh
+
+DESTDIR=$RPM_BUILD_ROOT/usr/lib/mindi/rootfs/sbin
+mkdir -p $DESTDIR
+cp -a busybox $DESTDIR
 
 %clean

branches/stable/mindi-kernel/VERSION

@@ -1 @@
-stable
+2.6

branches/stable/mondo/distributions/rpm/mondo.spec

@@ -2 +2 @@
 # $Id$
 #
-
-%define addreq  mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -18 +16 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50, gcc
+BuildRequires:  newt-devel >= 0.50
+ExcludeArch:    ppc
 OBS
+Requires:   mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 %ifarch ia64
-Requires:   %{addreq}, elilo, parted
+Requires:   elilo, parted
 %else
-Requires:   %{addreq}, syslinux >= 1.52
+Requires:   syslinux >= 1.52
 %endif
 
@@ -58 +58 @@
 
 %build
-%configure --program-prefix=%{?_program_prefix}
-%{__make} VERSION=%{version}
+%configure
+make %{?_smp_mflags} VERSION=%{version}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean

branches/stable/tools/DISTROS

@@ -2 +2 @@
 mandrake_10.2
 mandriva_2006.0
+mandriva_2007.0
 redhat_7.3
 redhat_9

branches/stable/tools/build2pkg

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

branches/stable/tools/file2ftp

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

branches/stable/tools/mknewtag

@@ -37 +37 @@
     exit -1
 else
-    for p in mindi mondo; do
+    for p in mindi mondo mindi-busybox mindi-kernel; do
         v=`cat $TOOLHOME/../$p/VERSION`
         grep -q "${v}" $TOOLHOME/../$p/ChangeLog

branches/stable/tools/mknewversion

@@ -50 +50 @@
     cd ${VER}
     echo "$TAG" > tools/TAG
-    for p in mindi mondo mondo-doc mindi-kernel; do
+    for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
         v=${VER}
         if [ $p == "mindi" ]; then

branches/stable/tools/pkg2ftp

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

branches/stable/tools/pkg2mdv

@@ -31 +31 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

branches/stable/tools/svn2build

@@ -23 +23 @@
 
 if [ "$1" = "" ]; then
-        c="mondo-doc mindi mondo"
+        c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-            c="mindi-kernel mondo-doc mindi mondo"
+            c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1