Commit c1c2a435 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-docker-updates-050618-1' into staging 



Docker related updates

  - configure/probe for docker
  - TARGET_DIRS -> TARGET_LIST cleanup
  - new fedora-i386-cross and debian/tricore images
  - test-mingw use SDL2/GTK3

# gpg: Signature made Tue 05 Jun 2018 16:32:53 BST
# gpg:                using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-docker-updates-050618-1:
  docker: add debian/tricore image
  docker: test-mingw: use SDL2 and GTK+3
  docker: Add fedora-i386-cross image
  Makefile: Rename TARGET_DIRS to TARGET_LIST
  configure: add test for docker availability
  docker: add "probe" command for configure

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1d889f2a 36dc5fed

Makefile

+10 −10
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \ 
endif

endif



CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)

CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)

CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)

CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)

CONFIG_XEN := $(CONFIG_XEN_BACKEND)

CONFIG_ALL=y

-include config-all-devices.mak
@@ -366,8 +366,8 @@ DOCS= 
endif



SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)

SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))

SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))

SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))

SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))



ifeq ($(SUBDIR_DEVICES_MAK),)

config-all-devices.mak:
@@ -470,7 +470,7 @@ config-host.h-timestamp: config-host.mak 
qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")



SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))

SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))

SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))



$(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
@@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) 
romsubdir-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)



ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))

ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))



recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
@@ -772,7 +772,7 @@ distclean: clean 
	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf

	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html

	rm -f docs/qemu-block-drivers.7

	for d in $(TARGET_DIRS); do \

	for d in $(TARGET_LIST); do \

	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk
@@ -873,7 +873,7 @@ endif 
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \

	done

	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"

	for d in $(TARGET_DIRS); do \

	for d in $(TARGET_LIST); do \

	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \

        done
@@ -1071,9 +1071,9 @@ endif 
	@echo  '  ctags/TAGS      - Generate tags file for editors'

	@echo  '  cscope          - Generate cscope index'

	@echo  ''

	@$(if $(TARGET_DIRS), \

	@$(if $(TARGET_LIST), \

		echo 'Architecture specific targets:'; \

		$(foreach t, $(TARGET_DIRS), \

		$(foreach t, $(TARGET_LIST), \

		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \

		echo '')

	@echo  'Cleaning targets:'

configure

+18 −1
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ jemalloc="no" 
replication="yes"

vxhs=""

libxml2=""

docker="no"



supported_cpu="no"

supported_os="no"
@@ -5450,6 +5451,17 @@ EOF 
  fi

fi



##########################################

# Docker and cross-compiler support

#

# This is specifically for building test

# cases for foreign architectures, not

# cross-compiling QEMU itself.



if has "docker"; then

    docker=$($python $source_path/tests/docker/docker.py probe)

fi



##########################################

# End of CC checks

# After here, no more $cc or $ld runs
@@ -5913,6 +5925,7 @@ echo "avx2 optimization $avx2_opt" 
echo "replication support $replication"

echo "VxHS block device $vxhs"

echo "capstone          $capstone"

echo "docker            $docker"



if test "$sdl_too_old" = "yes"; then

echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -6115,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION) 
echo "VERSION=$qemu_version" >>$config_host_mak

echo "PKGVERSION=$pkgversion" >>$config_host_mak

echo "SRC_PATH=$source_path" >> $config_host_mak

echo "TARGET_DIRS=$target_list" >> $config_host_mak

echo "TARGET_LIST=$target_list" >> $config_host_mak

if [ "$docs" = "yes" ] ; then

  echo "BUILD_DOCS=yes" >> $config_host_mak

fi
@@ -6740,6 +6753,10 @@ if test "$gcov" = "yes" ; then 
  echo "GCOV=$gcov_tool" >> $config_host_mak

fi



if test "$docker" != "no"; then

    echo "HAVE_USER_DOCKER=y" >> $config_host_mak

fi



# use included Linux headers

if test "$linux" = "yes" ; then

  mkdir -p linux-headers

scripts/create_config

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ case $line in 
    target_name=${line#*=}

    echo "#define TARGET_NAME \"$target_name\""

    ;;

 TARGET_DIRS=*)

 TARGET_LIST=*)

    # do nothing

    ;;

 TARGET_*=y) # configuration

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ endif 


# QTest rules



TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))

TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST)))

ifeq ($(CONFIG_POSIX),y)

QTEST_TARGETS = $(TARGETS)

check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))

tests/docker/Makefile.include

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ docker-image-debian-win32-cross: docker-image-debian8-mxe 
docker-image-debian-win64-cross: docker-image-debian8-mxe

docker-image-travis: NOUSER=1



# Specialist build images, sometimes very limited tools

docker-image-tricore-cross: docker-image-debian9



# Expand all the pre-requistes for each docker image and test combination

$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \

	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \