Merged r2969:2972 from trunk.
This commit is contained in:
parent
c5a6f21487
commit
9e627f6f88
3 changed files with 54 additions and 16 deletions
48
README.BLFS
48
README.BLFS
|
@ -4,8 +4,8 @@ $Id$
|
|||
|
||||
To automatize packages build from the BLFS book instructions is a huge
|
||||
task. The BLFS book isn't linear, some package pages need to use a non
|
||||
defaul layout, there are circular dependencies, several packages can be
|
||||
installed on a non default prifix, build commands can change based on what
|
||||
default layout, there are circular dependencies, several packages can be
|
||||
installed on a non default prefix, build commands can change based on what
|
||||
dependencies will be used, etc.
|
||||
|
||||
Said that, the goal of jhalfs is try to help you solving packages
|
||||
|
@ -19,7 +19,7 @@ $Id$
|
|||
|
||||
2. USAGE::
|
||||
|
||||
Due the complexity of the BLFS book, the scripts/Mafile generation is
|
||||
Due the complexity of the BLFS book, the scripts/Makefile generation is
|
||||
done in several steps:
|
||||
|
||||
2.1 INSTALLATION::
|
||||
|
@ -73,13 +73,13 @@ $Id$
|
|||
will create a directory named "galeon". Inside that directory you find a
|
||||
directory named "HTML" that contains a galeon-based HTML book with all
|
||||
dependencies in build order and a "scripts" directory with build scripts
|
||||
that uses sudo for commands that need root priviledges.
|
||||
that uses sudo for commands that need root privileges.
|
||||
|
||||
There is also two other directories that contains files generated while
|
||||
resolving dependencies trees.
|
||||
|
||||
Now is the time to review the generated book and scripts, making in the
|
||||
scripts any changes you want to fit your needs. Scripts for aditional
|
||||
scripts any changes you want to fit your needs. Scripts for additional
|
||||
packages (i.e., for non-BLFS packages) can be inserted in an easy way.
|
||||
|
||||
2.4 CREATING THE MAKEFILE
|
||||
|
@ -93,3 +93,41 @@ $Id$
|
|||
|
||||
(Text is needed for the installed packages tracking system and like)
|
||||
|
||||
3. GENERATED BUILD SCRIPTS ISSUES::
|
||||
|
||||
In this section known issues with the generated build scripts are
|
||||
discussed. They are due build procedures and BLFS layout particularities
|
||||
than we can't handle. In some cases editing the build scripts is mandatory.
|
||||
You may need also to insert some build script created by you to resolve
|
||||
unhandled dependencies and/or to remove some script and install the
|
||||
affected package by hand.
|
||||
|
||||
3.1 BLFS BOOTSCRIPTS
|
||||
|
||||
For now, bootscripts installation will fail. You will need to edit the
|
||||
scripts for packages that install bootscripts and fix their installation
|
||||
command. That could be fixed in the future, but not sure.
|
||||
|
||||
3.2 PACKAGES CONFIGURATION
|
||||
|
||||
For that packages that have a "Configuration" section, you should to
|
||||
edit it build script to fit the configuration to your needs.
|
||||
|
||||
3.4 PDL and Perl modules.
|
||||
|
||||
The generated scripts for that packages are plainly broken and can't
|
||||
be fixed. You must to replace it by your own ones or install that
|
||||
packages by hand.
|
||||
|
||||
3.4 GCC, JDK, Sane, and KDE-multimedia
|
||||
|
||||
On the pages for that packages, the BLFS book actually have instructions
|
||||
to install two packages. You must to edit the scripts to fix it. We will
|
||||
try to fix some of them, but may not be possible.
|
||||
|
||||
3.5 OTHERS
|
||||
|
||||
May have other issues that we are not aware on them yet. If you find
|
||||
someone, please report it to <alfs-discuss@linuxfromscratch.org>.
|
||||
|
||||
|
||||
|
|
2
blfs
2
blfs
|
@ -44,7 +44,7 @@ simple_error() { # Basic error trap.... JUST DIE
|
|||
}
|
||||
|
||||
see_ya() {
|
||||
echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}jhalfs-X${R_arrow}\n"
|
||||
echo -e "\n${L_arrow}${BOLD}jhalfs-X${R_arrow} exit${OFF}\n"
|
||||
}
|
||||
##### Simple error TRAPS
|
||||
# ctrl-c SIGINT
|
||||
|
|
20
master.sh
20
master.sh
|
@ -14,7 +14,7 @@ simple_error() { # Basic error trap.... JUST DIE
|
|||
}
|
||||
|
||||
see_ya() {
|
||||
echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}jhalfs-X${R_arrow}\n"
|
||||
echo -e "\n${L_arrow}${BOLD}jhalfs-X${R_arrow} exit${OFF}\n"
|
||||
}
|
||||
##### Simple error TRAPS
|
||||
# ctrl-c SIGINT
|
||||
|
@ -66,10 +66,10 @@ if [[ -e using_menuconfig ]]; then
|
|||
XSL=$PROGNAME.xsl
|
||||
|
||||
case $PROGNAME in
|
||||
clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;
|
||||
clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;
|
||||
*) LFSVRS=development; TREE=trunk/BOOK ;;
|
||||
esac
|
||||
|
||||
|
||||
if [[ ! -z ${BRANCH_ID} ]]; then
|
||||
case $BRANCH_ID in
|
||||
dev* | SVN | trunk )
|
||||
|
@ -98,10 +98,10 @@ if [[ -e using_menuconfig ]]; then
|
|||
esac
|
||||
fi
|
||||
# These are boolean vars generated from Config.in.
|
||||
# ISSUE: If a boolean parameter is not set <true> that
|
||||
# variable is not defined by the menu app. This can
|
||||
# ISSUE: If a boolean parameter is not set <true> that
|
||||
# variable is not defined by the menu app. This can
|
||||
# cause a headache if you are not careful.
|
||||
# The following parameters MUST be created and have a
|
||||
# The following parameters MUST be created and have a
|
||||
# default value.
|
||||
RUNMAKE=${RUNMAKE:-n}
|
||||
GETPKG=${GETPKG:-n}
|
||||
|
@ -115,7 +115,7 @@ if [[ -e using_menuconfig ]]; then
|
|||
VIMLANG=${VIMLANG:-n}
|
||||
KEYMAP=${KEYMAP:=none}
|
||||
GRSECURITY_HOST=${GRSECURITY_HOST:-n}
|
||||
|
||||
|
||||
else
|
||||
#
|
||||
[[ $VERBOSITY > 0 ]] && echo -n "Loading masterscript conf..."
|
||||
|
@ -354,19 +354,19 @@ while test $# -gt 0 ; do
|
|||
mips ) ARCH=mips; TARGET="mips-unknown-linux-gnu" ;;
|
||||
mipsel ) ARCH=mips; TARGET="mipsel-unknown-linux-gnu" ;;
|
||||
sparc ) ARCH=sparc; TARGET="sparcv9-unknown-linux-gnu" ;;
|
||||
|
||||
|
||||
x86_64-64 ) ARCH=x86_64-64; TARGET="x86_64-unknown-linux-gnu" ;;
|
||||
mips64-64 ) ARCH=mips64-64; TARGET="mips-unknown-linux-gnu" ;;
|
||||
mipsel64-64 ) ARCH=mips64-64; TARGET="mipsel-unknown-linux-gnu" ;;
|
||||
sparc64-64 ) ARCH=sparc64-64; TARGET="sparc64-unknown-linux-gnu" ;;
|
||||
alpha ) ARCH=alpha; TARGET="alpha-unknown-linux-gnu" ;;
|
||||
|
||||
|
||||
x86_64 ) ARCH=x86_64; TARGET="x86_64-unknown-linux-gnu"; TARGET32="i686-pc-linux-gnu" ;;
|
||||
mips64 ) ARCH=mips64; TARGET="mips-unknown-linux-gnu"; TARGET32="mips-unknown-linux-gnu" ;;
|
||||
mipsel64 ) ARCH=mips64; TARGET="mipsel-unknown-linux-gnu"; TARGET32="mipsel-unknown-linux-gnu" ;;
|
||||
sparc64 ) ARCH=sparc64; TARGET="sparc64-unknown-linux-gnu"; TARGET32="sparcv9-unknown-linux-gnu" ;;
|
||||
ppc64 ) ARCH=ppc64; TARGET="powerpc64-unknown-linux-gnu"; TARGET32="powerpc-unknown-linux-gnu" ;;
|
||||
|
||||
|
||||
* ) echo -e "\n$1 is an unknown or unsupported arch."; exit 1 ;;
|
||||
esac
|
||||
;;
|
||||
|
|
Reference in a new issue