[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/21] build: remove git submodule handling from main makefile
From: |
Paolo Bonzini |
Subject: |
[PULL 20/21] build: remove git submodule handling from main makefile |
Date: |
Tue, 6 Jun 2023 16:31:15 +0200 |
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>
---
.gitlab-ci.d/buildtest-template.yml | 3 +--
Makefile | 10 ----------
configure | 7 -------
meson.build | 1 -
4 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index d01d504ec5f..76ff1dfcb6f 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -42,8 +42,7 @@
stage: test
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
script:
- - scripts/git-submodule.sh update
- roms/SLOF $(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak)
+ - scripts/git-submodule.sh update roms/SLOF
- meson subprojects download $(cd build/subprojects && echo *)
- cd build
- find . -type f -exec touch {} +
diff --git a/Makefile b/Makefile
index d68196acb9e..b22bf6fba12 100644
--- a/Makefile
+++ b/Makefile
@@ -45,16 +45,6 @@ include config-host.mak
include Makefile.prereqs
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
# Check that we're not trying to do an out-of-tree build from
diff --git a/configure b/configure
index 4dad32938df..bc0660f5a32 100755
--- a/configure
+++ b/configure
@@ -253,7 +253,6 @@ else
git_submodules_action="ignore"
fi
-git_submodules=""
git="git"
debug_tcg="no"
docs="auto"
@@ -1657,18 +1656,12 @@ fi
#######################################
# 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"
echo "# Automatically generated by configure - do not modify" >
$config_host_mak
echo >> $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
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 74fb147fde3..6cd29c11b05 100644
--- a/meson.build
+++ b/meson.build
@@ -3976,7 +3976,6 @@ endif
summary_info = {}
summary_info += {'Build directory': meson.current_build_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(summary_info, bool_yn: true, section: 'Build environment')
--
2.40.1
- [PULL 12/21] configure: remove --with-git= option, (continued)
- [PULL 12/21] configure: remove --with-git= option, Paolo Bonzini, 2023/06/06
- [PULL 13/21] configure: rename --enable-pypi to --enable-download, control subprojects too, Paolo Bonzini, 2023/06/06
- [PULL 11/21] mkvenv: always pass locally-installed packages to pip, Paolo Bonzini, 2023/06/06
- [PULL 14/21] git-submodule: allow partial update of .git-submodule-status, Paolo Bonzini, 2023/06/06
- [PULL 15/21] build: log submodule update from git-submodule.sh, Paolo Bonzini, 2023/06/06
- [PULL 16/21] meson: subprojects: replace submodules with wrap files, Paolo Bonzini, 2023/06/06
- [PULL 17/21] configure: move SLOF submodule handling to pc-bios/s390-ccw, Paolo Bonzini, 2023/06/06
- [PULL 18/21] pc-bios/s390-ccw: always build network bootloader, Paolo Bonzini, 2023/06/06
- [PULL 21/21] configure: remove --with-git-submodules=, Paolo Bonzini, 2023/06/06
- [PULL 20/21] build: remove git submodule handling from main makefile,
Paolo Bonzini <=
- [PULL 19/21] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps, Paolo Bonzini, 2023/06/06
- Re: [PULL 00/21] (Mostly) build system patches for 2023-06-06, Richard Henderson, 2023/06/06