Merge ~ddstreet/ubuntu/+source/qemu:lp1887535-b into ubuntu/+source/qemu:ubuntu/bionic-devel

[Dan Streetman]

Unmerged commits

6832da4... by Dan Streetman on 2021-02-12

update changelog

79d049c... by Dan Streetman on 2021-02-12

Backport configure param --with-git-submodules and set to 'ignore'

As we don't want to update to the latest git submodules since we need a
stable reproducable build, and the submodules are included in the
deb package source, this prevents updating or validating the git submodules.

This allows having a consistent build with or without a local .git directory.

LP: #1887535

diff --git a/debian/changelog b/debian/changelog
index 9982d4d..32848ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qemu (1:2.11+dfsg-1ubuntu7.36) UNRELEASED; urgency=medium
+
+  * d/p/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch,
+    d/rules:
+    Backport --with-git-submodules param so building from git repo
+    doesn't fail (LP: #1887535)
+
+ -- Dan Streetman <[e-mail]>  Fri, 12 Feb 2021 06:45:08 -0500
+
 qemu (1:2.11+dfsg-1ubuntu7.35) bionic-security; urgency=medium
 
   * SECURITY UPDATE: heap overread in iscsi_aio_ioctl_cb
diff --git a/debian/patches/series b/debian/patches/series
index d9e7d97..8073f61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -192,3 +192,4 @@ CVE-2020-28916.patch
 CVE-2020-29443-1.patch
 CVE-2020-29443-2.patch
 CVE-2021-20181.patch
+ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
diff --git a/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch b/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
new file mode 100644
index 0000000..bb42051
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1887535-configure-replace-enable-disable-git-update-with-wit.patch
@@ -0,0 +1,269 @@
+From 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8 Mon Sep 17 00:00:00 2001
+From: Dan Streetman <[e-mail]>
+Date: Tue, 19 Jan 2021 12:20:46 -0500
+Subject: [PATCH] configure: replace --enable/disable-git-update with
+ --with-git-submodules
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1887535
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8
+
+Replace the --enable-git-update and --disable-git-update configure params
+with the param --with-git-submodules=(update|validate|ignore) to
+allow 3 options for building from a git repo.
+
+This is needed because downstream packagers, e.g. Debian, Ubuntu, etc,
+also keep the source code in git, but do not want to enable the
+'git_update' mode; with the current code, that's not possible even
+if the downstream package specifies --disable-git-update.
+
+The previous parameters are deprecated but still available; the
+--enable-git-update parameter maps to --with-git-submodules=update and
+--disable-git-update parameter maps to --with-git-submodules=validate.
+
+The configure script behavior is slightly modified, where previously
+the dtc, capstone, and slirp submodules were not validated when
+--disable-git-update was specified (but were updated with git-update
+enabled), now they are validated when using --with-git-submodules=validate
+and are only ignored when using --with-git-submodules=ignore.
+
+Signed-off-by: Dan Streetman <[e-mail]>
+Signed-off-by: Daniel P. Berrangé <[e-mail]>
+---
+ Makefile                 | 24 ++-----------------
+ configure                | 51 ++++++++++++++++++++++++++++++----------
+ scripts/git-submodule.sh | 34 ++++++++++++++++++++-------
+ 3 files changed, 66 insertions(+), 43 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,33 +14,11 @@ ifneq ($(wildcard config-host.mak),)
+ all:
+ include config-host.mak
+ 
+-git-submodule-update:
+-
+ .PHONY: git-submodule-update
+-
+-git_module_status := $(shell \
+-  cd '$(SRC_PATH)' && \
+-  GIT="$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
+-  echo $$?; \
+-)
+-
+-ifeq (1,$(git_module_status))
+-ifeq (no,$(GIT_UPDATE))
+-git-submodule-update:
+-	$(call quiet-command, \
+-            echo && \
+-            echo "GIT submodule checkout is out of date. Please run" && \
+-            echo "  scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \
+-            echo "from the source directory checkout $(SRC_PATH)" && \
+-            echo && \
+-            exit 1)
+-else
+ git-submodule-update:
+ 	$(call quiet-command, \
+-          (cd $(SRC_PATH) && GIT="$(GIT)" ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
+-          "GIT","$(GIT_SUBMODULES)")
+-endif
+-endif
++		(GIT="$(GIT)" "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \
++		"GIT","$(GIT_SUBMODULES)")
+ 
+ .git-submodule-status: git-submodule-update config-host.mak
+ 
+--- a/configure
++++ b/configure
+@@ -267,10 +267,10 @@ stack_protector=""
+ 
+ if test -e "$source_path/.git"
+ then
+-    git_update=yes
++    git_submodules_action="update"
+     git_submodules="ui/keycodemapdb"
+ else
+-    git_update=no
++    git_submodules_action="ignore"
+     git_submodules=""
+ fi
+ git="git"
+@@ -1314,9 +1314,16 @@ for opt do
+   ;;
+   --with-git=*) git="$optarg"
+   ;;
+-  --enable-git-update) git_update=yes
++  --enable-git-update)
++      git_submodules_action="update"
++      echo "--enable-git-update deprecated, use --with-git-submodules=update"
++  ;;
++  --disable-git-update)
++      git_submodules_action="validate"
++      echo "--disable-git-update deprecated, use --with-git-submodules=validate"
+   ;;
+-  --disable-git-update) git_update=no
++  --with-git-submodules=*)
++      git_submodules_action="$optarg"
+   ;;
+   *)
+       echo "ERROR: unknown option $opt"
+@@ -1334,6 +1341,21 @@ if test "$vhost_user" = ""; then
+     fi
+ fi
+ 
++case $git_submodules_action in
++    update|validate)
++        if test ! -e "$source_path/.git"; then
++            echo "ERROR: cannot $git_submodules_action git submodules without .git"
++            exit 1
++        fi
++    ;;
++    ignore)
++    ;;
++    *)
++        echo "ERROR: invalid --with-git-submodules= value '$git_submodules_action'"
++        exit 1
++    ;;
++esac
++
+ case "$cpu" in
+     ppc)
+            CPU_CFLAGS="-m32"
+@@ -1442,6 +1464,10 @@ Advanced options (experts only):
+   --install=INSTALL        use specified install [$install]
+   --python=PYTHON          use specified python [$python]
+   --smbd=SMBD              use specified smbd [$smbd]
++  --with-git=GIT           use specified git [$git]
++  --with-git-submodules=update   update git submodules (default if .git dir exists)
++  --with-git-submodules=validate fail if git submodules are not up to date
++  --with-git-submodules=ignore   do not update or check git submodules (default if no .git dir)
+   --static                 enable static build [$static]
+   --mandir=PATH            install man pages in PATH
+   --datadir=PATH           install firmware in PATH$confsuffix
+@@ -1601,7 +1627,7 @@ fi
+ # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ if test -z "$werror" ; then
+-    if test -d "$source_path/.git" -a \
++    if test $git_submodules_action != 'ignore' -a \
+         \( "$linux" = "yes" -o "$mingw32" = "yes" \) ; then
+         werror="yes"
+     else
+@@ -3667,10 +3693,10 @@ EOF
+     fdt=yes
+   else
+       # have GIT checkout, so activate dtc submodule
+-      if test -e "${source_path}/.git" ; then
++      if test $git_submodules_action != 'ignore' ; then
+           git_submodules="${git_submodules} dtc"
+       fi
+-      if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
++      if test -d "${source_path}/dtc/libfdt" || test $git_submodules_action != 'ignore' ; then
+           fdt=yes
+           dtc_internal="yes"
+           mkdir -p dtc
+@@ -4461,7 +4487,7 @@ case "$capstone" in
+   "" | yes)
+     if $pkg_config capstone; then
+       capstone=system
+-    elif test -e "${source_path}/.git" ; then
++    elif test $git_submodules_action != 'ignore' ; then
+       capstone=git
+     elif test -e "${source_path}/capstone/Makefile" ; then
+       capstone=internal
+@@ -5629,7 +5655,7 @@ echo "qemu_localedir=$qemu_localedir" >>
+ echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
+ echo "GIT=$git" >> $config_host_mak
+ echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
+-echo "GIT_UPDATE=$git_update" >> $config_host_mak
++echo "GIT_SUBMODULES_ACTION=$git_submodules_action" >> $config_host_mak
+ 
+ echo "ARCH=$ARCH" >> $config_host_mak
+ 
+--- a/scripts/git-submodule.sh
++++ b/scripts/git-submodule.sh
+@@ -9,9 +9,14 @@ command=$1
+ shift
+ maybe_modules="$@"
+ 
++# if --with-git-submodules=ignore, do nothing
++test "$command" = "ignore" && exit 0
++
+ test -z "$GIT" && GIT=git
+ 
+-error() {
++cd "$(dirname "$0")/.."
++
++update_error() {
+     echo "$0: $*"
+     echo
+     echo "Unable to automatically checkout GIT submodules '$modules'."
+@@ -24,7 +29,7 @@ error() {
+     echo "Alternatively you may disable automatic GIT submodule checkout"
+     echo "with:"
+     echo
+-    echo " $ ./configure --disable-git-update'"
++    echo " $ ./configure --with-git-submodules=validate"
+     echo
+     echo "and then manually update submodules prior to running make, with:"
+     echo
+@@ -33,6 +38,19 @@ error() {
+     exit 1
+ }
+ 
++validate_error() {
++    if test "$1" = "validate"; then
++        echo "GIT submodules checkout is out of date, and submodules"
++        echo "configured for validate only. Please run"
++        echo "  scripts/git-submodule.sh update $maybe_modules"
++        echo "from the source directory or call configure with"
++        echo "  --with-git-submodules=update"
++        echo "To disable GIT submodules validation, use"
++        echo "  --with-git-submodules=ignore"
++    fi
++    exit 1
++}
++
+ modules=""
+ for m in $maybe_modules
+ do
+@@ -52,17 +70,18 @@ then
+ fi
+ 
+ case "$command" in
+-status)
++status|validate)
+     if test -z "$maybe_modules"
+     then
+-         test -s ${substat} && exit 1 || exit 0
++         test -s ${substat} && validate_error "$command" || exit 0
+     fi
+ 
+-    test -f "$substat" || exit 1
+-    CURSTATUS=`$GIT submodule status $modules`
+-    OLDSTATUS=`cat $substat`
+-    test "$CURSTATUS" = "$OLDSTATUS"
+-    exit $?
++    test -f "$substat" || validate_error "$command"
++    CURSTATUS=$($GIT submodule status $modules)
++    OLDSTATUS=$(cat $substat)
++    if test "$CURSTATUS" != "$OLDSTATUS"; then
++        validate_error "$command"
++    fi
+     ;;
+ update)
+     if test -z "$maybe_modules"
+@@ -72,10 +91,10 @@ update)
+     fi
+ 
+     $GIT submodule update --init $modules 1>/dev/null
+-    test $? -ne 0 && error "failed to update modules"
++    test $? -ne 0 && update_error "failed to update modules"
+ 
+     $GIT submodule status $modules > "${substat}"
+-    test $? -ne 0 && error "failed to save git submodule status" >&2
++    test $? -ne 0 && update_error "failed to save git submodule status" >&2
+     ;;
+ esac
+ 
diff --git a/debian/rules b/debian/rules
index 366d686..33a4954 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ common_configure_opts = \
 	--disable-strip \
 	--interp-prefix=/etc/qemu-binfmt/%M \
 	--localstatedir=/var \
+	--with-git-submodules=ignore \
 
 # Cross compiling support
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))