We install elf2dmp by default, so move it from tools/ to contrib/. (Almost all the other tool-like binaries in contrib/ are not installed by default, so are more like example code.)
Signed-off-by: Peter Maydell <[email protected]> --- MAINTAINERS | 2 +- meson.build | 2 +- {contrib => tools}/elf2dmp/addrspace.c | 0 {contrib => tools}/elf2dmp/addrspace.h | 0 {contrib => tools}/elf2dmp/download.c | 0 {contrib => tools}/elf2dmp/download.h | 0 {contrib => tools}/elf2dmp/err.h | 0 {contrib => tools}/elf2dmp/kdbg.h | 0 {contrib => tools}/elf2dmp/main.c | 0 {contrib => tools}/elf2dmp/meson.build | 0 {contrib => tools}/elf2dmp/pdb.c | 0 {contrib => tools}/elf2dmp/pdb.h | 0 {contrib => tools}/elf2dmp/pe.h | 0 {contrib => tools}/elf2dmp/qemu_elf.c | 0 {contrib => tools}/elf2dmp/qemu_elf.h | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename {contrib => tools}/elf2dmp/addrspace.c (100%) rename {contrib => tools}/elf2dmp/addrspace.h (100%) rename {contrib => tools}/elf2dmp/download.c (100%) rename {contrib => tools}/elf2dmp/download.h (100%) rename {contrib => tools}/elf2dmp/err.h (100%) rename {contrib => tools}/elf2dmp/kdbg.h (100%) rename {contrib => tools}/elf2dmp/main.c (100%) rename {contrib => tools}/elf2dmp/meson.build (100%) rename {contrib => tools}/elf2dmp/pdb.c (100%) rename {contrib => tools}/elf2dmp/pdb.h (100%) rename {contrib => tools}/elf2dmp/pe.h (100%) rename {contrib => tools}/elf2dmp/qemu_elf.c (100%) rename {contrib => tools}/elf2dmp/qemu_elf.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 88cc1516d8..054ae3e6c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3938,7 +3938,7 @@ elf2dmp M: Viktor Prutyanov <[email protected]> R: Akihiko Odaki <[email protected]> S: Maintained -F: contrib/elf2dmp/ +F: tools/elf2dmp/ Overall sensors M: Philippe Mathieu-Daudé <[email protected]> diff --git a/meson.build b/meson.build index 1dad3a2462..69cdf2ab60 100644 --- a/meson.build +++ b/meson.build @@ -4543,7 +4543,7 @@ if have_tools }] endforeach - subdir('contrib/elf2dmp') + subdir('tools/elf2dmp') executable('qemu-edid', files('tools/qemu-edid.c', 'hw/display/edid-generate.c'), dependencies: [qemuutil, rt], diff --git a/contrib/elf2dmp/addrspace.c b/tools/elf2dmp/addrspace.c similarity index 100% rename from contrib/elf2dmp/addrspace.c rename to tools/elf2dmp/addrspace.c diff --git a/contrib/elf2dmp/addrspace.h b/tools/elf2dmp/addrspace.h similarity index 100% rename from contrib/elf2dmp/addrspace.h rename to tools/elf2dmp/addrspace.h diff --git a/contrib/elf2dmp/download.c b/tools/elf2dmp/download.c similarity index 100% rename from contrib/elf2dmp/download.c rename to tools/elf2dmp/download.c diff --git a/contrib/elf2dmp/download.h b/tools/elf2dmp/download.h similarity index 100% rename from contrib/elf2dmp/download.h rename to tools/elf2dmp/download.h diff --git a/contrib/elf2dmp/err.h b/tools/elf2dmp/err.h similarity index 100% rename from contrib/elf2dmp/err.h rename to tools/elf2dmp/err.h diff --git a/contrib/elf2dmp/kdbg.h b/tools/elf2dmp/kdbg.h similarity index 100% rename from contrib/elf2dmp/kdbg.h rename to tools/elf2dmp/kdbg.h diff --git a/contrib/elf2dmp/main.c b/tools/elf2dmp/main.c similarity index 100% rename from contrib/elf2dmp/main.c rename to tools/elf2dmp/main.c diff --git a/contrib/elf2dmp/meson.build b/tools/elf2dmp/meson.build similarity index 100% rename from contrib/elf2dmp/meson.build rename to tools/elf2dmp/meson.build diff --git a/contrib/elf2dmp/pdb.c b/tools/elf2dmp/pdb.c similarity index 100% rename from contrib/elf2dmp/pdb.c rename to tools/elf2dmp/pdb.c diff --git a/contrib/elf2dmp/pdb.h b/tools/elf2dmp/pdb.h similarity index 100% rename from contrib/elf2dmp/pdb.h rename to tools/elf2dmp/pdb.h diff --git a/contrib/elf2dmp/pe.h b/tools/elf2dmp/pe.h similarity index 100% rename from contrib/elf2dmp/pe.h rename to tools/elf2dmp/pe.h diff --git a/contrib/elf2dmp/qemu_elf.c b/tools/elf2dmp/qemu_elf.c similarity index 100% rename from contrib/elf2dmp/qemu_elf.c rename to tools/elf2dmp/qemu_elf.c diff --git a/contrib/elf2dmp/qemu_elf.h b/tools/elf2dmp/qemu_elf.h similarity index 100% rename from contrib/elf2dmp/qemu_elf.h rename to tools/elf2dmp/qemu_elf.h -- 2.43.0
