From 7f0cf29dddd97fe9afdeee70e8046ac7ad293d24 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 7 Jun 2006 08:35:13 +0000 Subject: [PATCH] Stefan Fiedler: add missing (non-package specific except linux and glibc) Config help texts target/rescue/config.in: fix one misspelled Config option (ROCKCFG_RESCUE_DEFAULT_HOSTNAME) [2006051821464159100] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7626 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/mips/config.hlp | 2 + package/avm/bootsplash/pkg_config_linux.hlp | 2 + package/avm/misdn-user/pkg_config_linux.hlp | 2 + package/base/gcc/config-300.hlp | 33 +++++++- package/base/glibc/config-400.hlp | 12 +++ package/base/linux/config-500.hlp | 16 ++++ package/daja77/qemu/config.hlp | 5 ++ scripts/config.hlp | 94 +++++++++++++++++++++ target/rescue/config.hlp | 16 ++++ target/rescue/config.in | 4 +- target/router/config.hlp | 5 ++ 11 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 package/avm/bootsplash/pkg_config_linux.hlp create mode 100644 package/avm/misdn-user/pkg_config_linux.hlp create mode 100644 package/daja77/qemu/config.hlp create mode 100644 target/router/config.hlp diff --git a/architecture/mips/config.hlp b/architecture/mips/config.hlp index 903bc3733..3fe168baf 100644 --- a/architecture/mips/config.hlp +++ b/architecture/mips/config.hlp @@ -27,3 +27,5 @@ ROCKCFG_MIPS_ENDIANESS ROCKCFG_MIPS_OPT Please select the CPU you want to optimise for. +ROCKCFG_MIPS_ABI + Choose the MIPS ABI you want to compile for. diff --git a/package/avm/bootsplash/pkg_config_linux.hlp b/package/avm/bootsplash/pkg_config_linux.hlp new file mode 100644 index 000000000..fd65e0e7a --- /dev/null +++ b/package/avm/bootsplash/pkg_config_linux.hlp @@ -0,0 +1,2 @@ +ROCKCFG_PKG_LINUX_BOOTSPLASH + If enabled, patch the Linux kernel to support the bootsplash feature. diff --git a/package/avm/misdn-user/pkg_config_linux.hlp b/package/avm/misdn-user/pkg_config_linux.hlp new file mode 100644 index 000000000..7a81c8517 --- /dev/null +++ b/package/avm/misdn-user/pkg_config_linux.hlp @@ -0,0 +1,2 @@ +ROCKCFG_PKG_LINUX_MISDN + If enabled, patch the Linux kernel to include the mISDN driver. diff --git a/package/base/gcc/config-300.hlp b/package/base/gcc/config-300.hlp index 4c5fcbfdb..0d366889c 100644 --- a/package/base/gcc/config-300.hlp +++ b/package/base/gcc/config-300.hlp @@ -39,7 +39,25 @@ ROCKCFG_PKG_GCC_STACKPRO Please check here to use the GCC Stack Smashing Protector in all gcc versions for which it is available. This will help to prevent buffer overflows. - + +ROCKCFG_PKG_GCC_GCC2 + Build the GNU Compiler Collection, version 2.x. + +ROCKCFG_PKG_GCC_GCC32 + Build the GNU Compiler Collection, version 3.2.x. + +ROCKCFG_PKG_GCC_GCC33 + Build the GNU Compiler Collection, version 3.3.x. + +ROCKCFG_PKG_GCC_GCC34 + Build the GNU Compiler Collection, version 3.4.x. + +ROCKCFG_PKG_GCC_GCC40 + Build the GNU Compiler Collection, version 4.0.x. + +ROCKCFG_PKG_GCC_GCC41 + Build the GNU Compiler Collection, version 4.1.x. + ROCKCFG_PKG_GCC2_NO_CHILL Please check here if you don't want to build the gcc2 CHILL compiler. @@ -56,3 +74,16 @@ ROCKCFG_PKG_GCC34_PROFILED Enables profiling during GCC bootstrap and so yields an optimised compiler. Build speedup might be 5-10%. +ROCKCFG_PKG_GCC40_NO_JAVA + Please check here if you don't want to build the gcc40 JAVA compiler. + +ROCKCFG_PKG_GCC40_PROFILED + Enables profiling during GCC bootstrap and so yields an optimised + compiler. Build speedup might be 5-10%. + +ROCKCFG_PKG_GCC41_NO_JAVA + Please check here if you don't want to build the gcc41 JAVA compiler. + +ROCKCFG_PKG_GCC41_PROFILED + Enables profiling during GCC bootstrap and so yields an optimised + compiler. Build speedup might be 5-10%. diff --git a/package/base/glibc/config-400.hlp b/package/base/glibc/config-400.hlp index d81ef61e6..f01395a75 100644 --- a/package/base/glibc/config-400.hlp +++ b/package/base/glibc/config-400.hlp @@ -33,3 +33,15 @@ MENU_PKG_GLIBC ROCKCFG_PKG_GLIBC22_USEIT Please check here if you want to use the old glibc Version 2.2. +ROCKCFG_PKG_GLIBC_ENABLE_PROFILE + If enabled, glibc libraries will be built with profiling support. + +ROCKCFG_PKG_GLIBC_BRANCH + Choose the glibc branch to use, either 2.2, 2.3 or 2.4. + +ROCKCFG_PKG_GLIBC23_LINUXTHREADS + Use old-style linuxthreads instead of NPTL (Native POSIX Threads for Linux). + + NPTL does not work on plain i386. Furthermore glibc libraries supporting + NPTL are incompatible with those supporting linuxthreads. + You need to be running a 2.6 Linux kernel to build a glibc supporting NPTL. diff --git a/package/base/linux/config-500.hlp b/package/base/linux/config-500.hlp index 2c1fbea6e..a26d24cb4 100644 --- a/package/base/linux/config-500.hlp +++ b/package/base/linux/config-500.hlp @@ -44,3 +44,19 @@ ROCKCFG_PKG_LINUX_USE26MODTOOLS Please check here if you want to use the newer modutils. This is needed if you want to use a 2.6.x kernel. +ROCKCFG_PKG_LINUX_SRC24 + Place the extracted linux24 sources in /usr/src (together with the ROCK + Linux kernel patches). + +ROCKCFG_PKG_LINUX_SRC26 + Place the extracted linux26 sources in /usr/src (together with the ROCK + Linux kernel patches). + +ROCKCFG_PKG_LINUX_IMG24 + Build and install a linux24 kernel. + +ROCKCFG_PKG_LINUX_IMG26 + Build and install a linux26 kernel. + +ROCKCFG_PKG_LINUX_DEFAULT + This kernel will be installed as the default kernel. diff --git a/package/daja77/qemu/config.hlp b/package/daja77/qemu/config.hlp new file mode 100644 index 000000000..a29b96a5d --- /dev/null +++ b/package/daja77/qemu/config.hlp @@ -0,0 +1,5 @@ +ROCKCFG_PKG_QEMU_KQEMU + Please note that the accelerator module is not GPLed. + Permission was given by Fabrice Bellard to distribute it with ROCK Linux. + If you plan to give away the distribution you build using ROCK Linux, + you have to ask Fabrice Bellard for authorisation. diff --git a/scripts/config.hlp b/scripts/config.hlp index fa830d351..18dc9f632 100644 --- a/scripts/config.hlp +++ b/scripts/config.hlp @@ -40,6 +40,30 @@ ROCKCFG_CROSSBUILD This option needs to be selected to perform a cross-build to another architecture. +ROCKCFG_CROSS_TESTALL + If enabled, try to cross-build packages which are not known to support + cross-compilation. + + USE WITH CARE: cross-building packages which don't support cross-compilation + might overwrite files on your real root filesystem, rendering your system + unusable! + +ROCKCFG_PSEUDONATIVE + Many packages cannot be cross-build, but building them natively might + considerably slow down the build process (e.g. on old hardware). + + Pseudo-native builds combine the advantages of cross-builds (fast hardware) + and native builds (being able to execute compiled programs): like in + cross-builds, most of the build is done on a non-native machine; programs + that require native execution, however, are transparently run on another, + native machine. + +ROCKCFG_PSEUDONATIVE_NATIVEHOST + The IP adress of the native host for pseudo-native builds. + +ROCKCFG_PSEUDONATIVE_NFSROOT + The NFS root to be mounted on the native host for pseudo-native builds. + ROCKCFG_DISABLE_BROKEN If you select this option packages that have not built in the last referency build will not be built. @@ -109,6 +133,9 @@ ROCKCFG_DISABLE_BROKEN as broken. Note that this differs from ROCKCFG_RETRY_BROKEN. The reason a package is deemed 'broken' can also be missing *.cache file or others. +ROCKCFG_NOBROKENDEPS + Do not try building packages if any of their build-time dependencies failed. + ROCKCFG_ALWAYS_CLEAN When a package built flawlessly then the temporary directory which was used for building is deleted. Select this options if you also want this @@ -142,6 +169,35 @@ ROCKCFG_SRC_TMPFS_OPT ROCKCFG_SRC_TMPFS_LOG Please enter the path to the tmpfs logfile. +ROCKCFG_SENDMAIL + If enabled, Build-Target will send emails when special events happen, + currently on failed package builds and on completed target builds. + +ROCKCFG_SENDMAIL_BIN + The program used by the build scripts for sending email notifications. + +ROCKCFG_SENDMAIL_TO + Email notifications about build events will be sent to this email address. + +ROCKCFG_MYTHTVOSD + Use a Myth TV on-screen display for certain output of the build scripts. + +ROCKCFG_OUTPUT_HTML + Write the output of the build scripts to HTML files. + +ROCKCFG_OUTPUT_HTML_DIR + The directory which build output should be written to. + +ROCKCFG_OUTPUT_TTS + Use a text-to-speech system for certain output of the build scripts. + +ROCKCFG_OUTPUT_TERM_COLOR + Use ANSI colors for output to a terminal. + +ROCKCFG_VERBOSE + If enabled, all output during builds is not only written to the respective + build log but also displayed on the console. + ROCKCFG_EXPERT This button will enable a lot of additional configuration options. Some of these will make small changes to what the system will look @@ -166,9 +222,34 @@ ROCKCFG_PKGFILE_VER If selected the package version number will be added to the binary package filenme. +ROCKCFG_SPLIT_DOC + If enabled, each binary package is split, with one split containing + only documentation files, e.g. kdelibs.gem and kdelibs:doc.gem. This + allows to easily distribute and install package splits separately. + + Altough man and info pages are documentation files as well, they are + not included in :doc splits because they are considered too important. + +ROCKCFG_SPLIT_DEV + If enabled, each binary package is split, with one split containing + only files required for software development, e.g. kdelibs.gem and + kdelibs:dev.gem. This allows to easily distribute and install package + splits separately. + + Files required solely for the purpose of software development include + static libraries and C header files. + ROCKCFG_PKGSEL If selected you can modify the package list for the build. +ROCKCFG_PKGSEL_TPL + Package preselection templates are sets of package selection rules, where + each template is used for a distinct set of packages. + + Package preselection templates (together with the default package + selections of each target) can be seen as starting points for creating + your own package selection (using "Custom package selection"). + MENU_PKGSEL_RULES Here you can modify the package list for the build. You have the choice between enable, disable or complete removal. A disabled @@ -266,6 +347,16 @@ ROCKCFG_DO_CHECK ROCKCFG_OPT With this option, the type of optimisation can be selected. +ROCKCFG_C_FLAGS + These parameters (flags) will be used for every invocation of gcc. + +ROCKCFG_CONFIGURE_OPTS + These parameters will be used for every invocation of GNU configure. + +ROCKCFG_CREATE_DOCS + If enabled, the build scripts will automatically install documentation files + like README, INSTALL and Changelog, contained in each packages sources. + ROCKCFG_DEBUG Enable this option if you want to have debug symbols in your binaries. @@ -275,6 +366,9 @@ ROCKCFG_LIMITCXX but any C++ sources using exceptions or rtti, for example QT/KDE, will fail to compile. If you don't know, don't touch. +ROCKCFG_STATIC + Create statically linked binaries. + ROCKCFG_MULTILIB Enable installing several versions of the same library. diff --git a/target/rescue/config.hlp b/target/rescue/config.hlp index f2d6b3804..1b15d65b3 100644 --- a/target/rescue/config.hlp +++ b/target/rescue/config.hlp @@ -20,4 +20,20 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +ROCKCFG_RESCUE_ACTION_SYSTEM_FAILURE + Select which action to take if the compressed system image fails to + extract. Possible choices are: + "reboot" "reboot if system fails to extract." + "panic" "panic if system fails to extract." + "shell" "give shell if system fails to extract." +choice ROCKCFG_RESCUE_ACTION_OVERLAY_FAILURE "ignore" \ + Select which action to take if the compressed overlay image fails to + extract. Possible choices are: + "ignore" "ignore if overlay fails to extract." + "reboot" "reboot if overlay fails to extract." + "panic" "panic if overlay fails to extract." + "shell" "give shell if overlay fails to extract." + +ROCKCFG_RESCUE_DEFAULT_HOSTNAME + Set the default hostname for the stage 2 system here. diff --git a/target/rescue/config.in b/target/rescue/config.in index 684ea5fad..4f4936794 100644 --- a/target/rescue/config.in +++ b/target/rescue/config.in @@ -32,13 +32,13 @@ choice ROCKCFG_RESCUE_ACTION_OVERLAY_FAILURE "ignore" \ "panic" "panic if overlay fails to extract." \ "shell" "give shell if overlay fails to extract" -text "Hostname for the stage2 system" "ROCKFG_RESCUE_DEFAULT_HOSTNAME" "stage2" +text "Hostname for the stage2 system" "ROCKCFG_RESCUE_DEFAULT_HOSTNAME" "stage2" block_end pkgfilter sed ' -# Select some packages explicitely (base) +# Select some packages explicitly (base) / lvm / { s/^[OX] /X /p; d; }; / lvm-wrapper / { s/^[OX] /X /p; d; }; / mdadm / { s/^[OX] /X /p; d; }; diff --git a/target/router/config.hlp b/target/router/config.hlp new file mode 100644 index 000000000..a2b1011d5 --- /dev/null +++ b/target/router/config.hlp @@ -0,0 +1,5 @@ +ROCKCFG_T_ROUTER_INITRD_SIZE + The size of the initial ramdisk, in MB. + +ROCKCFG_T_ROUTER_SERIAL_BAUD + The default baud rate for serial ports.