Add filesystem and iso-codes to stage2, binutils to stage3

1 files changed, 61 insertions, 0 deletions

diff --git a/macros.bashrc b/macros.bashrc
index 7e265c6..41a0fd8 100644
--- a/macros.bashrc
+++ b/macros.bashrc
@@ -21,7 +21,68 @@ notparallel()
     echo .NOTPARALLEL: >> Makefile
 }
 
+
+SRPMS=/SRPMS
+
 if [ -f $MYDIR/local.conf ]
 then
     . $MYDIR/local.conf
 fi
+
+rpmi()
+{
+    rf=
+    for r in $SRPMS/$1-*.src.rpm
+    do
+	case $r in
+	    $SRPMS/$1-*-*-*) ;;
+	    $SRPMS/$1-*-*.src.rpm) rf=$r ;;
+	esac
+    done
+    if [ x"$rf" = x"" ]
+    then
+	echo $1: src RPM not found
+	exit 1
+    fi
+    # HOME set by higher level script
+    (set -x; rpm -i $rf)
+}
+
+rpmb()
+{
+    cd $HOME/rpmbuild/SPECS
+    (set -x; rpmbuild --nodeps "$@".spec)
+}
+
+rpminst()
+{
+    cd $HOME/rpmbuild/RPMS
+
+    for i in "$@"
+    do
+	rf=
+	for r in */$i-*.rpm
+	do
+	    case $r in
+		*/$i-*-*-*) ;;
+		*/$i-*-*.rpm)
+		    rf=$r
+		    (set -x; rpm -i --nodeps $r)
+		    ;;
+	    esac
+	done
+	if [ x"$rf" = x"" ]
+	then
+	    echo $1: RPM not found
+	    exit 1
+	fi
+        # HOME set by higher level script
+    done
+}
+
+rpma()
+{
+    rpmi "$1"
+    rpmb -bb "$1"
+    rpminst "$1"
+}