make.sh-usage: Ship changes to make files

In make.sh-usage document:
 - updated with descriptions for various commands
 - removed descriptions for old commands

In make.sh script:
 - updated make.sh usage line "Usage: $0 [OPTIONS] {build|check-manualpages|..."
 - removed make.sh clear screen commands in build area and toolchain area

Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Jon Murphy
2022-05-30 18:50:31 -05:00
committed by Peter Müller
parent 9152d4e453
commit 5f8a1acfe9
2 changed files with 24 additions and 27 deletions

View File

@@ -1,23 +1,26 @@
Standard use commands in the order you may need them.
downloadsrc : preload all necessary files in cache before compilation
build : compile the distribution
clean : erase build and log to recompile everything from scratch
make.sh - Build and maintain programs and libraries for IPFire source code
Optional
gettoolchain : optionally load from ipfire.org a precompilated toolchain
package. This solve some compilation issues on old or very
recent distributions and save 20% of next full building time.
If you want to use it, do it before build step
Standard commands:
downloadsrc Preload all necessary files in cache before compilation
gettoolchain Optionally load a precompilated toolchain (20% less build time)
build Compile distribution
clean Erase build and log directories to recompile all from scratch
Maintainer / advanced commands
toolchain : Create our own toolchain package to save 20% of build time.
shell : Enter a shell inside the chroot, used to tune lfs script
and / or during kernel upgrade to rebuild a new .config
Maintainer and advanced commands:
check-manualpages Check the manual pages for broken links
docker Build a docker image
find-dependencies Confirm needed libraries are included in build
lang Check translations for missing or obsolete strings
shell Enter a shell inside the chroot. Used to tune lfs script
and/or during kernel upgrade to rebuild new .config file
toolchain Create toolchain package (if not downloaded via `make gettoolchain`)
update-contributors Update list of contributors
uploadsrc For core developers only to upload source code
OPTIONS:
--target=[aarch64|armv6l|armv7hl|riscv64|x86_64]
Cross-compile for this target architecture. Uses the QEMU
emulator if needed to virtualise the desired target
architecture. Can be permanently set with
TARGET_ARCH= in .config file.
Options:
--target=[aarch64|armv5tel|i586] : Cross-compile for this target architecture.
Uses the QEMU emulator if needed to virtualise
the desired target architecture.
Can be permanently set with TARGET_ARCH= in
.config.

10
make.sh
View File

@@ -1692,7 +1692,7 @@ buildipfire() {
lfsmake2 pmacct
lfsmake2 squid-asnbl
lfsmake2 qemu-ga
lfsmake2 gptfdisk
lfsmake2 gptfdisk
}
buildinstaller() {
@@ -1801,9 +1801,6 @@ case "$1" in
build)
START_TIME="${SECONDS}"
# Clear screen
${INTERACTIVE} && clear
PACKAGE="$BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.zst"
#only restore on a clean disk
if [ ! -e "${BASEDIR}/build${TOOLS_DIR}/.toolchain-successful" ]; then
@@ -1947,9 +1944,6 @@ downloadsrc)
cd - >/dev/null 2>&1
;;
toolchain)
# Clear screen
${INTERACTIVE} && clear
prepareenv
print_build_stage "Toolchain compilation (${BUILD_ARCH})"
buildtoolchain
@@ -2051,7 +2045,7 @@ check-manualpages)
fi
;;
*)
echo "Usage: $0 [OPTIONS] {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies|check-manualpages}"
echo "Usage: $0 [OPTIONS] {build|check-manualpages|clean|docker|downloadsrc|find-dependencies|gettoolchain|lang|shell|toolchain|update-contributors|uploadsrc}"
cat doc/make.sh-usage
;;
esac