From 97ab4f175f8bc8c4cb4039fa1df8dff7992b0b39 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 27 May 2016 16:58:42 -0300 Subject: [PATCH] Retire print_flags --- build.sh | 11 ----------- tools/builder_common.sh | 28 ---------------------------- 2 files changed, 39 deletions(-) diff --git a/build.sh b/build.sh index ea0ca201ae..a533c46ea2 100755 --- a/build.sh +++ b/build.sh @@ -62,7 +62,6 @@ usage() { echo " --setup - Install required repo and ports builder require to work" echo " --update-sources - Refetch FreeBSD sources" echo " --rsync-repos - rsync pkg repos" - echo " --print-flags - Show current builder configuration" echo " --clean-builder - clean all builder used data/resources" echo " --build-kernels - build all configured kernels" echo " --build-kernel argument - build specified kernel. Example --build-kernel KERNEL_NAME" @@ -159,10 +158,6 @@ while test "$1" != ""; do --update-sources) BUILDACTION="updatesources" ;; - --print-flags) - BUILDACTION="printflags" - _USE_OLD_DATESTRING=YES - ;; --clean-builder) BUILDACTION="cleanbuilder" ;; @@ -261,9 +256,6 @@ case $BUILDACTION in cleanbuilder) clean_builder ;; - printflags) - print_flags - ;; images) # It will be handled below ;; @@ -395,9 +387,6 @@ if [ -z "${_SKIP_REBUILD_PRESTAGE}" ]; then # Ensure binaries are present that builder system requires builder_setup - # Output build flags - print_flags - # Check to see if pre-staging will be hosted on ram prestage_on_ram_setup diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 4b55c8c264..3fcfa4ab7d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -374,34 +374,6 @@ install_default_kernel() { unset KERNEL_NAME } -# Outputs various set variables aka env -print_flags() { - - echo - printf " Product version: %s\n" $PRODUCT_VERSION - printf " Stage DIR: %s\n" $STAGE_CHROOT_DIR - printf " Updates dir: %s\n" $UPDATESDIR - printf " Image Preparation Stage DIR: %s\n" $FINAL_CHROOT_DIR - printf " Source DIR: %s\n" $FREEBSD_SRC_DIR - printf " FreeBSD repository: %s\n" $FREEBSD_REPO_BASE - printf " FreeBSD-src branch: %s\n" $FREEBSD_BRANCH - printf " BUILD_KERNELS: %s\n" $BUILD_KERNELS - printf " Git Branch or Tag: %s\n" $GIT_REPO_BRANCH_OR_TAG - printf " MODULES_OVERRIDE: %s\n" $MODULES_OVERRIDE - printf " VMDK_DISK_CAPACITY_IN_GB: %s\n" $VMDK_DISK_CAPACITY_IN_GB - printf " OVFTEMPLATE: %s\n" $OVFTEMPLATE - printf " OVFVMDK: %s\n" $OVFVMDK - printf " SRC_CONF: %s\n" $SRC_CONF - printf " ISOPATH: %s\n" $ISOPATH - printf " MEMSTICKPATH: %s\n" $MEMSTICKPATH -if [ -n "$SHOW_ENV" ]; then - for LINE in $(env | egrep -v '(terminal|PASS|NAME|USER|SSH|GROUP|HOST)'); do - echo "SHOW_ENV: $LINE" - done -fi - echo -} - # This builds FreeBSD (make buildworld) # Imported from FreeSBIE make_world() {