Changeset dd5d63d

Timestamp:

04/29/2021 09:40:46 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

de67016

Parents:

f538085

Message:

Adapt to git in func_install_blfs

File:

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

common/libs/func_install_blfs

@@ -22 +22 @@
 fi
 
-# Clean-up
-rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/xsl/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
-
 # Set some harcoded envars to their proper values
 sed -i s@tracking-dir@$TRACKING_DIR@ \
@@ -57 +52 @@
           TRACKING_DIR=$BUILDDIR$TRACKING_DIR    \
           LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML   \
-          LFS-SVN=$SVN_2/LFS/$TREE               \
+          LFS-GIT=$GIT/lfs.git                   \
           BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \
-          SVN=$SVN_2/BLFS/$BLFS_TREE             \
+          GIT=$GIT/blfs.git                      \
           $BUILDDIR$BLFS_ROOT/packages.xml
 
@@ -109 +104 @@
   LINE_GPM='#CONFIG_gpm is not set'
 fi
-if [ "$DEP_SVN" = y ]; then
-  LINE_SVN='CONFIG_subversion=y'
-else
-  LINE_SVN='#CONFIG_subversion is not set'
+if [ "$DEP_GIT" = y ]; then
+  LINE_GIT='CONFIG_git=y'
+else
+  LINE_GIT='#CONFIG_git is not set'
 fi
 
@@ -119 +114 @@
 $LINE_LIBXSLT
 $LINE_WGET
-$LINE_SVN
+$LINE_GIT
 $LINE_GPM
 $LINE_LYNX
@@ -192 +187 @@
 if [ "$DEP_SUDO" = y ]; then
   sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
-fi
-if [ "$DEP_SVN" = y ]; then
-  sed -i -e /javahl/d -e /swig/d $BUILDDIR$BLFS_ROOT/scripts/*subversion
 fi
 # At last generates the build Makefile