From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org
Subject: [PATCH 3/8] configure, makefile: remove traces of really old files
Date: Tue, 21 Dec 2021 12:05:21 +0100 [thread overview]
Message-ID: <20211221110526.351709-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com>
These files have been removed for more than year in the best
case, or for more than ten years for some really old TCG files.
Remove any traces of it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 11 ++++-------
configure | 9 ---------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 74c5b46d38..06ad8a61e1 100644
--- a/Makefile
+++ b/Makefile
@@ -205,14 +205,11 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
clean: recurse-clean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || :
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || :
-# avoid old build problems by removing potentially incorrect old files
- rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
-exec rm {} +
- rm -f TAGS cscope.* *.pod *~ */*~
- rm -f fsdev/*.pod scsi/*.pod
+ rm -f TAGS cscope.* *~ */*~
VERSION = $(shell cat $(SRC_PATH)/VERSION)
@@ -223,10 +220,10 @@ qemu-%.tar.bz2:
distclean: clean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
- rm -f config-host.mak config-host.h* config-poison.h
+ rm -f config-host.mak config-poison.h
rm -f tests/tcg/config-*.mak
- rm -f config-all-disas.mak config.status
- rm -f roms/seabios/config.mak roms/vgabios/config.mak
+ rm -f config.status
+ rm -f roms/seabios/config.mak
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
rm -f *-config-target.h *-config-devices.mak *-config-devices.h
rm -rf meson-private meson-logs meson-info compile_commands.json
diff --git a/configure b/configure
index 6dafbcd362..e09e5bb58f 100755
--- a/configure
+++ b/configure
@@ -3696,9 +3696,6 @@ fi
# so the build tree will be missing the link back to the new file, and
# tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead.
-# UNLINK is used to remove symlinks from older development versions
-# that might get into the way when doing "git update" without doing
-# a "make distclean" in between.
LINKS="Makefile"
LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile"
@@ -3710,7 +3707,6 @@ LINKS="$LINKS tests/avocado tests/data"
LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python"
LINKS="$LINKS contrib/plugins/Makefile "
-UNLINK="pc-bios/keymaps"
for bios_file in \
$source_path/pc-bios/*.bin \
$source_path/pc-bios/*.elf \
@@ -3732,11 +3728,6 @@ for f in $LINKS ; do
symlink "$source_path/$f" "$f"
fi
done
-for f in $UNLINK ; do
- if [ -L "$f" ]; then
- rm -f "$f"
- fi
-done
(for i in $cross_cc_vars; do
export $i
--
2.33.1
next prev parent reply other threads:[~2021-12-21 11:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 11:05 [PATCH 0/8] Next round of configure/meson cleanups Paolo Bonzini
2021-12-21 11:05 ` [PATCH 1/8] configure: simplify creation of plugin symbol list Paolo Bonzini
2021-12-21 20:50 ` Richard Henderson
2021-12-21 11:05 ` [PATCH 2/8] configure: do not set bsd_user/linux_user early Paolo Bonzini
2021-12-21 20:55 ` Richard Henderson
2021-12-21 11:05 ` Paolo Bonzini [this message]
2021-12-21 20:59 ` [PATCH 3/8] configure, makefile: remove traces of really old files Richard Henderson
2021-12-21 11:05 ` [PATCH 4/8] configure: parse --enable/--disable-strip automatically, flip default Paolo Bonzini
2021-12-21 11:05 ` [PATCH 5/8] configure: move non-command-line variables away from command-line parsing section Paolo Bonzini
2021-12-21 11:30 ` Philippe Mathieu-Daudé
2021-12-21 11:05 ` [PATCH 6/8] meson: build contrib/ executables after generated headers Paolo Bonzini
2021-12-21 11:32 ` Philippe Mathieu-Daudé
2021-12-21 11:05 ` [PATCH 7/8] configure, meson: move config-poison.h to meson Paolo Bonzini
2021-12-21 21:54 ` Richard Henderson
2021-12-21 11:05 ` [PATCH 8/8] meson: add comments in the target-specific flags section Paolo Bonzini
2021-12-21 11:32 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211221110526.351709-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).