Update build-config for common branch from OBS

Change-Id: Ibbcd123f31c601a0bbf8f06f7f473db353dd855a
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>

diff --git a/build-arm-wayland.conf b/build-arm-wayland.conf
index b6f52bdfb9b637cd623fd61a3161c12b73b3dbb1..c8c6044e13cf989ba8bc6f08ce87bc19b1e2aba7 100644 (file)
--- a/build-arm-wayland.conf
+++ b/build-arm-wayland.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-arm-x11.conf b/build-arm-x11.conf
index e8d5ff0f74e7f85334f1a85930ad7f531a535658..2da9b4ae5a9bea98f1fa88c9cef6cdbfd3f464bd 100644 (file)
--- a/build-arm-x11.conf
+++ b/build-arm-x11.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-arm64-wayland.conf b/build-arm64-wayland.conf
index 4d8795c6a7ff5870ca3c1c5e18e644bcdc0c29ba..367e719178e64613dad8312554271ab4d518d1c0 100644 (file)
--- a/build-arm64-wayland.conf
+++ b/build-arm64-wayland.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-arm64-x11.conf b/build-arm64-x11.conf
index 028c2387c4443c858597b11b2ab8d1d85c130ff3..3bce2efb7052344fc63f0b99b9f320b49f5c313d 100644 (file)
--- a/build-arm64-x11.conf
+++ b/build-arm64-x11.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-emulator32-wayland.conf b/build-emulator32-wayland.conf
index 9b90bf097c3dee37db937b20c117c5fc126ba8ec..17168b571ce7ce04fac9321ebd8293109924560f 100644 (file)
--- a/build-emulator32-wayland.conf
+++ b/build-emulator32-wayland.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-ia32-wayland.conf b/build-ia32-wayland.conf
index 95c65bfd1f1956f06ecdc67e5b314d799946f01e..3d111bb928dcb69b927d356c9a5cf15bcf84249d 100644 (file)
--- a/build-ia32-wayland.conf
+++ b/build-ia32-wayland.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-ia32-x11.conf b/build-ia32-x11.conf
index 7263faf77c5e68af7612734aad43e21db497611f..303170e0119915a46ba0ad6aad15987ff7be07f0 100644 (file)
--- a/build-ia32-x11.conf
+++ b/build-ia32-x11.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-x86_64-wayland.conf b/build-x86_64-wayland.conf
index 5c7b830485310594d0e5241a91603802b20657cb..531c394c3010be88a9c85f33d2d49d7c0b2a316c 100644 (file)
--- a/build-x86_64-wayland.conf
+++ b/build-x86_64-wayland.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64

diff --git a/build-x86_64-x11.conf b/build-x86_64-x11.conf
index 9ea99e45187af29b6a8f720086619fa867b5b690..605c212a651bb2a55ddf3f4df20fb9c79fb88131 100644 (file)
--- a/build-x86_64-x11.conf
+++ b/build-x86_64-x11.conf
@@ -350,6 +350,8 @@ Preinstall: libmount libblkid libuuid
 
 %ifarch aarch64
 Hostarch: x86_64
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 Preinstall: qemu-accel-aarch64-cross-aarch64
 Runscripts: qemu-accel-aarch64-cross-aarch64
 Preinstall: libmount libblkid libuuid
@@ -357,12 +359,6 @@ Preinstall: libmount libblkid libuuid
 
 ########## exports for different architectures ##########
 
-ExportFilter: ^qemu-linux-user.*\..*\.rpm$ . armv7l armv7hl aarch64
-
-ExportFilter: ^qemu-accel-armv7hl.*\..*\.rpm$ .  armv7hl
-ExportFilter: ^qemu-accel-armv7l.*\..*\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-aarch64.*\..*\.rpm$ .  aarch64
-
 ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.aarch64\.rpm$ aarch64
 ExportFilter: \.x86_64\.rpm$ x86_64