diff options
| author | DJ Delorie <dj@delorie.com> | 2012-07-06 19:13:43 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2012-07-06 19:13:43 -0400 |
| commit | 4874c9a00f1c711403162902290f0cb2c7e3c8df (patch) | |
| tree | 4590e99526f769876332d45f4cb630c849b94082 | |
| parent | d6f1fbb05905909e0ed13b62c14173dcff8af9d2 (diff) | |
| download | bootstrap-4874c9a00f1c711403162902290f0cb2c7e3c8df.tar.gz bootstrap-4874c9a00f1c711403162902290f0cb2c7e3c8df.tar.xz bootstrap-4874c9a00f1c711403162902290f0cb2c7e3c8df.zip | |
Add filesystem and iso-codes to stage2, binutils to stage3
| -rw-r--r-- | macros.bashrc | 61 | ||||
| -rw-r--r-- | recipe.d/filesystem | 10 | ||||
| -rw-r--r-- | recipe.d/iso-codes | 7 | ||||
| -rw-r--r-- | stage3.d/binutils | 3 |
4 files changed, 81 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" +} 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 |