_binary_payload w1.gzdio

[projects/cleanbuild.git] / cleanbuild

diff --git a/cleanbuild b/cleanbuild
index 38d37edfc1aa5fe483c3b3af2deaec21eef870ce..3502a742e3aef9647f0fb84abd7077083d787901 100755 (executable)
--- a/cleanbuild
+++ b/cleanbuild
@@ -43,6 +43,7 @@ usage() {
        echo " --cleanafter | -ca  - clean after build"
        echo " --forceumount | -fu - force umount tmpfs"
        echo " --debug             - enable debug"
+       echo " --network           - allow build to use networking"
        echo " -a, -b, -c, -d, -e  - select alternative chroot directory"
        exit 1
 }
@@ -51,6 +52,7 @@ FETCH=false
 CLEAN=false
 CREATE=false
 BUILD=false
+NETWORK=false
 INSTALL=false
 
 case "$0" in
@@ -125,6 +127,9 @@ while [ $# -gt 0 ]; do
                --debug)
                        NODEBUG=false
                        ;;
+               --network)
+                       NETWORK=true
+                       ;;
                --forceumount | -fu)
                        FORCE_UMOUNT=true
                        ;;
@@ -236,8 +241,12 @@ ignore \
        perl-Scalar-List-Utils \
        perl-ExtUtils-Install \
        phonon-backend-mplayer phonon-backend-vlc \
+       libgcj libgcj-devel \
        icedtea6-jre icedtea6-jdk \
-       java-sun-jre java5-sun-jre oracle-java7-jre \
+       icedtea7-jre icedtea7-jdk \
+       java-sun-jre java-sun-jdk \
+       java5-sun-jre java5-sun-jdk \
+       oracle-java7-jre oracle-java7-jdk \
        gnome-menus \
        gnome-speech-driver-festival gnome-speech-driver-speech-dispatcher
 
@@ -349,8 +358,10 @@ build_mount_home()
 {
        $NODEBUG || set -x
        mount -o bind $HOME/rpm $CHDIR/$CHHOME/rpm
-}
 
+       # ensure RPMS dir is available
+       chroot $CHDIR su $USER -c 'mkdir -p $(rpm -E %_rpmdir)'
+}
 
 print_installed()
 {
@@ -428,7 +439,7 @@ maybe_call()
        local func="$1"; shift
 
        [ $cond = "false" ] && return
-       $func "$@"
+       "$func" "$@"
        [ $cond = "exit_after" ] && exit
 }
 
@@ -469,6 +480,8 @@ echo $$ > $CHDIR/.pid
 
 maybe_call $INSTALL poldek_install "$*"
 
+maybe_call $NETWORK cp -bf /etc/resolv.conf $CHDIR/etc/
+
 $BUILD || exit
 
 if [ -p /tmp/fixfreq ]; then
@@ -478,8 +491,7 @@ fi
 while true; do
        info "Building $build_pkg in $CHNAME"
        rebuilddb
-       find $CHDIR/usr/lib{,64} -name "*.la" -print0 | \
-               xargs -0 -r sed -i -e "s@dependency_libs=.*@dependency_libs=' '@"
+       ./cleanup-la $CHDIR
        buildlog="buildlogs/$build_pkg"
        if [ -r $buildlog ]; then
                i=1
@@ -491,7 +503,7 @@ while true; do
        fi
        ./findunusedbr -c $CHDIR $HOME/rpm/packages/$build_pkg/$build_pkg.spec
        title "building"
-       ./teeboth $buildlog chroot $CHDIR su $USER -c "$CHHOME/rpm/packages/builder -nn -bb $build_pkg $builder_options"
+       ./teeboth $buildlog chroot $CHDIR su $USER -c "$CHHOME/rpm/packages/builder -nn --define '_enable_debug_packages 0' -bb $build_pkg $builder_options"
        ECODE=$?
 
        if grep -q "error: Failed build dependencies:" $buildlog; then