From patchwork Tue Oct 30 12:50:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 149742 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5414450ljp; Tue, 30 Oct 2018 05:50:10 -0700 (PDT) X-Google-Smtp-Source: AJdET5dq0ex6TsBGBTSCwXxRU04+W0Ke6cXsSC/YTcpBbO33oPEhh7ZiV5S/i98eRi/4qgjCF8Pq X-Received: by 2002:a19:a086:: with SMTP id j128mr1685900lfe.93.1540903810450; Tue, 30 Oct 2018 05:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540903810; cv=none; d=google.com; s=arc-20160816; b=qw5cM5TGKvYXmRYXThQaeN30CtWoD4MMZUNOcA+i+Hw/6jD32hUPYLMG6EaVVxMX/D ztR6CBmSy3stu3ecUIOvYofk4b06VCBXSSXUgTYtzS1Gdy15+DH5H1EKMoiuxnpqGl6Y JtRMdnGTWV+9S13oCw66vfjapi9fo4Aodxn/8lworiLGtbeknbpYnA7ajEb+ModQ2YUJ VBbF7Ms7hwv6Ijfgix/r3bSu7vLrDEXQ+/e5uPwb8ppFh9MhJB7AZxi3EepR9LC1hhHt t5cNQyO+xB2AP1w8hEOTHXf0Pnq9btFWi6FZ0gZIEMPMi9antKPexifsWbEx2CrN9l0Q p9sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=rXRM+/Ve2hg2y5lt9TRwfFLBCGsZdvzWCR/4fPS3JzQ=; b=JxrEjwfQ9r/fSShOiHggt+mszEoFSQfUkFAkfIywSdUxyI5LlQ7KujObvHFGFDYM08 9wlkPM5mr04Jjr5CLFneKanO2tQRnUD9M8LyQ581Vc/Pob+KuGWNhED2/S2I1eVvF3HN DUTQ0cHSyf7pnWQgUzac9PNJGhFljIPRhJZYAPNP7ykpJKZOexjf9jK4k5sFxTzzwKFa TGn5hXtMpVo4Yt+//t/PblgYmOXjh/8bcp4VnHP+ne1qxsuqicQxXo/SSB3jnhvNul2J xzZueF1eKWEUBImNVxfRYBDL1HjCs6IUq1sn0uyR7KvC9Jl8ooNWtVPQvz+I2+jfk8fL 3b0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id f21-v6si4775050ljg.217.2018.10.30.05.50.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 05:50:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gHTTF-00013C-7f; Tue, 30 Oct 2018 12:50:09 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" Subject: [PATCH 1/3] configure: Rename FILES variable to LINKS Date: Tue, 30 Oct 2018 12:50:03 +0000 Message-Id: <20181030125005.28151-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181030125005.28151-1-peter.maydell@linaro.org> References: <20181030125005.28151-1-peter.maydell@linaro.org> MIME-Version: 1.0 The FILES variable is used to accumulate a list of things to symlink from the source tree into the build tree. These don't have to be individual files; symlinking an entire directory of data files is also fine. Rename it to something less confusing before we add a few directories to it. Signed-off-by: Peter Maydell --- configure | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) -- 2.19.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/configure b/configure index 1c473ce95ba..b7d0167b650 100755 --- a/configure +++ b/configure @@ -7366,22 +7366,25 @@ if test "$ccache_cpp2" = "yes"; then echo "export CCACHE_CPP2=y" >> $config_host_mak fi -# build tree in object directory in case the source is not in the current directory +# If we're using a separate build tree, set it up now. +# DIRS are directories which we simply mkdir in the build tree; +# LINKS are things to symlink back into the source tree +# (these can be both files and directories). DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" DIRS="$DIRS tests/fp" DIRS="$DIRS docs docs/interop fsdev scsi" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" -FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" -FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" -FILES="$FILES tests/fp/Makefile" -FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" -FILES="$FILES pc-bios/spapr-rtas/Makefile" -FILES="$FILES pc-bios/s390-ccw/Makefile" -FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" -FILES="$FILES pc-bios/qemu-icon.bmp" -FILES="$FILES .gdbinit scripts" # scripts needed by relative path in .gdbinit +LINKS="Makefile tests/tcg/Makefile qdict-test-data.txt" +LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" +LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" +LINKS="$LINKS tests/fp/Makefile" +LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS="$LINKS pc-bios/spapr-rtas/Makefile" +LINKS="$LINKS pc-bios/s390-ccw/Makefile" +LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile" +LINKS="$LINKS pc-bios/qemu-icon.bmp" +LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ @@ -7393,18 +7396,18 @@ for bios_file in \ $source_path/pc-bios/u-boot.* \ $source_path/pc-bios/palcode-* do - FILES="$FILES pc-bios/$(basename $bios_file)" + LINKS="$LINKS pc-bios/$(basename $bios_file)" done for test_file in $(find $source_path/tests/acpi-test-data -type f) do - FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')" + LINKS="$LINKS tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')" done for test_file in $(find $source_path/tests/hex-loader-check-data -type f) do - FILES="$FILES tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')" + LINKS="$LINKS tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')" done mkdir -p $DIRS -for f in $FILES ; do +for f in $LINKS ; do if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then symlink "$source_path/$f" "$f" fi