Update build-config for mobile branch from OBS

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

diff --git a/build-arm-x11.conf b/build-arm-x11.conf
index f1acd20..ef28a47 100644 (file)
--- a/build-arm-x11.conf
+++ b/build-arm-x11.conf
@@ -210,6 +210,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
@@ -217,12 +219,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
@@ -296,4 +292,4 @@ Substitute: glibc-devel-32bit
 
 ########## compilation flags ##########
 Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
-Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0
+Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-arm64-x11.conf b/build-arm64-x11.conf
index 50a9d6f..da25ec5 100644 (file)
--- a/build-arm64-x11.conf
+++ b/build-arm64-x11.conf
@@ -210,6 +210,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
@@ -217,12 +219,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
@@ -296,4 +292,4 @@ Substitute: glibc-devel-32bit
 
 ########## compilation flags ##########
 Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
-Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0
+Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-atom-x11.conf b/build-atom-x11.conf
index 2b2a6be..82f446e 100644 (file)
--- a/build-atom-x11.conf
+++ b/build-atom-x11.conf
@@ -210,6 +210,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
@@ -217,12 +219,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
@@ -296,4 +292,4 @@ Substitute: glibc-devel-32bit
 
 ########## compilation flags ##########
 Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
-Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0
+Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto

diff --git a/build-x86_64-x11.conf b/build-x86_64-x11.conf
index 4f53870..4728ee0 100644 (file)
--- a/build-x86_64-x11.conf
+++ b/build-x86_64-x11.conf
@@ -210,6 +210,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
@@ -217,12 +219,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
@@ -296,4 +292,4 @@ Substitute: glibc-devel-32bit
 
 ########## compilation flags ##########
 Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
-Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0
+Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector  -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto