From: Jinkun Date: Mon, 8 Dec 2014 13:10:33 +0000 (-0800) Subject: add arm64 image X-Git-Tag: accepted/tizen/wearable/20141209.115537^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71ecc57d11f7dfbc6cc0e0b7457e281be0f82622;p=profile%2Fwearable%2Fmeta-wearable.git add arm64 image Change-Id: I9377bda651bb0432bd0b5aa9aa47e5b718b744ee --- diff --git a/ks/wearable-x11-2parts-armv7l.yaml b/ks/wearable-x11-2parts-armv7l.yaml deleted file mode 100644 index 77aa719..0000000 --- a/ks/wearable-x11-2parts-armv7l.yaml +++ /dev/null @@ -1,11 +0,0 @@ -Name: wearable-x11-2parts-armv7l -Architecture: armv7l -Schedule: "*" -Active: True -Platform: X11 -Part: common-mbr-2parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel -FileName: wearable-x11-2parts-armv7l -Kernel: kernel-profile-common -Repos: - - common-x11_armv7l diff --git a/ks/wearable-x11-3parts-arm64.yaml b/ks/wearable-x11-3parts-arm64.yaml new file mode 100644 index 0000000..f488cdb --- /dev/null +++ b/ks/wearable-x11-3parts-arm64.yaml @@ -0,0 +1,10 @@ +Name: wearable-x11-3parts-arm64 +Architecture: aarch64 +Schedule: "*" +Active: True +Platform: MinimalX11 +Part: common-mbr-3parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: wearable-x11-3parts-arm64 +Repos: + - common-x11_arm64 diff --git a/patterns/common-x11.yaml b/patterns/common-x11.yaml new file mode 100644 index 0000000..695e288 --- /dev/null +++ b/patterns/common-x11.yaml @@ -0,0 +1,6 @@ +Summary: Common X11 +Description: Common X11 +Name: common-x11 +Packages: +- x11-common +- desktop-skin diff --git a/scripts/common-x11.post b/scripts/common-x11.post new file mode 100644 index 0000000..e26eae0 --- /dev/null +++ b/scripts/common-x11.post @@ -0,0 +1,7 @@ +#!/bin/sh +echo "#################### common-x11.post ##################" + +# tag the background image with the current snapshot id +arch=$(rpm -qa | grep kernel-common | awk -F- '{printf("%s %s",$3,$4);}') +/usr/bin/mark_image.py /usr/share/backgrounds/tizen/current "Tizen Common: @BUILD_ID@ $arch" ffffff 50 90 95 95 + diff --git a/wearable-repos.yaml b/wearable-repos.yaml index 6c310f1..45429ef 100644 --- a/wearable-repos.yaml +++ b/wearable-repos.yaml @@ -10,3 +10,7 @@ Repositories: - Name: common-x11_armv7l Url: http://download.tizen.org/snapshots/tizen/wearable/@BUILD_ID@/repos/arm-x11/packages/ Options: --ssl_verify=no + + - Name: common-x11_arm64 + Url: http://download.tizen.org/snapshots/tizen/wearable/@BUILD_ID@/repos/arm64-x11/packages/ + Options: --ssl_verify=no diff --git a/wearable-targets.yaml b/wearable-targets.yaml index 8dce04c..06a6c15 100644 --- a/wearable-targets.yaml +++ b/wearable-targets.yaml @@ -3,9 +3,11 @@ Targets: - Name: arm-x11 Images: - wearable-boot-armv7l-odroidu3.yaml - - wearable-x11-2parts-armv7l.yaml - wearable-x11-3parts-armv7l-odroidu3.yaml + - Name: arm64-x11 + Images: + - wearable-x11-3parts-arm64.yaml # - Name: ia32-x11 # Images: # - wearable-x11-mbr-i586.yaml diff --git a/wearable.yaml b/wearable.yaml index f9cd36a..fc5be79 100644 --- a/wearable.yaml +++ b/wearable.yaml @@ -50,6 +50,7 @@ X11: UserGroups: "audio,video" Groups: - Generic X11 + - Common X11 - Generic Middleware - Common Middleware - Generic Applications @@ -63,6 +64,40 @@ X11: - Common Qt5 PostScripts: - generic-x11 + - common-x11 + - generic-middleware + - common-middleware + - generic-applications + - generic-bluetooth + - generic-multimedia + - generic-desktop-applications + - common-desktop-applications + - generic-crosswalk + - common-crosswalk + - generic-qt5 + - common-qt5 + Repos: [] + +MinimalX11: + Part: common-mbr + UserGroups: "audio,video" + Groups: + - Generic X11 + - Common X11 + - Generic Middleware + - Common Middleware + - Generic Applications + - Generic Bluetooth + - Generic Multimedia + - Generic Desktop Applications + - Common Desktop Applications + - Generic Crosswalk + - Common Crosswalk + - Generic Qt5 + - Common Qt5 + PostScripts: + - generic-x11 + - common-x11 - generic-middleware - common-middleware - generic-applications