Adapt to git in func_install_blfs
This commit is contained in:
parent
f538085157
commit
dd5d63d102
1 changed files with 6 additions and 14 deletions
|
@ -21,11 +21,6 @@ if [ "$WRAP_INSTALL" = y ]; then
|
||||||
$PKGMNGTDIR/packInstall.sh > ${BUILDDIR}${BLFS_ROOT}/packInstall.sh
|
$PKGMNGTDIR/packInstall.sh > ${BUILDDIR}${BLFS_ROOT}/packInstall.sh
|
||||||
fi
|
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
|
# Set some harcoded envars to their proper values
|
||||||
sed -i s@tracking-dir@$TRACKING_DIR@ \
|
sed -i s@tracking-dir@$TRACKING_DIR@ \
|
||||||
${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh}
|
${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh}
|
||||||
|
@ -56,9 +51,9 @@ sudo make -j1 -C $BUILDDIR$BLFS_ROOT \
|
||||||
REV=$INITSYS \
|
REV=$INITSYS \
|
||||||
TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
|
TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
|
||||||
LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML \
|
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 \
|
BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \
|
||||||
SVN=$SVN_2/BLFS/$BLFS_TREE \
|
GIT=$GIT/blfs.git \
|
||||||
$BUILDDIR$BLFS_ROOT/packages.xml
|
$BUILDDIR$BLFS_ROOT/packages.xml
|
||||||
|
|
||||||
# But then $BUILDDIR/var/lib/ is owned by root if just created, which
|
# But then $BUILDDIR/var/lib/ is owned by root if just created, which
|
||||||
|
@ -108,17 +103,17 @@ if [ "$DEP_GPM" = y ]; then
|
||||||
else
|
else
|
||||||
LINE_GPM='#CONFIG_gpm is not set'
|
LINE_GPM='#CONFIG_gpm is not set'
|
||||||
fi
|
fi
|
||||||
if [ "$DEP_SVN" = y ]; then
|
if [ "$DEP_GIT" = y ]; then
|
||||||
LINE_SVN='CONFIG_subversion=y'
|
LINE_GIT='CONFIG_git=y'
|
||||||
else
|
else
|
||||||
LINE_SVN='#CONFIG_subversion is not set'
|
LINE_GIT='#CONFIG_git is not set'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat >$BUILDDIR$BLFS_ROOT/configuration <<EOF
|
cat >$BUILDDIR$BLFS_ROOT/configuration <<EOF
|
||||||
$LINE_LIBXML
|
$LINE_LIBXML
|
||||||
$LINE_LIBXSLT
|
$LINE_LIBXSLT
|
||||||
$LINE_WGET
|
$LINE_WGET
|
||||||
$LINE_SVN
|
$LINE_GIT
|
||||||
$LINE_GPM
|
$LINE_GPM
|
||||||
$LINE_LYNX
|
$LINE_LYNX
|
||||||
$LINE_SUDO
|
$LINE_SUDO
|
||||||
|
@ -192,9 +187,6 @@ fi
|
||||||
if [ "$DEP_SUDO" = y ]; then
|
if [ "$DEP_SUDO" = y ]; then
|
||||||
sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
|
sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
|
||||||
fi
|
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
|
# At last generates the build Makefile
|
||||||
mkdir -p $BUILDDIR$BLFS_ROOT/work
|
mkdir -p $BUILDDIR$BLFS_ROOT/work
|
||||||
pushd $BUILDDIR$BLFS_ROOT/work
|
pushd $BUILDDIR$BLFS_ROOT/work
|
||||||
|
|
Reference in a new issue