projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Création de l'usager régulier seulement à la fin du stage 5.
[hvlinux.git]
/
functions
/
main
diff --git
a/functions/main
b/functions/main
index
499dccc
..
ec0e911
100644
(file)
--- a/
functions/main
+++ b/
functions/main
@@
-75,8
+75,6
@@
TAR_OPTS="-b8"
# List of default archive extensions to try
DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z tar.xz zip"
# List of default archive extensions to try
DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z tar.xz zip"
-HV_FONTS_PATH="/usr/share/fonts"
-
DEFAULT_IPKG_SCRIPT="ipkg.def"
HVMAKE="make -j ${MAKEJOBS}"
DEFAULT_IPKG_SCRIPT="ipkg.def"
HVMAKE="make -j ${MAKEJOBS}"
@@
-755,7
+753,7
@@
ipkg_display_build_infos()
echo " BUILD64: ${BUILD64}"
echo " CFLAGS: ${CFLAGS}"
echo " CPPFLAGS: ${CPPFLAGS}"
echo " BUILD64: ${BUILD64}"
echo " CFLAGS: ${CFLAGS}"
echo " CPPFLAGS: ${CPPFLAGS}"
- echo " CXXFLAGS: ${CFLAGS}"
+ echo " CXXFLAGS: ${C
XX
FLAGS}"
echo " LDFLAGS: ${LDFLAGS}"
echo " RANLIB: ${RANLIB}"
echo " CC: ${CC}"
echo " LDFLAGS: ${LDFLAGS}"
echo " RANLIB: ${RANLIB}"
echo " CC: ${CC}"
@@
-798,6
+796,7
@@
indicate_pkg_build_complete()
# Arg. #1: Package name and version (ex: gcc-4.5.1)
# Remaining arguments: Additional configure options
# Options:
# Arg. #1: Package name and version (ex: gcc-4.5.1)
# Remaining arguments: Additional configure options
# Options:
+# -c Do not decompress package to ${LFS_TMP}
# -j Disable parallel make for this package
# -l Unique identification label in 'install.log'
# (default is package name and version)
# -j Disable parallel make for this package
# -l Unique identification label in 'install.log'
# (default is package name and version)
@@
-814,18
+813,21
@@
ipkg()
START_TIME=$(echo `date +%s`)
unset ALT_SCRIPT_NAME
START_TIME=$(echo `date +%s`)
unset ALT_SCRIPT_NAME
+
+ export DECOMPRESS="1"
export IPKG_MODE="ac" # Default mode if not specified
export HVLABEL="" # Global variable
local HVMAKE_ORIG=${HVMAKE}
export IPKG_MODE="ac" # Default mode if not specified
export HVLABEL="" # Global variable
local HVMAKE_ORIG=${HVMAKE}
- # Make sure to get latest variables assignments (ex: pkg-config)
- source /etc/profile
-
- while getopts "jl:m:s:" flag ;do
+ while getopts "cjl:m:s:" flag ;do
case ${flag} in
case ${flag} in
+ c)
+ # Do not decompress package
+ DECOMPRESS="0"
+ ;;
j)
j)
- # Disable parallel make onlyfor this package
+ # Disable parallel make only
for this package
HVMAKE="make"
;;
l)
HVMAKE="make"
;;
l)
@@
-913,6
+915,12
@@
ipkg()
# Make sure we are at a known location
cd ${SCRDIR}
# Make sure we are at a known location
cd ${SCRDIR}
+ if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then
+ # Make sure to update dynamic linker run-time bindings, except for
+ # stages 0 and 1 where we run as the LFS user.
+ ldconfig
+ fi
+
exec 1>&6 # Restore stdout.
# Displaying build time after the package name.
exec 1>&6 # Restore stdout.
# Displaying build time after the package name.
@@
-926,9
+934,6
@@
ipkg()
ipkg_trap_end
ipkg_trap_end
- # Make sure to update dynamic linker run-time bindings
- ldconfig
-
return $EXIT_SUCCESS
}
return $EXIT_SUCCESS
}