diff options
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | Makefile.target | 10 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | gdbstub.h | 2 | ||||
| -rw-r--r-- | pc-bios/optionrom/Makefile | 2 | ||||
| -rw-r--r-- | qemu-doc.texi | 2 | ||||
| -rw-r--r-- | rules.mak | 2 | ||||
| -rwxr-xr-x | scripts/create_config (renamed from create_config) | 0 | ||||
| -rw-r--r-- | scripts/feature_to_c.sh (renamed from feature_to_c.sh) | 0 | ||||
| -rw-r--r-- | scripts/hxtool (renamed from hxtool) | 0 | ||||
| -rw-r--r-- | scripts/make_device_config.sh (renamed from make_device_config.sh) | 0 | ||||
| -rw-r--r-- | scripts/qemu-binfmt-conf.sh (renamed from qemu-binfmt-conf.sh) | 0 | ||||
| -rwxr-xr-x | scripts/signrom.sh (renamed from pc-bios/optionrom/signrom.sh) | 0 | ||||
| -rwxr-xr-x | scripts/simpletrace.py (renamed from simpletrace.py) | 0 | ||||
| -rwxr-xr-x | scripts/texi2pod.pl (renamed from texi2pod.pl) | 0 | ||||
| -rwxr-xr-x | scripts/tracetool (renamed from tracetool) | 0 |
16 files changed, 23 insertions, 23 deletions
diff --git a/Makefile b/Makefile index 6d601eef6e..eca4c7651e 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) -include $(SUBDIR_DEVICES_MAK_DEP) %/config-devices.mak: default-configs/%.mak - $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") + $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ mv $@.tmp $@; \ @@ -76,7 +76,7 @@ build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) @@ -118,12 +118,12 @@ else trace.h: trace.h-timestamp endif trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") + $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") @cmp -s $@ trace.h || cp $@ trace.h trace.c: trace.c-timestamp trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN trace.c") + $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN trace.c") @cmp -s $@ trace.c || cp $@ trace.c trace.o: trace.c $(GENERATED_HEADERS) @@ -136,7 +136,7 @@ trace-dtrace.h: trace-dtrace.dtrace # rule file. So we use '.dtrace' instead trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") + $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) @@ -160,7 +160,7 @@ qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-ob qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS) @@ -282,32 +282,32 @@ TEXIFLAG=$(if $(V),,--quiet) $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") qemu-options.texi: $(SRC_PATH)/qemu-options.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") QMP/qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -q < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@," GEN $@") qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod && \ + perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \ pod2man --section=1 --center=" " --release=" " qemu.pod > $@, \ " GEN $@") qemu-img.1: qemu-img.texi qemu-img-cmds.texi $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod && \ + perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \ pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@, \ " GEN $@") qemu-nbd.8: qemu-nbd.texi $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod && \ + perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-nbd.pod && \ pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \ " GEN $@") diff --git a/Makefile.target b/Makefile.target index e15b1c4fb6..cd2abde394 100644 --- a/Makefile.target +++ b/Makefile.target @@ -52,7 +52,7 @@ TARGET_TYPE=system endif $(QEMU_PROG).stp: - $(call quiet-command,sh $(SRC_PATH)/tracetool \ + $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \ --$(TRACE_BACKEND) \ --binary $(bindir)/$(QEMU_PROG) \ --target-arch $(TARGET_ARCH) \ @@ -344,14 +344,14 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) -gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/feature_to_c.sh - $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") +gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh + $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") hmp-commands.h: $(SRC_PATH)/hmp-commands.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") qmp-commands.h: $(SRC_PATH)/qmp-commands.hx - $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o diff --git a/configure b/configure index d68f862de5..210670c16f 100755 --- a/configure +++ b/configure @@ -2266,7 +2266,7 @@ fi ########################################## # check if trace backend exists -sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null +sh "$source_path/scripts/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null if test "$?" -ne 0 ; then echo echo "Error: invalid trace backend" diff --git a/gdbstub.h b/gdbstub.h index ce5fdcc223..d82334fc7b 100644 --- a/gdbstub.h +++ b/gdbstub.h @@ -38,7 +38,7 @@ int gdbserver_start(int); int gdbserver_start(const char *port); #endif -/* in gdbstub-xml.c, generated by feature_to_c.sh */ +/* in gdbstub-xml.c, generated by scripts/feature_to_c.sh */ extern const char *const xml_builtin[][2]; #endif diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index b4be31ec8f..51da288e32 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -23,7 +23,7 @@ build-all: multiboot.bin linuxboot.bin $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") %.bin: %.raw - $(call quiet-command,$(SHELL) $(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@," Signing $(TARGET_DIR)$@") + $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/signrom.sh $< $@," Signing $(TARGET_DIR)$@") clean: rm -f *.o *.d *.raw *.img *.bin *~ diff --git a/qemu-doc.texi b/qemu-doc.texi index 45190f6d3b..22a8663f6b 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2132,7 +2132,7 @@ Then you can launch the precompiled @file{ls} x86 executable: @example qemu-i386 tests/i386/ls @end example -You can look at @file{qemu-binfmt-conf.sh} so that +You can look at @file{scripts/qemu-binfmt-conf.sh} so that QEMU is automatically launched by the Linux kernel when you try to launch x86 executables. It requires the @code{binfmt_misc} module in the Linux kernel. diff --git a/rules.mak b/rules.mak index 738eec3282..ed59c9e82b 100644 --- a/rules.mak +++ b/rules.mak @@ -57,7 +57,7 @@ find-in-path = $(if $(find-string /, $1), \ @test -f $@ || cp $< $@ %.h-timestamp: %.mak - $(call quiet-command, sh $(SRC_PATH)/create_config < $< > $@, " GEN $*.h") + $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $*.h") @cmp $@ $*.h >/dev/null 2>&1 || cp $@ $*.h # will delete the target of a rule if commands exit with a nonzero exit status diff --git a/create_config b/scripts/create_config index 0098e683e2..0098e683e2 100755 --- a/create_config +++ b/scripts/create_config diff --git a/feature_to_c.sh b/scripts/feature_to_c.sh index 0994d9546e..0994d9546e 100644 --- a/feature_to_c.sh +++ b/scripts/feature_to_c.sh diff --git a/hxtool b/scripts/hxtool index 7ca83ed1ff..7ca83ed1ff 100644 --- a/hxtool +++ b/scripts/hxtool diff --git a/make_device_config.sh b/scripts/make_device_config.sh index 5d14885dfc..5d14885dfc 100644 --- a/make_device_config.sh +++ b/scripts/make_device_config.sh diff --git a/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index c50beb7337..c50beb7337 100644 --- a/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh diff --git a/pc-bios/optionrom/signrom.sh b/scripts/signrom.sh index 9dc5c63dde..9dc5c63dde 100755 --- a/pc-bios/optionrom/signrom.sh +++ b/scripts/signrom.sh diff --git a/simpletrace.py b/scripts/simpletrace.py index 553a72709f..553a72709f 100755 --- a/simpletrace.py +++ b/scripts/simpletrace.py diff --git a/texi2pod.pl b/scripts/texi2pod.pl index 9ed056ad1c..9ed056ad1c 100755 --- a/texi2pod.pl +++ b/scripts/texi2pod.pl diff --git a/tracetool b/scripts/tracetool index fce491c505..fce491c505 100755 --- a/tracetool +++ b/scripts/tracetool |