migration to Tizen:Common
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>
Sun, 20 Apr 2014 14:56:08 +0000 (16:56 +0200)
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>
Sun, 20 Apr 2014 14:56:08 +0000 (16:56 +0200)
Change-Id: Ib0831d685a4b132cba0af52af04cfedc818e0387
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
84 files changed:
Makefile
common-repos.yaml [new file with mode: 0644]
common.yaml [new file with mode: 0644]
generic-repos.yaml [deleted file]
generic.yaml [deleted file]
ks/common-minimal-mbr-i586.yaml [new file with mode: 0644]
ks/common-minimal-mbr-x86_64.yaml [new file with mode: 0644]
ks/common-qa-unsafe-minimal-mbr-i586.yaml [new file with mode: 0644]
ks/common-qa-unsafe-minimal-mbr-x86_64.yaml [new file with mode: 0644]
ks/common-qa-unsafe-wayland-mbr-i586.yaml [new file with mode: 0644]
ks/common-qa-unsafe-wayland-mbr-x86_64.yaml [new file with mode: 0644]
ks/common-qa-unsafe-x11-mbr-i586.yaml [new file with mode: 0644]
ks/common-qa-unsafe-x11-mbr-x86_64.yaml [new file with mode: 0644]
ks/common-wayland-mbr-i586.yaml [new file with mode: 0644]
ks/common-wayland-mbr-x86_64.yaml [new file with mode: 0644]
ks/common-x11-mbr-i586.yaml [new file with mode: 0644]
ks/common-x11-mbr-x86_64.yaml [new file with mode: 0644]
ks/generic-minimal-mbr-i586.yaml [deleted file]
ks/generic-minimal-mbr-x86_64.yaml [deleted file]
ks/generic-qa-unsafe-minimal-mbr-i586.yaml [deleted file]
ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml [deleted file]
ks/generic-qa-unsafe-wayland-mbr-i586.yaml [deleted file]
ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml [deleted file]
ks/generic-qa-unsafe-x11-mbr-i586.yaml [deleted file]
ks/generic-qa-unsafe-x11-mbr-x86_64.yaml [deleted file]
ks/generic-wayland-mbr-i586.yaml [deleted file]
ks/generic-wayland-mbr-x86_64.yaml [deleted file]
ks/generic-x11-mbr-i586.yaml [deleted file]
ks/generic-x11-mbr-x86_64.yaml [deleted file]
packaging/meta-common.changes [moved from packaging/meta-generic.changes with 100% similarity]
packaging/meta-common.spec [moved from packaging/meta-generic.spec with 76% similarity]
partitions/README.common [moved from partitions/README.generic with 54% similarity]
partitions/common-mbr [moved from partitions/generic-mbr with 81% similarity]
patterns/common-adaptation.yaml [new file with mode: 0644]
patterns/common-applications.yaml [new file with mode: 0644]
patterns/common-autoqa.yaml [new file with mode: 0644]
patterns/common-base-micro.yaml [moved from patterns/generic-base-micro.yaml with 64% similarity]
patterns/common-base.yaml [moved from patterns/generic-base.yaml with 83% similarity]
patterns/common-bluetooth.yaml [moved from patterns/generic-bluetooth.yaml with 50% similarity]
patterns/common-console-tools.yaml [moved from patterns/generic-console-tools.yaml with 73% similarity]
patterns/common-crosswalk.yaml [new file with mode: 0644]
patterns/common-desktop-applications.yaml [new file with mode: 0644]
patterns/common-development.yaml [moved from patterns/generic-development.yaml with 84% similarity]
patterns/common-middleware.yaml [moved from patterns/generic-middleware.yaml with 71% similarity]
patterns/common-multimedia.yaml [moved from patterns/generic-multimedia.yaml with 77% similarity]
patterns/common-packaging.yaml [new file with mode: 0644]
patterns/common-qa.yaml [moved from patterns/generic-qa.yaml with 66% similarity]
patterns/common-qt5.yaml [new file with mode: 0644]
patterns/common-wayland.yaml [moved from patterns/generic-wayland.yaml with 51% similarity]
patterns/common-webkit.yaml [moved from patterns/generic-webkit.yaml with 79% similarity]
patterns/common-x11.yaml [moved from patterns/generic-x11.yaml with 69% similarity]
patterns/generic-adaptation.yaml [deleted file]
patterns/generic-applications.yaml [deleted file]
patterns/generic-autoqa.yaml [deleted file]
patterns/generic-crosswalk.yaml [deleted file]
patterns/generic-desktop-applications.yaml [deleted file]
patterns/generic-packaging.yaml [deleted file]
patterns/generic-qt5.yaml [deleted file]
scripts/common-adaptation.post [new file with mode: 0644]
scripts/common-applications.post [new file with mode: 0644]
scripts/common-autoqa.post [moved from scripts/generic-autoqa.post with 96% similarity]
scripts/common-base-micro.post [new file with mode: 0644]
scripts/common-base.post [moved from scripts/generic-base.post with 98% similarity]
scripts/common-bluetooth.post [new file with mode: 0644]
scripts/common-console-tools.post [moved from scripts/generic-console-tools.post with 92% similarity]
scripts/common-crosswalk.post [moved from scripts/generic-crosswalk.post with 95% similarity]
scripts/common-desktop-applications.post [moved from scripts/generic-desktop-applications.post with 76% similarity]
scripts/common-development.post [new file with mode: 0644]
scripts/common-middleware.post [new file with mode: 0644]
scripts/common-multimedia.post [moved from scripts/generic-multimedia.post with 83% similarity]
scripts/common-packaging.post [moved from scripts/generic-packaging.post with 50% similarity]
scripts/common-qa.post [new file with mode: 0644]
scripts/common-qt5.post [new file with mode: 0644]
scripts/common-wayland.post [moved from scripts/generic-wayland.post with 95% similarity]
scripts/common-webkit.post [moved from scripts/generic-webkit.post with 97% similarity]
scripts/common-x11.post [moved from scripts/generic-x11.post with 68% similarity]
scripts/generic-adaptation.post [deleted file]
scripts/generic-applications.post [deleted file]
scripts/generic-base-micro.post [deleted file]
scripts/generic-bluetooth.post [deleted file]
scripts/generic-development.post [deleted file]
scripts/generic-middleware.post [deleted file]
scripts/generic-qa.post [deleted file]
scripts/generic-qt5.post [deleted file]

index 9720056..4fd30ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # ex: set tabstop=4 noexpandtab: 
 VERSION = $(shell cat VERSION)
-NAME=meta-generic
+NAME=meta-common
 TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/")
 DESTDIR=
 ARCH=i586
@@ -14,19 +14,19 @@ endif
 all:
 
 install:
-       install -d ${DESTDIR}/usr/share/package-groups/generic
-       install -d ${DESTDIR}/usr/share/image-configurations/generic/configs
-       install -d ${DESTDIR}/usr/share/image-configurations/generic/scripts
-       install -d ${DESTDIR}/usr/share/image-configurations/generic/partitions
-       install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/generic
-       install -m 644 generic.yaml ${DESTDIR}/usr/share/image-configurations/generic
-       install -m 644 generic-repos.yaml ${DESTDIR}/usr/share/image-configurations/generic
-       install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/generic/configs
-       install -D partitions/* ${DESTDIR}/usr/share/image-configurations/generic/partitions
-       install -D scripts/* ${DESTDIR}/usr/share/image-configurations/generic/scripts
+       install -d ${DESTDIR}/usr/share/package-groups/common
+       install -d ${DESTDIR}/usr/share/image-configurations/common/configs
+       install -d ${DESTDIR}/usr/share/image-configurations/common/scripts
+       install -d ${DESTDIR}/usr/share/image-configurations/common/partitions
+       install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/common
+       install -m 644 common.yaml ${DESTDIR}/usr/share/image-configurations/common
+       install -m 644 common-repos.yaml ${DESTDIR}/usr/share/image-configurations/common
+       install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/common/configs
+       install -D partitions/* ${DESTDIR}/usr/share/image-configurations/common/partitions
+       install -D scripts/* ${DESTDIR}/usr/share/image-configurations/common/scripts
 
 test:
-       kickstarter -c generic.yaml -r generic-repos.yaml  -e ks/
+       kickstarter -c common.yaml -r common-repos.yaml  -e ks/
 tag:
        git tag -a $(VERSION) -m "$(VERSION)"
        git push --tags
diff --git a/common-repos.yaml b/common-repos.yaml
new file mode 100644 (file)
index 0000000..8275a5a
--- /dev/null
@@ -0,0 +1,17 @@
+Repositories:
+    -   Name: common-wayland_i586
+        Url:  http://download.tizen.org/snapshots/tizen/common/common-wayland-ia32/@BUILD_ID@/repos/common/ia32/packages/
+        Options: --ssl_verify=no
+
+    -   Name: common-wayland_x86_64
+        Url:  http://download.tizen.org/snapshots/tizen/common/common-wayland-x86_64/@BUILD_ID@/repos/common/x86_64/packages/
+        Options: --ssl_verify=no
+
+    -   Name: common-x11_i586
+        Url:  http://download.tizen.org/snapshots/tizen/common/common-x11-ia32/@BUILD_ID@/repos/common/ia32/packages/
+        Options: --ssl_verify=no
+
+    -   Name: common-x11_x86_64
+        Url:  http://download.tizen.org/snapshots/tizen/common/common-x11-x86_64/@BUILD_ID@/repos/common/x86_64/packages/
+        Options: --ssl_verify=no
+
diff --git a/common.yaml b/common.yaml
new file mode 100644 (file)
index 0000000..a55dcf2
--- /dev/null
@@ -0,0 +1,78 @@
+Default:
+    Baseline: tizen-3.0
+    Active: True
+    Mic2Options: -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
+    Part: common-mbr
+    Language: en_US.UTF-8
+    Keyboard: us
+    Timezone: America/Los_Angeles
+    RootPass: tizen
+    DefaultUser: guest
+    DefaultUserPass: tizen
+    BootLoader: True
+    BootloaderAppend: "rw vga=current splash rootwait rootfstype=ext4 plymouth.enable=0"
+    BootloaderTimeout: 3
+    BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"'
+    StartX: False
+    Desktop: None
+    Repos:
+        - Common
+    SaveRepos: False
+    UserGroups: "audio,video"
+    Groups:
+        - Common Base
+        - Common Console Tools
+        - Common Packaging
+    PostScripts:
+        - common-base
+        - common-console-tools
+        - common-packaging
+    NoChrootScripts:
+        - buildname
+
+Minimal:
+    Part: common-mbr
+
+Wayland:
+    Part: common-mbr
+    UserGroups: "audio,video"
+    Groups:
+        - Common Wayland
+        - Common Adaptation
+        - Common Middleware
+        - Common Applications
+        - Common Bluetooth
+        - Common Multimedia
+        - Common Desktop Applications
+        - Common Crosswalk
+    PostScripts:
+        - common-wayland
+        - common-adaptation
+        - common-middleware
+        - common-applications
+        - common-bluetooth
+        - common-multimedia
+        - common-desktop-applications
+        - common-crosswalk
+
+X11:
+    Part: common-mbr
+    Groups:
+        - Common X11
+        - Common Adaptation
+        - Common Middleware
+        - Common Applications
+        - Common Bluetooth
+        - Common Multimedia
+        - Common Webkit
+        - Common Desktop Applications
+    PostScripts:
+        - common-x11
+        - common-adaptation
+        - common-middleware
+        - common-applications
+        - common-bluetooth
+        - common-multimedia
+        - common-webkit
+        - common-desktop-applications
+
diff --git a/generic-repos.yaml b/generic-repos.yaml
deleted file mode 100644 (file)
index cccba81..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Repositories:
-    -   Name: generic-wayland_i586
-        Url:  http://download.tizen.org/snapshots/tizen/generic/generic-wayland-ia32/@BUILD_ID@/repos/generic/@ARCH@/packages/
-        Options: --ssl_verify=no
-
-    -   Name: generic-wayland_x86_64
-        Url:  http://download.tizen.org/snapshots/tizen/generic/generic-wayland-x86_64/@BUILD_ID@/repos/generic/@ARCH@/packages/
-        Options: --ssl_verify=no
-
-    -   Name: generic-x11_i586
-        Url:  http://download.tizen.org/snapshots/tizen/generic/generic-x11-ia32/@BUILD_ID@/repos/generic/@ARCH@/packages/
-        Options: --ssl_verify=no
-
-    -   Name: generic-x11_x86_64
-        Url:  http://download.tizen.org/snapshots/tizen/generic/generic-x11-x86_64/@BUILD_ID@/repos/generic/@ARCH@/packages/
-        Options: --ssl_verify=no
-
diff --git a/generic.yaml b/generic.yaml
deleted file mode 100644 (file)
index a3faca9..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-Default:
-    Baseline: tizen-3.0
-    Active: True
-    Mic2Options: -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap
-    Part: generic-mbr
-    Language: en_US.UTF-8
-    Keyboard: us
-    Timezone: America/Los_Angeles
-    RootPass: tizen
-    DefaultUser: guest
-    DefaultUserPass: tizen
-    BootLoader: True
-    BootloaderAppend: "rw vga=current splash rootwait rootfstype=ext4 plymouth.enable=0"
-    BootloaderTimeout: 3
-    BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"'
-    StartX: False
-    Desktop: None
-    Repos:
-        - Generic
-    SaveRepos: False
-    UserGroups: "audio,video"
-    Groups:
-        - Generic Base
-        - Generic Console Tools
-        - Generic Packaging
-    PostScripts:
-        - generic-base
-        - generic-console-tools
-        - generic-packaging
-    NoChrootScripts:
-        - buildname
-
-Minimal:
-    Part: generic-mbr
-
-Wayland:
-    Part: generic-mbr
-    UserGroups: "audio,video"
-    Groups:
-        - Generic Wayland
-        - Generic Adaptation
-        - Generic Middleware
-        - Generic Applications
-        - Generic Bluetooth
-        - Generic Multimedia
-        - Generic Desktop Applications
-        - Generic Crosswalk
-    PostScripts:
-        - generic-wayland
-        - generic-adaptation
-        - generic-middleware
-        - generic-applications
-        - generic-bluetooth
-        - generic-multimedia
-        - generic-desktop-applications
-        - generic-crosswalk
-
-X11:
-    Part: generic-mbr
-    Groups:
-        - Generic X11
-        - Generic Adaptation
-        - Generic Middleware
-        - Generic Applications
-        - Generic Bluetooth
-        - Generic Multimedia
-        - Generic Webkit
-        - Generic Desktop Applications
-    PostScripts:
-        - generic-x11
-        - generic-adaptation
-        - generic-middleware
-        - generic-applications
-        - generic-bluetooth
-        - generic-multimedia
-        - generic-webkit
-        - generic-desktop-applications
-
diff --git a/ks/common-minimal-mbr-i586.yaml b/ks/common-minimal-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..60fbe97
--- /dev/null
@@ -0,0 +1,9 @@
+Name: Common Minimal MBR i586
+Architecture: ia32
+Active: True
+Platform: Minimal
+Part: common-mbr
+FileName: common-minimal-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_i586
diff --git a/ks/common-minimal-mbr-x86_64.yaml b/ks/common-minimal-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..4d3545e
--- /dev/null
@@ -0,0 +1,9 @@
+Name: Common Minimal MBR x86_64
+Architecture: x86_64
+Active: True
+Platform: Minimal
+Part: common-mbr
+FileName: common-minimal-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_x86_64
diff --git a/ks/common-qa-unsafe-minimal-mbr-i586.yaml b/ks/common-qa-unsafe-minimal-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..70f6959
--- /dev/null
@@ -0,0 +1,13 @@
+Name: Common Minimal MBR i586
+Architecture: ia32
+Active: True
+Platform: Minimal
+Part: common-mbr
+FileName: common-minimal-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml b/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..c80e280
--- /dev/null
@@ -0,0 +1,13 @@
+Name: Common Minimal MBR x86_64
+Architecture: x86_64
+Active: True
+Platform: Minimal
+Part: common-mbr
+FileName: common-minimal-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_x86_64
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-qa-unsafe-wayland-mbr-i586.yaml b/ks/common-qa-unsafe-wayland-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..e85b011
--- /dev/null
@@ -0,0 +1,14 @@
+Name: Common QA Unsafe Wayland MBR i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+Part: common-mbr
+FileName: common-qa-unsafe-wayland-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml b/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..a5174bf
--- /dev/null
@@ -0,0 +1,14 @@
+Name: Common QA Unsafe Wayland MBR x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: Wayland
+Part: common-mbr
+FileName: common-qa-unsafe-wayland-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_x86_64
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-qa-unsafe-x11-mbr-i586.yaml b/ks/common-qa-unsafe-x11-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..d2a2515
--- /dev/null
@@ -0,0 +1,14 @@
+Name: Common QA Unsafe X11 MBR i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: X11
+Part: common-mbr
+FileName: common-qa-unsafe-x11-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-x11_i586
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-qa-unsafe-x11-mbr-x86_64.yaml b/ks/common-qa-unsafe-x11-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..cb9214c
--- /dev/null
@@ -0,0 +1,14 @@
+Name: Common QA Unsafe X11 MBR x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: X11
+Part: common-mbr
+FileName: common-qa-unsafe-x11-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-x11_x86_64
+Groups:
+    - Common Automated QA Tools
+PostScripts:
+    - common-autoqa
diff --git a/ks/common-wayland-mbr-i586.yaml b/ks/common-wayland-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..9d4fd81
--- /dev/null
@@ -0,0 +1,10 @@
+Name: Common Wayland MBR i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+Part: common-mbr
+FileName: common-wayland-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_i586
diff --git a/ks/common-wayland-mbr-x86_64.yaml b/ks/common-wayland-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..9bd7087
--- /dev/null
@@ -0,0 +1,10 @@
+Name: Common Wayland MBR x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: Wayland
+Part: common-mbr
+FileName: common-wayland-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-wayland_x86_64
diff --git a/ks/common-x11-mbr-i586.yaml b/ks/common-x11-mbr-i586.yaml
new file mode 100644 (file)
index 0000000..601e510
--- /dev/null
@@ -0,0 +1,10 @@
+Name: Common X11 MBR i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: X11
+Part: common-mbr
+FileName: common-x11-mbr-i586
+Kernel: kernel-x86-common
+Repos:
+    - common-x11_i586
diff --git a/ks/common-x11-mbr-x86_64.yaml b/ks/common-x11-mbr-x86_64.yaml
new file mode 100644 (file)
index 0000000..0c18a0b
--- /dev/null
@@ -0,0 +1,10 @@
+Name: Common X11 MBR x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: X11
+Part: common-mbr
+FileName: common-x11-mbr-x86_64
+Kernel: kernel-x86-common
+Repos:
+    - common-x11_x86_64
diff --git a/ks/generic-minimal-mbr-i586.yaml b/ks/generic-minimal-mbr-i586.yaml
deleted file mode 100644 (file)
index f473eb7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Name: Generic Minimal MBR i586
-Architecture: ia32
-Active: True
-Platform: Minimal
-Part: generic-mbr
-FileName: generic-minimal-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_i586
diff --git a/ks/generic-minimal-mbr-x86_64.yaml b/ks/generic-minimal-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 5b2482d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Name: Generic Minimal MBR x86_64
-Architecture: x86_64
-Active: True
-Platform: Minimal
-Part: generic-mbr
-FileName: generic-minimal-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_x86_64
diff --git a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml
deleted file mode 100644 (file)
index 626485b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: Generic Minimal MBR i586
-Architecture: ia32
-Active: True
-Platform: Minimal
-Part: generic-mbr
-FileName: generic-minimal-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_i586
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml b/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 1286541..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: Generic Minimal MBR x86_64
-Architecture: x86_64
-Active: True
-Platform: Minimal
-Part: generic-mbr
-FileName: generic-minimal-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_x86_64
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml
deleted file mode 100644 (file)
index 5ea7315..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Name: Generic QA Unsafe Wayland MBR i586
-Architecture: ia32
-Schedule: "*"
-Active: True
-Platform: Wayland
-Part: generic-mbr
-FileName: generic-qa-unsafe-wayland-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_i586
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 7f8dc28..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Name: Generic QA Unsafe Wayland MBR x86_64
-Architecture: x86_64
-Schedule: "*"
-Active: True
-Platform: Wayland
-Part: generic-mbr
-FileName: generic-qa-unsafe-wayland-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_x86_64
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-qa-unsafe-x11-mbr-i586.yaml b/ks/generic-qa-unsafe-x11-mbr-i586.yaml
deleted file mode 100644 (file)
index e40b43a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Name: Generic QA Unsafe X11 MBR i586
-Architecture: ia32
-Schedule: "*"
-Active: True
-Platform: X11
-Part: generic-mbr
-FileName: generic-qa-unsafe-x11-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-x11_i586
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml b/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 28b72d1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Name: Generic QA Unsafe X11 MBR x86_64
-Architecture: x86_64
-Schedule: "*"
-Active: True
-Platform: X11
-Part: generic-mbr
-FileName: generic-qa-unsafe-x11-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-x11_x86_64
-Groups:
-    - Generic Automated QA Tools
-PostScripts:
-    - generic-autoqa
diff --git a/ks/generic-wayland-mbr-i586.yaml b/ks/generic-wayland-mbr-i586.yaml
deleted file mode 100644 (file)
index b85cca2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Generic Wayland MBR i586
-Architecture: ia32
-Schedule: "*"
-Active: True
-Platform: Wayland
-Part: generic-mbr
-FileName: generic-wayland-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_i586
diff --git a/ks/generic-wayland-mbr-x86_64.yaml b/ks/generic-wayland-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 4131173..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Generic Wayland MBR x86_64
-Architecture: x86_64
-Schedule: "*"
-Active: True
-Platform: Wayland
-Part: generic-mbr
-FileName: generic-wayland-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-wayland_x86_64
diff --git a/ks/generic-x11-mbr-i586.yaml b/ks/generic-x11-mbr-i586.yaml
deleted file mode 100644 (file)
index 2574ca4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Generic X11 MBR i586
-Architecture: ia32
-Schedule: "*"
-Active: True
-Platform: X11
-Part: generic-mbr
-FileName: generic-x11-mbr-i586
-Kernel: kernel-x86-generic
-Repos:
-    - generic-x11_i586
diff --git a/ks/generic-x11-mbr-x86_64.yaml b/ks/generic-x11-mbr-x86_64.yaml
deleted file mode 100644 (file)
index 62fb1d7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Generic X11 MBR x86_64
-Architecture: x86_64
-Schedule: "*"
-Active: True
-Platform: X11
-Part: generic-mbr
-FileName: generic-x11-mbr-x86_64
-Kernel: kernel-x86-generic
-Repos:
-    - generic-x11_x86_64
similarity index 76%
rename from packaging/meta-generic.spec
rename to packaging/meta-common.spec
index e10c6f2..7cace06 100644 (file)
@@ -1,7 +1,7 @@
-%define profile generic
+%define profile common
 
-Summary:       Generic Meta Data
-Name:          meta-generic
+Summary:       Common Meta Data
+Name:          meta-common
 Version:       001
 Release:       1
 BuildArch:  noarch
@@ -11,8 +11,8 @@ URL:          http://www.tizen.org
 Source:                %{name}-%{version}.tar.bz2
 
 %description
-Generic Meta Data.
-Includes patterns and image configurations for Generic images.
+Common Meta Data.
+Includes patterns and image configurations for Common images.
 
 %prep
 %setup -q
similarity index 54%
rename from partitions/README.generic
rename to partitions/README.common
index c708236..9f1d2dc 100644 (file)
@@ -1,3 +1,3 @@
-generic-mbr partition file is for images using "legacy" mbr partitioning scheme.
+common-mbr partition file is for images using "legacy" mbr partitioning scheme.
 
 These files are referenced in the respective image ks files to set the partitioning accordingly
similarity index 81%
rename from partitions/generic-mbr
rename to partitions/common-mbr
index 5b79934..5ecadde 100644 (file)
@@ -1 +1 @@
-part / --fstype="ext4" --ondisk=sda --size=6144 --active --label tizen-generic
+part / --fstype="ext4" --ondisk=sda --size=6144 --active --label tizen-common
diff --git a/patterns/common-adaptation.yaml b/patterns/common-adaptation.yaml
new file mode 100644 (file)
index 0000000..aae04bc
--- /dev/null
@@ -0,0 +1,5 @@
+Summary: Common Adaptation
+Description: Common Adaptation
+Name: common-adaptation
+Packages:
+- linux-firmware
diff --git a/patterns/common-applications.yaml b/patterns/common-applications.yaml
new file mode 100644 (file)
index 0000000..80d63d7
--- /dev/null
@@ -0,0 +1,7 @@
+Summary: Common Applications
+Description: Common Applications
+Name: common-applications
+Packages:
+- ail
+- ca-certificates
+- ca-certificates-mozilla
diff --git a/patterns/common-autoqa.yaml b/patterns/common-autoqa.yaml
new file mode 100644 (file)
index 0000000..9a6e432
--- /dev/null
@@ -0,0 +1,7 @@
+Summary: Common Automated QA Tools
+Description: Common Automated QA Tools
+Name: common-autoqa
+Packages:
+- testkit-lite
+- screen
+- which
similarity index 64%
rename from patterns/generic-base-micro.yaml
rename to patterns/common-base-micro.yaml
index 754fd59..c914659 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Base Micro
-Description: Generic Base Micro
-Name: generic-base-micro
+Summary: Common Base Micro
+Description: Common Base Micro
+Name: common-base-micro
 Packages:
 - bluez
 - kmod
similarity index 83%
rename from patterns/generic-base.yaml
rename to patterns/common-base.yaml
index 6090af5..141443b 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Base
-Description: Generic Base
-Name: generic-base
+Summary: Common Base
+Description: Common Base
+Name: common-base
 Packages:
 - e2fsprogs
 - connman
similarity index 50%
rename from patterns/generic-bluetooth.yaml
rename to patterns/common-bluetooth.yaml
index b4cfc6b..7e07296 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Bluetooth
-Description: Generic Bluetooth
-Name: generic-bluetooth
+Summary: Common Bluetooth
+Description: Common Bluetooth
+Name: common-bluetooth
 Packages:
 - bluez
 - bluetooth-frwk
similarity index 73%
rename from patterns/generic-console-tools.yaml
rename to patterns/common-console-tools.yaml
index 552cac2..68076e9 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Console Tools
-Description: Generic Console Tools
-Name: generic-console-tools
+Summary: Common Console Tools
+Description: Common Console Tools
+Name: common-console-tools
 Packages:
 - snapper-zypp-plugin
 - tar
diff --git a/patterns/common-crosswalk.yaml b/patterns/common-crosswalk.yaml
new file mode 100644 (file)
index 0000000..71d91dc
--- /dev/null
@@ -0,0 +1,8 @@
+Summary: Common Crosswalk
+Description: Common Crosswalk
+Name: common-crosswalk
+Packages:
+- crosswalk
+- tizen-extensions-crosswalk
+- wrt-widgets
+
diff --git a/patterns/common-desktop-applications.yaml b/patterns/common-desktop-applications.yaml
new file mode 100644 (file)
index 0000000..c16e8f3
--- /dev/null
@@ -0,0 +1,9 @@
+Summary: Common Desktop Applications
+Description: Common Desktop Applications
+Name: common-desktop-applications
+Packages:
+- emotion
+#- econnman
+#- bluetooth-agent
+- net-config
+- org.tizen.calculator
similarity index 84%
rename from patterns/generic-development.yaml
rename to patterns/common-development.yaml
index 1259a12..26b1504 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Development
-Description: Generic Development
-Name: generic-development
+Summary: Common Development
+Description: Common Development
+Name: common-development
 Packages:
 - zip
 - unzip
similarity index 71%
rename from patterns/generic-middleware.yaml
rename to patterns/common-middleware.yaml
index 7aa7b6e..85ce583 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Middleware
-Description: Generic Middleware
-Name: generic-middleware
+Summary: Common Middleware
+Description: Common Middleware
+Name: common-middleware
 Packages:
 - calendar-service
 - csr-framework
similarity index 77%
rename from patterns/generic-multimedia.yaml
rename to patterns/common-multimedia.yaml
index b4388b4..4d2c455 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Multimedia
-Description: Generic Multimedia
-Name: generic-multimedia
+Summary: Common Multimedia
+Description: Common Multimedia
+Name: common-multimedia
 Packages:
 - alsa-utils
 - alsa-plugins-pulse
diff --git a/patterns/common-packaging.yaml b/patterns/common-packaging.yaml
new file mode 100644 (file)
index 0000000..1a17c08
--- /dev/null
@@ -0,0 +1,6 @@
+Summary: Common Packaging
+Description: Common Packaging
+Name: common-packaging
+Packages:
+- gpg2
+- zypper
similarity index 66%
rename from patterns/generic-qa.yaml
rename to patterns/common-qa.yaml
index 69e039c..4defad2 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic QA Tools
-Description: Generic QA Tools
-Name: generic-qa
+Summary: Common QA Tools
+Description: Common QA Tools
+Name: common-qa
 Packages:
 - bluez-test
 - connman-test
diff --git a/patterns/common-qt5.yaml b/patterns/common-qt5.yaml
new file mode 100644 (file)
index 0000000..71030b1
--- /dev/null
@@ -0,0 +1,5 @@
+Summary: Common QT5
+Description: Common QT5
+Name: common-qt5
+Packages:
+- qt5-tools
similarity index 51%
rename from patterns/generic-wayland.yaml
rename to patterns/common-wayland.yaml
index 2e694ae..9f9747e 100644 (file)
@@ -1,14 +1,14 @@
-Summary: Generic Wayland
-Description: Generic Wayland
-Name: generic-wayland
+Summary: Common Wayland
+Description: Common Wayland
+Name: common-wayland
 Packages:
 - cantarell-fonts
 - dejavu-fonts
 - weston
-- weston-generic
-- weston-generic-config
+- weston-common
+- weston-common-config
 - weston-clients
-- weston-generic-tz-launcher
+- weston-common-tz-launcher
 - mesa
 - xkeyboard-config
 - tizen-branding-default
similarity index 79%
rename from patterns/generic-webkit.yaml
rename to patterns/common-webkit.yaml
index 25950ab..5868caf 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic Webkit
-Description: Generic Webkit
-Name: generic-webkit
+Summary: Common Webkit
+Description: Common Webkit
+Name: common-webkit
 Packages:
 - wrt-widgets
 - wrt
similarity index 69%
rename from patterns/generic-x11.yaml
rename to patterns/common-x11.yaml
index c95e778..93d81f9 100644 (file)
@@ -1,6 +1,6 @@
-Summary: Generic X11
-Description: Generic X11
-Name: generic-x11
+Summary: Common X11
+Description: Common X11
+Name: common-x11
 Packages:
 - xorg-server
 - xf86-input-synaptics
diff --git a/patterns/generic-adaptation.yaml b/patterns/generic-adaptation.yaml
deleted file mode 100644 (file)
index f59df02..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Summary: Generic Adaptation
-Description: Generic Adaptation
-Name: generic-adaptation
-Packages:
-- linux-firmware
diff --git a/patterns/generic-applications.yaml b/patterns/generic-applications.yaml
deleted file mode 100644 (file)
index a7b2cc8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Generic Applications
-Description: Generic Applications
-Name: generic-applications
-Packages:
-- ail
-- ca-certificates
-- ca-certificates-mozilla
diff --git a/patterns/generic-autoqa.yaml b/patterns/generic-autoqa.yaml
deleted file mode 100644 (file)
index 4330b72..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Generic Automated QA Tools
-Description: Generic Automated QA Tools
-Name: generic-autoqa
-Packages:
-- testkit-lite
-- screen
-- which
diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml
deleted file mode 100644 (file)
index e391a87..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Summary: Generic Crosswalk
-Description: Generic Crosswalk
-Name: generic-crosswalk
-Packages:
-- crosswalk
-- tizen-extensions-crosswalk
-- wrt-widgets
-
diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml
deleted file mode 100644 (file)
index fc8a1e9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Summary: Generic Desktop Applications
-Description: Generic Desktop Applications
-Name: generic-desktop-applications
-Packages:
-- emotion
-#- econnman
-#- bluetooth-agent
-- net-config
-- org.tizen.calculator
diff --git a/patterns/generic-packaging.yaml b/patterns/generic-packaging.yaml
deleted file mode 100644 (file)
index 427f3f2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Summary: Generic Packaging
-Description: Generic Packaging
-Name: generic-packaging
-Packages:
-- gpg2
-- zypper
diff --git a/patterns/generic-qt5.yaml b/patterns/generic-qt5.yaml
deleted file mode 100644 (file)
index e37dcc9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Summary: Generic QT5
-Description: Generic QT5
-Name: generic-qt5
-Packages:
-- qt5-tools
diff --git a/scripts/common-adaptation.post b/scripts/common-adaptation.post
new file mode 100644 (file)
index 0000000..f40abd4
--- /dev/null
@@ -0,0 +1 @@
+############### common-adaptation.post ################
diff --git a/scripts/common-applications.post b/scripts/common-applications.post
new file mode 100644 (file)
index 0000000..5a7c804
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-applications.post ################
+
similarity index 96%
rename from scripts/generic-autoqa.post
rename to scripts/common-autoqa.post
index 952e88c..c34dc2a 100644 (file)
@@ -1,4 +1,4 @@
-##################### generic-autoqa.post #######################
+##################### common-autoqa.post #######################
 
 # generate private/public key for autologin as root
 
diff --git a/scripts/common-base-micro.post b/scripts/common-base-micro.post
new file mode 100644 (file)
index 0000000..cc211f5
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-base-micro.post ################
+
similarity index 98%
rename from scripts/generic-base.post
rename to scripts/common-base.post
index 3ce69b3..e0dca6b 100644 (file)
@@ -1,4 +1,4 @@
-################ generic-base.post ##################
+################ common-base.post ##################
 
 # setup systemd default target for user session
 cat <<'EOF' >>/lib/systemd/user/default.target
diff --git a/scripts/common-bluetooth.post b/scripts/common-bluetooth.post
new file mode 100644 (file)
index 0000000..6759999
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-bluetooth.post ################
+
similarity index 92%
rename from scripts/generic-console-tools.post
rename to scripts/common-console-tools.post
index decef35..75cbba0 100644 (file)
@@ -1,4 +1,4 @@
-##################### generic-console-tools.post ####################
+##################### common-console-tools.post ####################
 
 # customize bash prompt
 cat >/etc/profile.d/bash_prompt_custom.sh <<'EOF'
similarity index 95%
rename from scripts/generic-crosswalk.post
rename to scripts/common-crosswalk.post
index f32a535..071a5f7 100644 (file)
@@ -1,4 +1,4 @@
-############### generic-crosswalk.post ################
+############### common-crosswalk.post ################
 
 # Initialize the native application database
 pkg_initdb
similarity index 76%
rename from scripts/generic-desktop-applications.post
rename to scripts/common-desktop-applications.post
index ecf2e70..0368b71 100644 (file)
@@ -1,4 +1,4 @@
-############### generic-desktop-applications.post ################
+############### common-desktop-applications.post ################
 
 if [ -f /usr/bin/weston ]; then
 
diff --git a/scripts/common-development.post b/scripts/common-development.post
new file mode 100644 (file)
index 0000000..3d27306
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-development.post ################
+
diff --git a/scripts/common-middleware.post b/scripts/common-middleware.post
new file mode 100644 (file)
index 0000000..d3e9684
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-middleware.post ################
+
similarity index 83%
rename from scripts/generic-multimedia.post
rename to scripts/common-multimedia.post
index 3ee6c4b..e60e498 100644 (file)
@@ -1,4 +1,4 @@
-############### generic-multimedia.post ################
+############### common-multimedia.post ################
 
 if [ -f /usr/bin/weston ]; then
 
similarity index 50%
rename from scripts/generic-packaging.post
rename to scripts/common-packaging.post
index 95f5b9c..be7af54 100644 (file)
@@ -1,4 +1,4 @@
-############### generic-packaging.post ################
+############### common-packaging.post ################
 
 rm -rf /root/.zypp
 
@@ -23,9 +23,12 @@ gpgcheck=0
 EOF
 }
 
+arch=ia32
+[ -d /usr/lib64 ] && arch=x86_64
+
 if [ -x /usr/bin/weston ]; then
-       genrepo generic-wayland-@ARCH@ http://download.tizen.org/snapshots/tizen/generic/generic-wayland-@ARCH@/latest/repos/generic/@ARCH@/packages/
+       genrepo common-wayland-${arch} http://download.tizen.org/snapshots/tizen/common/common-wayland-${arch}/latest/repos/common/${arch}/packages/
 else
-       genrepo generic-x11-@ARCH@ http://download.tizen.org/snapshots/tizen/generic/generic-x11-@ARCH@/latest/repos/generic/@ARCH@/packages/
+       genrepo common-x11-${arch} http://download.tizen.org/snapshots/tizen/common/common-x11-${arch}/latest/repos/common/${arch}/packages/
 fi
 
diff --git a/scripts/common-qa.post b/scripts/common-qa.post
new file mode 100644 (file)
index 0000000..4d1f554
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-qa.post ################
+
diff --git a/scripts/common-qt5.post b/scripts/common-qt5.post
new file mode 100644 (file)
index 0000000..5122c67
--- /dev/null
@@ -0,0 +1,2 @@
+############### common-qt5.post ################
+
similarity index 95%
rename from scripts/generic-wayland.post
rename to scripts/common-wayland.post
index 33774c7..23f9cda 100644 (file)
@@ -1,4 +1,4 @@
-#################### generic-wayland.post ##################
+#################### common-wayland.post ##################
 
 # Add 'app' user to the display group
 /usr/sbin/groupmod -A app display
similarity index 97%
rename from scripts/generic-webkit.post
rename to scripts/common-webkit.post
index c41b119..c186deb 100644 (file)
@@ -1,4 +1,4 @@
-######### generic-webkit.post #############
+######### common-webkit.post #############
 
 ################ WAYLAND MODE #####################################
 # Add over-riding environment to enable the web runtime to
similarity index 68%
rename from scripts/generic-x11.post
rename to scripts/common-x11.post
index a5f0674..c9e848e 100644 (file)
@@ -1,4 +1,4 @@
-###################### generic-x11.post ###################
+###################### common-x11.post ###################
 
 # enable X11 forwarding on ssh
 echo "X11Forwarding yes" >>/etc/ssh/sshd_config
diff --git a/scripts/generic-adaptation.post b/scripts/generic-adaptation.post
deleted file mode 100644 (file)
index f0ba774..0000000
+++ /dev/null
@@ -1 +0,0 @@
-############### generic-adaptation.post ################
diff --git a/scripts/generic-applications.post b/scripts/generic-applications.post
deleted file mode 100644 (file)
index a24d02e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-applications.post ################
-
diff --git a/scripts/generic-base-micro.post b/scripts/generic-base-micro.post
deleted file mode 100644 (file)
index 0a2008d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-base-micro.post ################
-
diff --git a/scripts/generic-bluetooth.post b/scripts/generic-bluetooth.post
deleted file mode 100644 (file)
index 3d572d6..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-bluetooth.post ################
-
diff --git a/scripts/generic-development.post b/scripts/generic-development.post
deleted file mode 100644 (file)
index 002aed4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-development.post ################
-
diff --git a/scripts/generic-middleware.post b/scripts/generic-middleware.post
deleted file mode 100644 (file)
index a89c0a5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-middleware.post ################
-
diff --git a/scripts/generic-qa.post b/scripts/generic-qa.post
deleted file mode 100644 (file)
index 626d792..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-qa.post ################
-
diff --git a/scripts/generic-qt5.post b/scripts/generic-qt5.post
deleted file mode 100644 (file)
index 15ae1b5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-############### generic-qt5.post ################
-