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
This commit is contained in:
parent
206e7ad29d
commit
be298668b3
@ -34,7 +34,6 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
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
|
||||
|
@ -14,7 +14,6 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
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
|
||||
|
@ -17,7 +17,6 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user