From: Chan Lee Date: Wed, 9 Nov 2016 10:53:54 +0000 (+0900) Subject: Tizen:Base, Tizen:3.0:Base : adjust qemu_aggregate package (add explicit named binaries X-Git-Tag: submit/trunk/20170904.073139~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=285035ca155a9215043486fd95920818da86898c;p=scm%2Fmeta%2Fobs.git Tizen:Base, Tizen:3.0:Base : adjust qemu_aggregate package (add explicit named binaries for qemu related package) 1. separate packages to qemu and qemu-accel. 2. add x86_64 named binaries for 64-bit. 3. add x86 named binaries for 32-bit. Also keep binaries with old names. Change-Id: I6d495a1d68fe5e6af0b6d6a9f1fbf352e3f72e58 Signed-off-by: Chan Lee --- diff --git a/Tizen:3.0:Base/_meta b/Tizen:3.0:Base/_meta index 62932bf..a394c64 100644 --- a/Tizen:3.0:Base/_meta +++ b/Tizen:3.0:Base/_meta @@ -7,10 +7,12 @@ + + @@ -20,6 +22,7 @@ i586 + x86_64 i586 @@ -37,5 +40,6 @@ armv7l i586 + x86_64 diff --git a/Tizen:3.0:Base/qemu-accel_aggregate/_aggregate b/Tizen:3.0:Base/qemu-accel_aggregate/_aggregate new file mode 100644 index 0000000..55f1ef8 --- /dev/null +++ b/Tizen:3.0:Base/qemu-accel_aggregate/_aggregate @@ -0,0 +1,24 @@ + + + qemu-accel-armv7l + qemu-accel-armv7l + python-accel-armv7l + qemu-accel-x86-armv7l + python-accel-x86-armv7l + + + + qemu-accel-armv7l + qemu-accel-x86_64-armv7l + python-accel-x86_64-armv7l + + + + qemu-accel-aarch64 + qemu-accel-aarch64 + python-accel-aarch64 + qemu-accel-x86_64-aarch64 + python-accel-x86_64-aarch64 + + + diff --git a/Tizen:3.0:Base/qemu-accel_aggregate/_meta b/Tizen:3.0:Base/qemu-accel_aggregate/_meta new file mode 100644 index 0000000..e8b1229 --- /dev/null +++ b/Tizen:3.0:Base/qemu-accel_aggregate/_meta @@ -0,0 +1,14 @@ + + + <description/> + <build> + <disable/> + <enable arch="x86_64" repository="arm64"/> + <enable arch="x86_64" repository="arm"/> + <enable arch="i586" repository="arm"/> + <enable arch="x86_64" repository="x86_64"/> + <enable arch="i586" repository="ia32"/> + <enable arch="x86_64" repository="emulator64"/> + <enable arch="i586" repository="emulator32"/> + </build> +</package> diff --git a/Tizen:3.0:Base/qemu_aggregate/_aggregate b/Tizen:3.0:Base/qemu_aggregate/_aggregate index a209fb5..e3897a4 100644 --- a/Tizen:3.0:Base/qemu_aggregate/_aggregate +++ b/Tizen:3.0:Base/qemu_aggregate/_aggregate @@ -12,6 +12,8 @@ <aggregate project="Tools:qemu:2.7.x"> <package>qemu-linux-user</package> <binary>qemu-linux-user-cross</binary> + <binary>qemu-linux-user-x86-cross</binary> + <binary>qemu-linux-user-x86_64-cross</binary> <binary>qemu-linux-user</binary> <repository source="openSUSE_12.3" target="arm"/> <repository source="openSUSE_12.3" target="arm64"/> @@ -20,16 +22,4 @@ <repository source="openSUSE_12.3" target="emulator32"/> <repository source="openSUSE_12.3" target="emulator64"/> </aggregate> - <aggregate project="Tizen:3.0:Base" > - <package>qemu-accel-armv7l</package> - <binary>qemu-accel-armv7l</binary> - <binary>python-accel-armv7l</binary> - <repository source="ia32" target="arm"/> - </aggregate> - <aggregate project="Tizen:3.0:Base" > - <package>qemu-accel-aarch64</package> - <binary>qemu-accel-aarch64</binary> - <binary>python-accel-aarch64</binary> - <repository source="x86_64" target="arm64"/> - </aggregate> </aggregatelist> diff --git a/Tizen:3.0:Base/qemu_aggregate/_meta b/Tizen:3.0:Base/qemu_aggregate/_meta index de2e27a..e8b1229 100644 --- a/Tizen:3.0:Base/qemu_aggregate/_meta +++ b/Tizen:3.0:Base/qemu_aggregate/_meta @@ -4,6 +4,7 @@ <build> <disable/> <enable arch="x86_64" repository="arm64"/> + <enable arch="x86_64" repository="arm"/> <enable arch="i586" repository="arm"/> <enable arch="x86_64" repository="x86_64"/> <enable arch="i586" repository="ia32"/> diff --git a/Tizen:Base/_meta b/Tizen:Base/_meta index b6a6c8f..ee074ad 100644 --- a/Tizen:Base/_meta +++ b/Tizen:Base/_meta @@ -7,10 +7,12 @@ <person userid="hglee" role="maintainer"/> <build> <disable arch="i586" repository="arm"/> + <disable arch="x86_64" repository="arm"/> <disable arch="i586" repository="arm64"/> <disable arch="x86_64" repository="arm64"/> <disable arch="i586" repository="x86_64"/> <disable arch="i586" repository="emulator64"/> + <disable arch="x86_64" repository="ia32"/> </build> <debuginfo> <enable/> @@ -20,6 +22,7 @@ <arch>i586</arch> </repository> <repository name="ia32"> + <arch>x86_64</arch> <arch>i586</arch> </repository> <repository name="emulator64"> @@ -37,5 +40,6 @@ <repository name="arm"> <arch>armv7l</arch> <arch>i586</arch> + <arch>x86_64</arch> </repository> </project> diff --git a/Tizen:Base/qemu-accel_aggregate/_aggregate b/Tizen:Base/qemu-accel_aggregate/_aggregate new file mode 100644 index 0000000..76a8941 --- /dev/null +++ b/Tizen:Base/qemu-accel_aggregate/_aggregate @@ -0,0 +1,24 @@ +<aggregatelist> + <aggregate project="Tizen:Base" > + <package>qemu-accel-armv7l</package> + <binary>qemu-accel-armv7l</binary> + <binary>python-accel-armv7l</binary> + <binary>qemu-accel-x86-armv7l</binary> + <binary>python-accel-x86-armv7l</binary> + <repository source="ia32" target="arm"/> + </aggregate> + <aggregate project="Tizen:Base" > + <package>qemu-accel-armv7l</package> + <binary>qemu-accel-x86_64-armv7l</binary> + <binary>python-accel-x86_64-armv7l</binary> + <repository source="x86_64" target="arm"/> + </aggregate> + <aggregate project="Tizen:Base" > + <package>qemu-accel-aarch64</package> + <binary>qemu-accel-aarch64</binary> + <binary>python-accel-aarch64</binary> + <binary>qemu-accel-x86_64-aarch64</binary> + <binary>python-accel-x86_64-aarch64</binary> + <repository source="x86_64" target="arm64"/> + </aggregate> +</aggregatelist> diff --git a/Tizen:Base/qemu-accel_aggregate/_meta b/Tizen:Base/qemu-accel_aggregate/_meta new file mode 100644 index 0000000..2a8f2ab --- /dev/null +++ b/Tizen:Base/qemu-accel_aggregate/_meta @@ -0,0 +1,14 @@ +<package name="qemu_aggregate" project="Tizen:Base"> + <title/> + <description/> + <build> + <disable/> + <enable arch="x86_64" repository="arm64"/> + <enable arch="x86_64" repository="arm"/> + <enable arch="i586" repository="arm"/> + <enable arch="x86_64" repository="x86_64"/> + <enable arch="i586" repository="ia32"/> + <enable arch="x86_64" repository="emulator64"/> + <enable arch="i586" repository="emulator32"/> + </build> +</package> diff --git a/Tizen:Base/qemu_aggregate/_aggregate b/Tizen:Base/qemu_aggregate/_aggregate index 8fa8b0d..e3897a4 100644 --- a/Tizen:Base/qemu_aggregate/_aggregate +++ b/Tizen:Base/qemu_aggregate/_aggregate @@ -12,6 +12,8 @@ <aggregate project="Tools:qemu:2.7.x"> <package>qemu-linux-user</package> <binary>qemu-linux-user-cross</binary> + <binary>qemu-linux-user-x86-cross</binary> + <binary>qemu-linux-user-x86_64-cross</binary> <binary>qemu-linux-user</binary> <repository source="openSUSE_12.3" target="arm"/> <repository source="openSUSE_12.3" target="arm64"/> @@ -20,16 +22,4 @@ <repository source="openSUSE_12.3" target="emulator32"/> <repository source="openSUSE_12.3" target="emulator64"/> </aggregate> - <aggregate project="Tizen:Base" > - <package>qemu-accel-armv7l</package> - <binary>qemu-accel-armv7l</binary> - <binary>python-accel-armv7l</binary> - <repository source="ia32" target="arm"/> - </aggregate> - <aggregate project="Tizen:Base" > - <package>qemu-accel-aarch64</package> - <binary>qemu-accel-aarch64</binary> - <binary>python-accel-aarch64</binary> - <repository source="x86_64" target="arm64"/> - </aggregate> </aggregatelist> diff --git a/Tizen:Base/qemu_aggregate/_meta b/Tizen:Base/qemu_aggregate/_meta index 9f54698..2a8f2ab 100644 --- a/Tizen:Base/qemu_aggregate/_meta +++ b/Tizen:Base/qemu_aggregate/_meta @@ -4,6 +4,7 @@ <build> <disable/> <enable arch="x86_64" repository="arm64"/> + <enable arch="x86_64" repository="arm"/> <enable arch="i586" repository="arm"/> <enable arch="x86_64" repository="x86_64"/> <enable arch="i586" repository="ia32"/>