ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: remove git submodule handling from main makefile 

The only remaining user of submodules at build time is roms/SLOF,
which is handled in pc-bios/s390-ccw/Makefile.  Remove the relevant
code from the main makefile.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-19 13:27:10 +02:00
parent d2dfe0b506
commit 1f468152fb
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.d/buildtest-template.yml
View File

@ -42,8 +42,7 @@
stage: test stage: test
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
script: script:
- scripts/git-submodule.sh update - scripts/git-submodule.sh update roms/SLOF
roms/SLOF $(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak)
- meson subprojects download $(cd build/subprojects && echo *) - meson subprojects download $(cd build/subprojects && echo *)
- cd build - cd build
- find . -type f -exec touch {} + - find . -type f -exec touch {} +

10
Makefile
View File

@ -45,16 +45,6 @@ include config-host.mak
include Makefile.prereqs include Makefile.prereqs
Makefile.prereqs: config-host.mak Makefile.prereqs: config-host.mak
git-submodule-update:
.git-submodule-status: git-submodule-update config-host.mak
Makefile: .git-submodule-status
.PHONY: git-submodule-update
git-submodule-update:
ifneq ($(GIT_SUBMODULES_ACTION),ignore)
$(quiet-@)GIT=git "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)
endif
# 0. ensure the build tree is okay # 0. ensure the build tree is okay
# Check that we're not trying to do an out-of-tree build from # Check that we're not trying to do an out-of-tree build from

7
configure vendored
View File

@ -253,7 +253,6 @@ else
git_submodules_action="ignore" git_submodules_action="ignore"
fi fi
git_submodules=""
git="git" git="git"
debug_tcg="no" debug_tcg="no"
docs="auto" docs="auto"
@ -1657,18 +1656,12 @@ fi
####################################### #######################################
# generate config-host.mak # generate config-host.mak
if ! (GIT=git "$source_path/scripts/git-submodule.sh" "$git_submodules_action" "$git_submodules"); then
exit 1
fi
config_host_mak="config-host.mak" config_host_mak="config-host.mak"
echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "# Automatically generated by configure - do not modify" > $config_host_mak
echo >> $config_host_mak echo >> $config_host_mak
echo all: >> $config_host_mak echo all: >> $config_host_mak
echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
echo "GIT_SUBMODULES_ACTION=$git_submodules_action" >> $config_host_mak
if test "$debug_tcg" = "yes" ; then if test "$debug_tcg" = "yes" ; then
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak

1
meson.build
View File

@ -3976,7 +3976,6 @@ endif
summary_info = {} summary_info = {}
summary_info += {'Build directory': meson.current_build_dir()} summary_info += {'Build directory': meson.current_build_dir()}
summary_info += {'Source path': meson.current_source_dir()} summary_info += {'Source path': meson.current_source_dir()}
summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
summary_info += {'Download dependencies': get_option('wrap_mode') != 'nodownload'} summary_info += {'Download dependencies': get_option('wrap_mode') != 'nodownload'}
summary(summary_info, bool_yn: true, section: 'Build environment') summary(summary_info, bool_yn: true, section: 'Build environment')