[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] configure, makefile: remove traces of really old files
From: |
Paolo Bonzini |
Subject: |
[PULL 07/15] configure, makefile: remove traces of really old files |
Date: |
Tue, 4 Jan 2022 15:57:41 +0100 |
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.
Acked-by: Richard Henderson <richard.henderson@linaro.org>
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 5d66c35ea5..8037f73b35 100644
--- a/Makefile
+++ b/Makefile
@@ -206,14 +206,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)
@@ -224,10 +221,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 b93ba2c86c..851eb35dbe 100755
--- a/configure
+++ b/configure
@@ -3671,9 +3671,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"
@@ -3685,7 +3682,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 \
@@ -3707,11 +3703,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
- [PULL v3 00/15] Build system and KVM changes for 2021-12-23, Paolo Bonzini, 2022/01/04
- [PULL 01/15] meson: reuse common_user_inc when building files specific to user-mode emulators, Paolo Bonzini, 2022/01/04
- [PULL 02/15] user: move common-user includes to a subdirectory of {bsd, linux}-user/, Paolo Bonzini, 2022/01/04
- [PULL 03/15] meson: cleanup common-user/ build, Paolo Bonzini, 2022/01/04
- [PULL 04/15] block/file-posix: Simplify the XFS_IOC_DIOINFO handling, Paolo Bonzini, 2022/01/04
- [PULL 07/15] configure, makefile: remove traces of really old files,
Paolo Bonzini <=
- [PULL 05/15] configure: simplify creation of plugin symbol list, Paolo Bonzini, 2022/01/04
- [PULL 06/15] configure: do not set bsd_user/linux_user early, Paolo Bonzini, 2022/01/04
- [PULL 08/15] configure: parse --enable/--disable-strip automatically, flip default, Paolo Bonzini, 2022/01/04
- [PULL 09/15] configure: move non-command-line variables away from command-line parsing section, Paolo Bonzini, 2022/01/04
- [PULL 10/15] meson: build contrib/ executables after generated headers, Paolo Bonzini, 2022/01/04
- [PULL 11/15] configure, meson: move config-poison.h to meson, Paolo Bonzini, 2022/01/04
- [PULL 12/15] meson: add comments in the target-specific flags section, Paolo Bonzini, 2022/01/04
- [PULL 13/15] KVM: use KVM_{GET|SET}_SREGS2 when supported., Paolo Bonzini, 2022/01/04
- [PULL 14/15] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS, Paolo Bonzini, 2022/01/04
- [PULL 15/15] tests/tcg: Fix target-specific Makefile variables path for user-mode, Paolo Bonzini, 2022/01/04