From patchwork Mon May 30 23:50:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jon X-Patchwork-Id: 5640 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4LBscX0mRmz3wcT for ; Mon, 30 May 2022 23:51:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4LBscT2m1fzqM; Mon, 30 May 2022 23:51:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LBscT0v0vz2xqw; Mon, 30 May 2022 23:51:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4LBscR4tdBz2xJQ for ; Mon, 30 May 2022 23:51:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4LBscQ1ZyszfP; Mon, 30 May 2022 23:51:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1653954662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CCXABzw8wLANudi5QkhLk2YBTZRcUWT2SHqrcW4ggDM=; b=tZ90h/eF+RAujIvO3PmyvGdTlCfKRAhiizQpxPt9Xpx3bnqpfHAu7nW4kvomkSoAFec2Lx DdVUd6w35JWRk2CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1653954662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CCXABzw8wLANudi5QkhLk2YBTZRcUWT2SHqrcW4ggDM=; b=VvPBMte+MXQ9SYgjh0PejU3I3Bkzykr7T/oa/QpbIKjzV48TNKckd2TaQa6dthgbiZTx4B 3qnxBxeG57PywY/uCgkh0hNjv6nyFY5N7A7J+O5wdFSHboYztK88EEOytc7Pwd4PuIYMDF 0Ty6yPRkkLdeu53d86Xe7MarMt8KgOBR5LsAyBPTv9T/YkBnXXcnNnPhlXLtrDwdb9aIsV QU/Ezj6PJ0Y/APtnw7Ffooa6gy9meEUHVAv2rmu4rcKgBZRKWlbqwskPG2GZgqINadA6DG wd1veC3onhKTSfvXSeE4v0WkQQXm439rcZXWNWvC/1ziFNHpdApqtcTwmysRMw== From: Jon Murphy To: development@lists.ipfire.org Subject: [PATCH v2] make.sh-usage: Ship changes to make files Date: Mon, 30 May 2022 18:50:31 -0500 Message-Id: <20220530235031.1427714-1-jon.murphy@ipfire.org> In-Reply-To: <20220529185134.3517447-1-jon.murphy@ipfire.org> References: <20220529185134.3517447-1-jon.murphy@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Reviewed-by: Michael Tremer --- doc/make.sh-usage | 41 ++++++++++++++++++++++------------------- make.sh | 10 ++-------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/doc/make.sh-usage b/doc/make.sh-usage index 5e1e3dd22..323417172 100644 --- a/doc/make.sh-usage +++ b/doc/make.sh-usage @@ -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. diff --git a/make.sh b/make.sh index 3ed9190b9..9f3dcd604 100755 --- a/make.sh +++ b/make.sh @@ -1715,7 +1715,7 @@ buildipfire() { lfsmake2 pmacct lfsmake2 squid-asnbl lfsmake2 qemu-ga - lfsmake2 gptfdisk + lfsmake2 gptfdisk } buildinstaller() { @@ -1824,9 +1824,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 @@ -1970,9 +1967,6 @@ downloadsrc) cd - >/dev/null 2>&1 ;; toolchain) - # Clear screen - ${INTERACTIVE} && clear - prepareenv print_build_stage "Toolchain compilation (${BUILD_ARCH})" buildtoolchain @@ -2074,7 +2068,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