Changeset b35ce44

Timestamp:

01/12/2013 07:58:34 AM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

f6ac406

Parents:

d33f161

Message:

change func_install_blfs:
-remove sqlite instructions using swig and tcl
-add sudo toa few command so that the directory can be cleaned more easily

File:

• common/libs/func_install_blfs (modified) (5 diffs)

common/libs/func_install_blfs

@@ -6 +6 @@
 install_blfs_tools() {       # the scriptlets to build
 #----------------------------# the dependency tools
+set -e
 # Install the files
 [[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && mkdir -pv ${BUILDDIR}${BLFS_ROOT}
@@ -112 +113 @@
 
 # Move the scriptlets where they should be
-rm -rf $BUILDDIR$BLFS_ROOT/scripts
+sudo rm -rf $BUILDDIR$BLFS_ROOT/scripts
 mv scripts $BUILDDIR$BLFS_ROOT
 
@@ -126 +127 @@
 # Downloads (or copy) to build_dir/sources
 pushd $BUILDDIR/sources
+# Remove `unpacked' files if some have been left
+sudo find . -name unpacked -exec rm \{\} \;
 FTP_SERVER=$SERVER/pub/blfs/ SRC_ARCHIVE=$SRC_ARCHIVE $BUILDDIR$BLFS_ROOT/download_script
 # The blfs-bootscripts package is at the wrong location
 mkdir -p blfs-bootscripts
-mv blfs-bootscripts*tar* blfs-bootscripts
+cp blfs-bootscripts*tar* blfs-bootscripts
 popd
 rm -v $BUILDDIR$BLFS_ROOT/download_script
@@ -142 +145 @@
 if [ "$DEP_SVN" = y ]; then
   sed -i -e /javahl/d -e /swig/d $BUILDDIR$BLFS_ROOT/scripts/*subversion
+  sed -i -e '/pushd/,/popd/d' -e /tea/d $BUILDDIR$BLFS_ROOT/scripts/*sqlite
 fi
 if [ "$DEP_PYTHON" = y ]; then
@@ -149 +153 @@
   sed -i 's/^make$/make -j1/' $BUILDDIR$BLFS_ROOT/scripts/*openssl
 fi
-
 # At last generates the build Makefile
 mkdir -p $BUILDDIR$BLFS_ROOT/work