Changeset 839 in MondoRescue for trunk/tools

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

Location:

trunk/tools

Files:

• DISTROS (modified) (1 diff)
• build2pkg (modified) (1 diff)
• file2ftp (modified) (1 diff)
• mknewtag (modified) (1 diff)
• mknewversion (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• pkg2mdv (modified) (1 diff)
• svn2build (modified) (2 diffs)

trunk/tools/DISTROS

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

trunk/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

trunk/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

trunk/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

trunk/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

trunk/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

trunk/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

trunk/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
@@ -116 +116 @@
     fi
 
-    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
+    if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then