From be298668b36639a881418a566006f4991e236214689e2178842ffac5878e3ce5 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 7 Jun 2018 20:13:16 +0000 Subject: [PATCH] Accepting request 615066 from home:bfrogers:branches:Virtualization Tweak patch file generation to be more git version agnostic. Also change update_git.sh to not reformat spec file by default. OBS-URL: https://build.opensuse.org/request/show/615066 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=414 --- 0006-linux-user-add-binfmt-wrapper-for-a.patch | 1 - 0030-tests-Add-QOM-property-unit-tests.patch | 1 - 0031-tests-Add-scsi-disk-test.patch | 1 - qemu-linux-user.changes | 6 ++++++ qemu-testsuite.changes | 6 ++++++ qemu.changes | 6 ++++++ update_git.sh | 9 +++++++-- 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/0006-linux-user-add-binfmt-wrapper-for-a.patch b/0006-linux-user-add-binfmt-wrapper-for-a.patch index b28098df..9717c331 100644 --- a/0006-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0006-linux-user-add-binfmt-wrapper-for-a.patch @@ -34,7 +34,6 @@ Signed-off-by: Andreas Färber linux-user/Makefile.objs | 2 ++ linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) - create mode 100644 linux-user/binfmt.c diff --git a/Makefile.target b/Makefile.target index d0ec77a307..ddd1b0f1e9 100644 diff --git a/0030-tests-Add-QOM-property-unit-tests.patch b/0030-tests-Add-QOM-property-unit-tests.patch index b7c58b37..576cbb88 100644 --- a/0030-tests-Add-QOM-property-unit-tests.patch +++ b/0030-tests-Add-QOM-property-unit-tests.patch @@ -14,7 +14,6 @@ Signed-off-by: Andreas Färber tests/Makefile.include | 3 + tests/check-qom-props.c | 122 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) - create mode 100644 tests/check-qom-props.c diff --git a/MAINTAINERS b/MAINTAINERS index 24b70169bc..97a12a92fa 100644 diff --git a/0031-tests-Add-scsi-disk-test.patch b/0031-tests-Add-scsi-disk-test.patch index 73009ba0..67685b03 100644 --- a/0031-tests-Add-scsi-disk-test.patch +++ b/0031-tests-Add-scsi-disk-test.patch @@ -17,7 +17,6 @@ Signed-off-by: Andreas Färber tests/Makefile.include | 3 ++ tests/scsi-disk-test.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) - create mode 100644 tests/scsi-disk-test.c diff --git a/MAINTAINERS b/MAINTAINERS index 97a12a92fa..3546001872 100644 diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 05aeb92e..0cdd56b4 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 7 14:57:31 UTC 2018 - brogers@suse.com + +- Tweak patch file generation to be more git version agnostic. + Also change update_git.sh to not reformat spec file by default. + ------------------------------------------------------------------- Thu May 31 19:51:59 UTC 2018 - brogers@suse.com diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 2fb0188a..d95fa4bf 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 7 14:57:31 UTC 2018 - brogers@suse.com + +- Tweak patch file generation to be more git version agnostic. + Also change update_git.sh to not reformat spec file by default. + ------------------------------------------------------------------- Thu May 31 19:51:52 UTC 2018 - brogers@suse.com diff --git a/qemu.changes b/qemu.changes index 2fb0188a..d95fa4bf 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 7 14:57:31 UTC 2018 - brogers@suse.com + +- Tweak patch file generation to be more git version agnostic. + Also change update_git.sh to not reformat spec file by default. + ------------------------------------------------------------------- Thu May 31 19:51:52 UTC 2018 - brogers@suse.com diff --git a/update_git.sh b/update_git.sh index 3c9dc73d..4d6bb915 100644 --- a/update_git.sh +++ b/update_git.sh @@ -45,7 +45,7 @@ else (cd $GIT_DIR && git remote add upstream git://git.qemu-project.org/qemu.git) (cd $GIT_DIR && git remote update) fi -(cd $GIT_DIR && git format-patch -N $GIT_UPSTREAM_TAG --suffix= -o $CMP_DIR --no-renames >/dev/null) +(cd $GIT_DIR && git format-patch -N --stat=72 --indent-heuristic $GIT_UPSTREAM_TAG --suffix= -o $CMP_DIR --no-renames >/dev/null) QEMU_VERSION=`cat $GIT_DIR/VERSION` echo "QEMU version: $QEMU_VERSION" @@ -151,7 +151,12 @@ rm -rf $GIT_DIR rm -rf $CMP_DIR sed -e 's|^\(Name:.*qemu\)|\1-testsuite|' < qemu.spec > qemu-testsuite.spec -osc service localrun format_spec_file +sed -i 's/^# spec file for package qemu/&-testsuite/' qemu-testsuite.spec + +if [ "$1" = "-f" ]; then + echo "running osc service to format spec file" + osc service localrun format_spec_file +fi /bin/sh pre_checkin.sh -q