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

Merge trunk r3603, 3648, 3673, 3677

Browse source
This commit is contained in:
Pierre Labastie 2013-03-23 13:51:58 +00:00
parent c88b48d6f2
commit 0cc9d4e383
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -105,9 +105,6 @@ $Id$
- Give the user read and write privileges over the $TRACKING_DIR - Give the user read and write privileges over the $TRACKING_DIR
directory and the files that it contains. directory and the files that it contains.
- If you think that you may need the libxml2/libxslt Python modules,
remove the libxml2 and libxslt entries found in $TRACKING_FILE.
- Configure sudo, adding the needed privileges for the user. For - Configure sudo, adding the needed privileges for the user. For
newer sudo version, do not forget to add a line Defaults secure_path= newer sudo version, do not forget to add a line Defaults secure_path=
containing /sbin and /usr/sbin (in /etc/sudoers), otherwise some containing /sbin and /usr/sbin (in /etc/sudoers), otherwise some

2
common/common-functions
View file

@ -71,7 +71,7 @@ if [ "${CLEAN}" = "y" ]; then
if [ -d $BUILDDIR/sys ] ; then if [ -d $BUILDDIR/sys ] ; then
sudo rmdir $BUILDDIR/sys || exit 1 sudo rmdir $BUILDDIR/sys || exit 1
fi fi
sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt} sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var} sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
if [[ "${BLFS_TOOL}" = "y" ]] ; then if [[ "${BLFS_TOOL}" = "y" ]] ; then
sudo rm -rf $BUILDDIR/$BLFS_ROOT sudo rm -rf $BUILDDIR/$BLFS_ROOT

2
common/libs/func_check_version.sh
View file

@ -61,7 +61,7 @@ inline_doc
set -- $tst_version # Set positional parameters to test version values set -- $tst_version # Set positional parameters to test version values
# Values beginning with zero are taken as octal, so that for example # Values beginning with zero are taken as octal, so that for example
# 2.07.08 gives an error because 08 cannot be octal. The ## stuff supresses # 2.07.08 gives an error because 08 cannot be octal. The ## stuff supresses
# leading sero's # leading zero's
major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)} major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)}
# #
# Compare against minimum acceptable version.. # Compare against minimum acceptable version..

5
common/makefile-functions
View file

@ -33,9 +33,8 @@ endef
define echo_SU_request define echo_SU_request
@echo $(BOLD)-------------------------------------------------------------------------------- @echo $(BOLD)--------------------------------------------------------------------------------
@echo $(BLUE)$@ @echo $(BLUE)$@
@echo $(WHITE)ROOT privilege is required to perform a number commands @echo $(WHITE)ROOT privilege is required to perform a number of commands
@echo sudo will request a password to all high privilege cmds to execute correctly @echo sudo will request a password in order to execute all high privilege commands
endef
define echo_SULUSER_request define echo_SULUSER_request
@echo $(BOLD)-------------------------------------------------------------------------------- @echo $(BOLD)--------------------------------------------------------------------------------