change repo url to unified project

Change-Id: I79cbb1d278a51a67271ccbb8af26cf1dd88b0cb5
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>

diff --git a/common-repos.yaml b/common-repos.yaml
index fce3539..363c310 100644 (file)
--- a/common-repos.yaml
+++ b/common-repos.yaml
@@ -1,22 +1,10 @@
 Repositories:
-    -   Name: common-wayland_i586
-        Url:  http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/ia32-wayland/packages/
+    -   Name: unified-standard
+        Url:  http://download.tizen.org/snapshots/tizen/unified/@BUILD_ID@/repos/standard/packages/
         Options: --ssl_verify=no
 
-    -   Name: common-wayland_x86_64
-        Url:  http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/x86_64-wayland/packages/
-        Options: --ssl_verify=no
-
-    -   Name: common-wayland_armv7l
-        Url:  http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/arm-wayland/packages/
-        Options: --ssl_verify=no
-
-    -   Name: common-wayland_aarch64
-        Url:  http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/arm64-wayland/packages/
-        Options: --ssl_verify=no
-
-    -   Name: common-emulator-wayland_i586
-        Url:  http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/emulator32-wayland/packages/
+    -   Name: unified-emulator
+        Url:  http://download.tizen.org/snapshots/tizen/unified/@BUILD_ID@/repos/emulator/packages/
         Options: --ssl_verify=no
 
     -   Name: base_ia32
@@ -34,7 +22,3 @@ Repositories:
     -   Name: base_arm64
         Url:  http://download.tizen.org/snapshots/tizen/base/latest/repos/arm64/packages/
         Options: --ssl_verify=no
-
-    -   Name: base_emulator32
-        Url:  http://download.tizen.org/snapshots/tizen/base/latest/repos/emulator32/packages/
-        Options: --ssl_verify=no

diff --git a/common-targets.yaml b/common-targets.yaml
index 0a83432..ed77899 100644 (file)
--- a/common-targets.yaml
+++ b/common-targets.yaml
@@ -1,25 +1,14 @@
 ---
 Targets:
-    -   Name: ia32-wayland
+    -   Name: standard
         Images:
             - common-installer-mbr-i586.yaml
             - common-wayland-mbr-i586.yaml
             - common-wayland-efi-i586.yaml
-
-    -   Name: emulator32-wayland
-        Images:
-            - common-emulator-wayland-mbr-i586.yaml
-            - common-emulator-wayland-3parts-i586.yaml
-
-    -   Name: x86_64-wayland
-        Images:
             - common-installer-efi-x86_64.yaml
             - common-wayland-mbr-x86_64.yaml
             - common-wayland-efi-x86_64.yaml
             - common-minimal-mbr-x86_64.yaml
-
-    -   Name: arm-wayland
-        Images:
             - common-boot-armv7l-odroidu3.yaml
             - common-boot-armv7l-odroidxu3.yaml
             - common-boot-armv7l-artik5.yaml
@@ -29,9 +18,11 @@ Targets:
             - common-wayland-2parts-armv7l.yaml
             - common-wayland-3parts-armv7l-odroidu3.yaml
             - common-wayland-3parts-armv7l-artik.yaml
-
-    -   Name: arm64-wayland
-        Images:
             - common-wayland-3parts-arm64.yaml
             - common-boot-arm64-artik7.yaml
 
+
+    -   Name: emulator
+        Images:
+            - common-emulator-wayland-mbr-i586.yaml
+            - common-emulator-wayland-3parts-i586.yaml
\ No newline at end of file

diff --git a/ks/common-boot-arm64-artik7.yaml b/ks/common-boot-arm64-artik7.yaml
index cc02ed2..4494dd1 100644 (file)
--- a/ks/common-boot-arm64-artik7.yaml
+++ b/ks/common-boot-arm64-artik7.yaml
@@ -4,7 +4,7 @@ Schedule: "*"
 Active: True
 Platform: Boot-Artik7
 Part: common-artik-mbr-boot
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A aarch64 -f loop --pack-to=@NAME@.tar.gz
 FileName: common-boot-arm64-artik710
 Group: Common Boot Artik 7
 Attachment:
@@ -14,4 +14,4 @@ Attachment:
 - /boot/u-boot/params.bin
 - /boot/u-boot/fip-nonsecure.img
 Repos:
-- common-wayland_aarch64
+- unified-standard
\ No newline at end of file

diff --git a/ks/common-boot-armv7l-artik10.yaml b/ks/common-boot-armv7l-artik10.yaml
index dfc1171..609256a 100644 (file)
--- a/ks/common-boot-armv7l-artik10.yaml
+++ b/ks/common-boot-armv7l-artik10.yaml
@@ -4,7 +4,7 @@ Schedule: "*"
 Active: True
 Platform: Boot-Artik10
 Part: common-artik-mbr-boot
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-boot-armv7l-artik10
 Group: Common Boot Artik 10
 Attachment:
@@ -13,4 +13,4 @@ Attachment:
     - /boot/u-boot/params.bin
     - /boot/u-boot/u-boot.bin
 Repos:
-    - common-wayland_armv7l
+    - unified-standard

diff --git a/ks/common-boot-armv7l-artik5.yaml b/ks/common-boot-armv7l-artik5.yaml
index d42c968..9e5f7ea 100644 (file)
--- a/ks/common-boot-armv7l-artik5.yaml
+++ b/ks/common-boot-armv7l-artik5.yaml
@@ -4,7 +4,7 @@ Schedule: "*"
 Active: True
 Platform: Boot-Artik5
 Part: common-artik-mbr-boot
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-boot-armv7l-artik5
 Group: Common Boot Artik 5
 Attachment:
@@ -13,4 +13,4 @@ Attachment:
     - /boot/u-boot/params.bin
     - /boot/u-boot/u-boot.bin
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
\ No newline at end of file

diff --git a/ks/common-boot-armv7l-odroidu3.yaml b/ks/common-boot-armv7l-odroidu3.yaml
index fbb2d1d..47384aa 100644 (file)
--- a/ks/common-boot-armv7l-odroidu3.yaml
+++ b/ks/common-boot-armv7l-odroidu3.yaml
@@ -4,11 +4,11 @@ Schedule: "*"
 Active: True
 Platform: Boot-Odroidu3
 Part: common-mbr-boot
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-boot-armv7l-odroidu3
 Group: Common Boot Odroid U3
 Attachment:
     - /var/tmp/u-boot/u-boot-mmc.bin
     - /var/tmp/u-boot/params.bin
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
\ No newline at end of file

diff --git a/ks/common-boot-armv7l-odroidxu3.yaml b/ks/common-boot-armv7l-odroidxu3.yaml
index fa621a9..8ff97ce 100644 (file)
--- a/ks/common-boot-armv7l-odroidxu3.yaml
+++ b/ks/common-boot-armv7l-odroidxu3.yaml
@@ -4,11 +4,11 @@ Schedule: "*"
 Active: True
 Platform: Boot-Odroidxu3
 Part: common-mbr-boot
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-boot-armv7l-odroidxu3
 Group: Common Boot Odroid XU3
 Attachment:
     - /var/tmp/u-boot-xu3/u-boot-mmc.bin
     - /var/tmp/u-boot-xu3/params.bin
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
\ No newline at end of file

diff --git a/ks/common-emulator-wayland-3parts-i586.yaml b/ks/common-emulator-wayland-3parts-i586.yaml
index 36a301f..2ff1ed8 100644 (file)
--- a/ks/common-emulator-wayland-3parts-i586.yaml
+++ b/ks/common-emulator-wayland-3parts-i586.yaml
@@ -7,11 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr-3parts-emulator
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A i586 -f loop --pack-to=@NAME@.tar.gz
 FileName: common-emulator-wayland-3parts-i586
 Repos:
-    - common-emulator-wayland_i586
-    - base_emulator32
+    - unified-emulator
+    - base_ia32
 ExtraPackages:
     - sdbd
     - system-plugin-emulator

diff --git a/ks/common-emulator-wayland-mbr-i586.yaml b/ks/common-emulator-wayland-mbr-i586.yaml
index ef42333..d4717b4 100644 (file)
--- a/ks/common-emulator-wayland-mbr-i586.yaml
+++ b/ks/common-emulator-wayland-mbr-i586.yaml
@@ -7,12 +7,12 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
+Mic2Options: -A i586 -f loop --pack-to=@NAME@.tar.gz --copy-kernel
 FileName: common-emulator-wayland-mbr-i586
 Kernel: emulator-kernel
 Repos:
-    - common-emulator-wayland_i586
-    - base_emulator32
+    - unified-emulator
+    - base_ia32
 ExtraPackages:
     - sdbd
     - system-plugin-emulator

diff --git a/ks/common-headless-2parts-armv7l-rpi3.yaml b/ks/common-headless-2parts-armv7l-rpi3.yaml
index 65477a1..68bac67 100644 (file)
--- a/ks/common-headless-2parts-armv7l-rpi3.yaml
+++ b/ks/common-headless-2parts-armv7l-rpi3.yaml
@@ -4,10 +4,10 @@ Schedule: "*"
 Active: True
 Platform: RPi3
 Part: common-mbr-2parts-rpi3
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-headless-2parts-armv7l-rpi3
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
     - base_arm
 Groups:
     - Common Adaptation RPi3

diff --git a/ks/common-headless-3parts-armv7l-artik.yaml b/ks/common-headless-3parts-armv7l-artik.yaml
index 3ace160..0b79529 100644 (file)
--- a/ks/common-headless-3parts-armv7l-artik.yaml
+++ b/ks/common-headless-3parts-armv7l-artik.yaml
@@ -4,10 +4,10 @@ Schedule: "*"
 Active: True
 Platform: Artik
 Part: common-mbr-3parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-headless-3parts-armv7l-artik
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
     - base_arm
 Groups:
     - Common Adaptation Artik Headless

diff --git a/ks/common-installer-efi-x86_64.yaml b/ks/common-installer-efi-x86_64.yaml
index c701c63..6c1678d 100644 (file)
--- a/ks/common-installer-efi-x86_64.yaml
+++ b/ks/common-installer-efi-x86_64.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-efi
+Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-installer-efi-x86_64
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_x86_64
+    - unified-standard
     - base_x86_64
 Groups:
     - Generic Setup Boot

diff --git a/ks/common-installer-mbr-i586.yaml b/ks/common-installer-mbr-i586.yaml
index ea74d09..96dbd8b 100644 (file)
--- a/ks/common-installer-mbr-i586.yaml
+++ b/ks/common-installer-mbr-i586.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr
+Mic2Options: -A i586 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-installer-mbr-i586
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_i586
+    - unified-standard
     - base_ia32
 ExtraPackages:
     - system-installer

diff --git a/ks/common-minimal-mbr-x86_64.yaml b/ks/common-minimal-mbr-x86_64.yaml
index 64e31dd..f7babd6 100644 (file)
--- a/ks/common-minimal-mbr-x86_64.yaml
+++ b/ks/common-minimal-mbr-x86_64.yaml
@@ -7,11 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
+Mic2Options: -A x86_64 -f loop --pack-to=@NAME@.tar.gz --copy-kernel
 FileName: common-minimal-mbr-x86_64
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_x86_64
+    - unified-standard
     - base_x86_64
 Groups:
     - Generic Setup Boot Bios

diff --git a/ks/common-wayland-2parts-armv7l.yaml b/ks/common-wayland-2parts-armv7l.yaml
index cad7502..51f266e 100644 (file)
--- a/ks/common-wayland-2parts-armv7l.yaml
+++ b/ks/common-wayland-2parts-armv7l.yaml
@@ -4,11 +4,11 @@ Schedule: "*"
 Active: True
 Platform: Wayland
 Part: common-mbr-2parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz --copy-kernel
 FileName: common-wayland-2parts-armv7l
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
     - base_arm
 Groups:
     - Common Adaptation Intel

diff --git a/ks/common-wayland-3parts-arm64.yaml b/ks/common-wayland-3parts-arm64.yaml
index 2491dbb..02ac7e4 100644 (file)
--- a/ks/common-wayland-3parts-arm64.yaml
+++ b/ks/common-wayland-3parts-arm64.yaml
@@ -4,10 +4,10 @@ Schedule: "*"
 Active: True
 Platform: Wayland
 Part: common-mbr-3parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A aarch64 -f loop --pack-to=@NAME@.tar.gz
 FileName: common-wayland-3parts-arm64
 Repos:
-    - common-wayland_aarch64
+    - unified-standard
     - base_arm64
 Groups:
     - Common Adaptation Aarch64

diff --git a/ks/common-wayland-3parts-armv7l-artik.yaml b/ks/common-wayland-3parts-armv7l-artik.yaml
index 741b08a..c65f514 100644 (file)
--- a/ks/common-wayland-3parts-armv7l-artik.yaml
+++ b/ks/common-wayland-3parts-armv7l-artik.yaml
@@ -4,10 +4,10 @@ Schedule: "*"
 Active: True
 Platform: Artik
 Part: common-mbr-3parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-wayland-3parts-armv7l-artik
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
     - base_arm
 Groups:
     - Common Adaptation Artik

diff --git a/ks/common-wayland-3parts-armv7l-odroidu3.yaml b/ks/common-wayland-3parts-armv7l-odroidu3.yaml
index 8cc95ba..25f4a57 100644 (file)
--- a/ks/common-wayland-3parts-armv7l-odroidu3.yaml
+++ b/ks/common-wayland-3parts-armv7l-odroidu3.yaml
@@ -4,10 +4,10 @@ Schedule: "*"
 Active: True
 Platform: Wayland
 Part: common-3parts-ramdisk
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-wayland-3parts-armv7l-odroidu3
 Repos:
-    - common-wayland_armv7l
+    - unified-standard
     - base_arm
 Groups:
     - Common Adaptation Odroid

diff --git a/ks/common-wayland-efi-i586.yaml b/ks/common-wayland-efi-i586.yaml
index 55835d7..e194fd3 100644 (file)
--- a/ks/common-wayland-efi-i586.yaml
+++ b/ks/common-wayland-efi-i586.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-efi
+Mic2Options: -A i586 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-wayland-efi-i586
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_i586
+    - unified-standard
     - base_ia32
 Groups:
     - Common Adaptation Intel

diff --git a/ks/common-wayland-efi-x86_64.yaml b/ks/common-wayland-efi-x86_64.yaml
index 7a4f0bc..be9de84 100644 (file)
--- a/ks/common-wayland-efi-x86_64.yaml
+++ b/ks/common-wayland-efi-x86_64.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-efi
+Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-wayland-efi-x86_64
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_x86_64
+    - unified-standard
     - base_x86_64
 Groups:
     - Common Adaptation Intel

diff --git a/ks/common-wayland-mbr-i586.yaml b/ks/common-wayland-mbr-i586.yaml
index ce3063b..55addd2 100644 (file)
--- a/ks/common-wayland-mbr-i586.yaml
+++ b/ks/common-wayland-mbr-i586.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr
+Mic2Options: -A i586 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-wayland-mbr-i586
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_i586
+    - unified-standard
     - base_ia32
 Groups:
     - Common Adaptation Intel

diff --git a/ks/common-wayland-mbr-x86_64.yaml b/ks/common-wayland-mbr-x86_64.yaml
index 4471d83..ee645df 100644 (file)
--- a/ks/common-wayland-mbr-x86_64.yaml
+++ b/ks/common-wayland-mbr-x86_64.yaml
@@ -7,10 +7,11 @@ InstallerFrameworkPlugins:
     - bootloader
     - fstab
 Part: common-mbr
+Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
 FileName: common-wayland-mbr-x86_64
 Kernel: kernel-profile-common
 Repos:
-    - common-wayland_x86_64
+    - unified-standard
     - base_x86_64
 Groups:
     - Common Adaptation Intel