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

Do not optimize binutils-pass1 in order to measure the SBU:

Browse source 
- introduce REALSBU variable if Config.in and jhalfs, and display it
- Adpat LFS/master.sh
This commit is contained in:
Pierre Labastie 2018-01-14 10:26:43 +00:00
parent d2a7ec8984
commit 84a3fda1c3
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Config.in
View file

@ -1211,6 +1211,15 @@ if !BOOK_CLFS2 && !BOOK_CLFS3
config OPT_3 config OPT_3
bool "Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS bool "Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS
endchoice endchoice
config REALSBU
bool "Build Binutls pass1 without optimization (Real SBU)"
depends on (BOOK_LFS || BOOK_LFS_SYSD) && OPT_2
default n
help
#-- Use -j1 in make invokation for Binutils pass1 to
# get a valid SBU value.
endmenu endmenu
config OPTIMIZE config OPTIMIZE
int int
@ -1219,6 +1228,7 @@ endmenu
default "2" if OPT_2 default "2" if OPT_2
default "3" if OPT_3 default "3" if OPT_3
endif endif
#--- End Optimizations #--- End Optimizations
#-- Internal Settings #-- Internal Settings

6
LFS/master.sh
View file

@ -131,7 +131,11 @@ chapter5_Makefiles() {
# "uncommented" by the user # "uncommented" by the user
LUSER_wrt_test_log "${this_script}" "$pkg_version" LUSER_wrt_test_log "${this_script}" "$pkg_version"
# If using optimizations, write the instructions # If using optimizations, write the instructions
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" case "${OPTIMIZE}${this_script}${REALSBU}" in
*binutils-pass1y) ;;
2*) wrt_optimize "$name" && wrt_makeflags "$name" ;;
*) ;;
esac
fi fi
# Insert date and disk usage at the top of the log file, the script run # Insert date and disk usage at the top of the log file, the script run

3
common/libs/func_validate_configs.sh
View file

@ -51,7 +51,7 @@ inline_doc
local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT CONSOLE_MAP UNICODE KEYMAP" local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT CONSOLE_MAP UNICODE KEYMAP"
# Full list of books settings # Full list of books settings
local -r lfs_PARAM_LIST="$LFS_book $GENERAL_common $LFS_build $LFS_system $ADVANCED_chroot $ADVANCED_common" local -r lfs_PARAM_LIST="$LFS_book $GENERAL_common $LFS_build $LFS_system $ADVANCED_chroot REALSBU $ADVANCED_common"
local -r hlfs_PARAM_LIST="$HLFS_book $GENERAL_common $HLFS_build $ADVANCED_chroot $ADVANCED_common" local -r hlfs_PARAM_LIST="$HLFS_book $GENERAL_common $HLFS_build $ADVANCED_chroot $ADVANCED_common"
local -r clfs_PARAM_LIST="$CLFS_book $GENERAL_common $CLFS_build $ADVANCED_chroot $ADVANCED_common" local -r clfs_PARAM_LIST="$CLFS_book $GENERAL_common $CLFS_build $ADVANCED_chroot $ADVANCED_common"
local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build $ADVANCED_common" local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build $ADVANCED_common"
@ -156,6 +156,7 @@ inline_doc
RETRYSRCDOWNLOAD) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;; RETRYSRCDOWNLOAD) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;; RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
DOWNLOADTIMEOUT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;; DOWNLOADTIMEOUT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
REALSBU) [[ "$OPTIMIZE" = "2" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
# Envars that requires some validation # Envars that requires some validation
LUSER) echo -e "`eval echo $PARAM_VALS`" LUSER) echo -e "`eval echo $PARAM_VALS`"

1
jhalfs
View file

@ -144,6 +144,7 @@ SET_WARNINGS=${SET_WARNINGS:=n}
SET_MISC=${SET_MISC:=n} SET_MISC=${SET_MISC:=n}
SET_BLOWFISH=${SET_BLOWFISH:=n} SET_BLOWFISH=${SET_BLOWFISH:=n}
UNICODE=${UNICODE:=n} UNICODE=${UNICODE:=n}
REALSBU=${REALSBU:=n}
if [[ "${NO_PROGRESS_BAR}" = "y" ]] ; then if [[ "${NO_PROGRESS_BAR}" = "y" ]] ; then
NO_PROGRESS="#" NO_PROGRESS="#"