Merge remote-tracking branch 'origin/devel'submit/trunk/20211013.141059submit/trunk/20211013.113059submit/trunk/20211013.111059submit/trunk/20211013.103059submit/trunk/20211012.195059submit/trunk/20211012.140030submit/trunk/20211012.135059submit/trunk/20211012.133030submit/trunk/20211012.103030submit/trunk/20211012.095030submit/trunk/20211012.085030submit/trunk/20210903.134030accepted/tizen/devbase/tools/20211013.084003accepted/tizen/devbase/tools/20211013.010747accepted/tizen/devbase/tools/20211012.121058accepted/tizen/devbase/tools/20210903.085140

Change-Id: I7040cf26129d1195e593126be125efcdeab2a181

5 files changed, 21 insertions, 5 deletions

diff --git a/build-vm-kvm b/build-vm-kvm
index 641bc4d..c557317 100644
--- a/build-vm-kvm
+++ b/build-vm-kvm
@@ -22,6 +22,7 @@
 ################################################################
 
 kvm_bin=/usr/bin/qemu-kvm
+test ! -x $kvm_bin  -a -x /usr/bin/kvm && kvm_bin=/usr/bin/kvm
 kvm_console=ttyS0
 
 # assume virtio support by default
@@ -214,7 +215,7 @@ vm_verify_options_kvm() {
 
 vm_startup_kvm() {
     qemu_bin="$kvm_bin"
-    qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,serial=0,cache=unsafe -device "$kvm_device",drive=disk)
+    qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,cache=unsafe -device "$kvm_device",drive=disk,serial=0)
     if [ -n "$VM_USER" ] ; then
 	getent passwd "$VM_USER" > /dev/null || complain 22 "cannot find KVM user '$VM_USER'"
     else
@@ -223,7 +224,7 @@ vm_startup_kvm() {
     fi
     [ -n "$VM_USER" ] && kvm_options="$kvm_options -runas $VM_USER"
     if test -n "$VM_SWAP" ; then
-	qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,serial=1,cache=unsafe -device "$kvm_device",drive=swap)
+	qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,cache=unsafe -device "$kvm_device",drive=swap,serial=1)
     fi
     # the serial console device needs to be compiled into the target kernel
     # which is why we can not use virtio-serial on other platforms
diff --git a/debian/changelog b/debian/changelog
index a44a07b..92f1d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+build (20160629-tizen20210823) unstable; urgency=high
+
+  * update tizen version to tizen20210823
+  * Fix VMInstall package is not installed.
+  * Fix kvm support in Ubuntu.
+
+ -- Wang Biao <biao716.wang@samsung.com>  Mon, 23 Aug 2021 09:30:00 +0800
+
 build (20160629-tizen20210713) unstable; urgency=high
 
   * update tizen version to tizen20210713
diff --git a/init_buildsystem b/init_buildsystem
index de92390..30f4132 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -636,7 +636,7 @@ else
 	test -z "$LIST_STATE" && echo "expanding package dependencies..."
 	VMOPT=
 	test -z "$PREPARE_VM" || VMOPT=--vm
-	if ! $BUILD_DIR/expanddeps $USEUSEDFORBUILD $USEHIGHERDEPS "${definesnstuff[@]}" --dist "$BUILD_DIST" --depfile "$CACHE_FILE" --archpath "$BUILD_ARCH" --configdir $CONFIG_DIR "${PKGS[@]}" > $RPMLIST ; then
+	if ! $BUILD_DIR/expanddeps $USEUSEDFORBUILD $VMOPT $USEHIGHERDEPS "${definesnstuff[@]}" --dist "$BUILD_DIST" --depfile "$CACHE_FILE" --archpath "$BUILD_ARCH" --configdir $CONFIG_DIR "${PKGS[@]}" > $RPMLIST ; then
 	    rm -f $BUILD_IS_RUNNING
 	    cleanup_and_exit 1
 	fi
diff --git a/packaging/build.changes b/packaging/build.changes
index 8e8b1b5..f08dc58 100644
--- a/packaging/build.changes
+++ b/packaging/build.changes
@@ -1,4 +1,11 @@
 --------------------------------------------------------------------
+Mon Aug 23 09:30:00 CST 2021 - biao716.wang@samsung.com
+
+- update tizen version to tizen20210823
+- Fix kvm support in Ubuntu
+- Fix VMInstall package is not installed
+
+--------------------------------------------------------------------
 Tue Jul 13 09:30:00 CST 2021 - biao716.wang@samsung.com
 
 - update tizen version to tizen20210713
diff --git a/packaging/build.spec b/packaging/build.spec
index e1b2745..68c7460 100644
--- a/packaging/build.spec
+++ b/packaging/build.spec
@@ -72,7 +72,7 @@ Requires:       build-mkbaselibs
 %if 0%{?suse_version} > 1120 || 0%{?mdkversion}
 Recommends:     build-mkdrpms
 %endif
-Provides:   tizen-build = 20210713
+Provides:   tizen-build = 20210823
 %description
 This package provides a script for building RPMs for SUSE Linux in a
 chroot environment.
@@ -116,7 +116,7 @@ Group:          Development/Tools/Building
 Requires:       build
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
-Provides:       tizen-build-initvm-%{initvm_arch} = 20210713
+Provides:       tizen-build-initvm-%{initvm_arch} = 20210823
 Obsoletes:      build-initvm
 %if 0%{?suse_version}
 BuildRequires:  glibc-devel-static