summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Qiang <qiang.z.zhang@intel.com>2014-06-27 17:24:57 +0800
committerZhang Qiang <qiang.z.zhang@intel.com>2014-06-27 17:24:57 +0800
commitc01c881acf104369efd6f797f345e599ace21124 (patch)
tree5287162c603c9337fef0b984ffeb06c8aa121235
parent6034343476ad55614416c4551ddc9242ce51d0e3 (diff)
downloadobs-c01c881acf104369efd6f797f345e599ace21124.tar.gz
obs-c01c881acf104369efd6f797f345e599ace21124.tar.bz2
obs-c01c881acf104369efd6f797f345e599ace21124.zip
util-linux should be in preinstall list for all archs
util-linux should not be just for arm or aarch64, it's also needed for ia32 and x86_64. without this patch, util-linux package will build failed using gbs Fixes: TINF-626 Change-Id: I81dce7d80245f88257a5ec1af68f129b663093ea Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
-rw-r--r--Tizen:Common/_config1
-rw-r--r--Tizen:IVI/_config7
2 files changed, 5 insertions, 3 deletions
diff --git a/Tizen:Common/_config b/Tizen:Common/_config
index e507656..dc41c77 100644
--- a/Tizen:Common/_config
+++ b/Tizen:Common/_config
@@ -347,6 +347,7 @@ Preinstall: liblua
Preinstall: smack libsmack libxml2 libmagic libmagic-data
Preinstall: libsqlite
Preinstall: rpm-security-plugin
+Preinstall: util-linux
VMinstall: perl libmount libblkid libext2fs libuuid grep libpcre util-linux
diff --git a/Tizen:IVI/_config b/Tizen:IVI/_config
index 0124105..34e427a 100644
--- a/Tizen:IVI/_config
+++ b/Tizen:IVI/_config
@@ -76,17 +76,17 @@ Keep: qemu-linux-user-cross-arm
%ifarch armv7hl
Preinstall: qemu-accel-armv7hl
Runscripts: qemu-accel-armv7hl
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
%endif
%ifarch armv7l
Preinstall: qemu-accel-armv7l-cross-arm
Runscripts: qemu-accel-armv7l-cross-arm
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
%endif
%ifarch armv7el
Preinstall: qemu-accel-armv7el
Runscripts: qemu-accel-armv7el
-Preinstall: util-linux libmount libblkid libuuid
+Preinstall: libmount libblkid libuuid
%endif
ExportFilter: ^qemu-linux-user-.*\.i686\.rpm$ . armv7l
@@ -111,6 +111,7 @@ Preinstall: liblua
Preinstall: smack libsmack libxml2 libmagic libmagic-data
Preinstall: libsqlite
Preinstall: rpm-security-plugin
+Preinstall: util-linux
VMinstall: perl libmount libblkid libext2fs libuuid grep libpcre util-linux