From 4874c9a00f1c711403162902290f0cb2c7e3c8df Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 6 Jul 2012 19:13:43 -0400 Subject: Add filesystem and iso-codes to stage2, binutils to stage3 --- macros.bashrc | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ recipe.d/filesystem | 10 +++++++++ recipe.d/iso-codes | 7 ++++++ stage3.d/binutils | 3 +++ 4 files changed, 81 insertions(+) create mode 100644 recipe.d/filesystem create mode 100644 recipe.d/iso-codes create mode 100644 stage3.d/binutils 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" +} diff --git a/recipe.d/filesystem b/recipe.d/filesystem new file mode 100644 index 0000000..57719cf --- /dev/null +++ b/recipe.d/filesystem @@ -0,0 +1,10 @@ +#requires rpm +#requires iso-codes + +cd $SRC/../SPECS +sed '/^%files/p; /^%pretrans/,/^%files/ d;' < filesystem.spec > filesystem-nolua.spec + +HOME=$SRC/../.. rpmbuild -bi --nodeps filesystem-nolua.spec + +cd ../BUILDROOT/filesystem-* +rsync -av ./ / diff --git a/recipe.d/iso-codes b/recipe.d/iso-codes new file mode 100644 index 0000000..fd26c92 --- /dev/null +++ b/recipe.d/iso-codes @@ -0,0 +1,7 @@ +#requires gettext + +mcd $BUILDDIR/iso-codes +$SRC/iso-codes-*/configure $TCONFIGARGS +notparallel +make $J +make $J install diff --git a/stage3.d/binutils b/stage3.d/binutils new file mode 100644 index 0000000..d8b6a1a --- /dev/null +++ b/stage3.d/binutils @@ -0,0 +1,3 @@ +rpmi binutils +rpmb -bb --without testsuite binutils +rpminst binutils binutils-devel -- cgit