zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk r3990

Browse source
This commit is contained in:
Pierre Labastie 2017-08-09 14:06:53 +00:00
parent b99e56a0e9
commit caee4dff7c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
install-blfs-tools.sh
View file

@ -116,9 +116,11 @@ source $COMMON_DIR/libs/func_check_version.sh
[[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}" [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
case $BLFS_BRANCH_ID in case $BLFS_BRANCH_ID in
development ) BLFS_TREE=trunk/BOOK ;; development ) BLFS_TREE=trunk/BOOK ;;
branch-* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;; branch-6.* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
* ) BLFS_TREE=tags/${BLFS_BRANCH_ID} ;; branch-* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
6.2* | 7.* | 8.* ) BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
* ) BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
esac esac
# Check for build prerequisites. # Check for build prerequisites.

8
jhalfs
View file

@ -173,7 +173,7 @@ case $BRANCH_ID in
lfs ) lfs )
LFSVRS=${BRANCH_ID} LFSVRS=${BRANCH_ID}
TREE=branches/${BRANCH_ID#branch-} TREE=branches/${BRANCH_ID#branch-}
if [ ${BRANCH_ID#branch-} = 6 ]; then if [ ${BRANCH_ID:7:1} = 6 ]; then
TREE=${TREE}/BOOK TREE=${TREE}/BOOK
fi fi
;; ;;
@ -292,9 +292,9 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
*EDIT* ) echo " You forgot to set the BLFS branch or stable book version." *EDIT* ) echo " You forgot to set the BLFS branch or stable book version."
echo " Please rerun make and fix the configuration." echo " Please rerun make and fix the configuration."
exit 2 ;; exit 2 ;;
branch-systemd ) BLFS_TREE=branches/systemd ;; branch-6.* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
branch-* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;; branch-* ) BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
6.2* | 7.* ) BLFS_TREE=tags/${BLFS_BRANCH_ID} ;; 6.2* | 7.* | 8.*) BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
* ) BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;; * ) BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
esac esac
fi fi