From 800d619d6b9074edb58905768b20cf1d0a568758 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sun, 20 Apr 2014 16:56:08 +0200 Subject: [PATCH] migration to Tizen:Common Change-Id: Ib0831d685a4b132cba0af52af04cfedc818e0387 Signed-off-by: Stephane Desneux --- Makefile | 24 +++---- common-repos.yaml | 17 +++++ common.yaml | 78 ++++++++++++++++++++++ generic-repos.yaml | 17 ----- generic.yaml | 78 ---------------------- ks/common-minimal-mbr-i586.yaml | 9 +++ ks/common-minimal-mbr-x86_64.yaml | 9 +++ ks/common-qa-unsafe-minimal-mbr-i586.yaml | 13 ++++ ks/common-qa-unsafe-minimal-mbr-x86_64.yaml | 13 ++++ ks/common-qa-unsafe-wayland-mbr-i586.yaml | 14 ++++ ks/common-qa-unsafe-wayland-mbr-x86_64.yaml | 14 ++++ ks/common-qa-unsafe-x11-mbr-i586.yaml | 14 ++++ ks/common-qa-unsafe-x11-mbr-x86_64.yaml | 14 ++++ ks/common-wayland-mbr-i586.yaml | 10 +++ ks/common-wayland-mbr-x86_64.yaml | 10 +++ ks/common-x11-mbr-i586.yaml | 10 +++ ks/common-x11-mbr-x86_64.yaml | 10 +++ ks/generic-minimal-mbr-i586.yaml | 9 --- ks/generic-minimal-mbr-x86_64.yaml | 9 --- ks/generic-qa-unsafe-minimal-mbr-i586.yaml | 13 ---- ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml | 13 ---- ks/generic-qa-unsafe-wayland-mbr-i586.yaml | 14 ---- ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml | 14 ---- ks/generic-qa-unsafe-x11-mbr-i586.yaml | 14 ---- ks/generic-qa-unsafe-x11-mbr-x86_64.yaml | 14 ---- ks/generic-wayland-mbr-i586.yaml | 10 --- ks/generic-wayland-mbr-x86_64.yaml | 10 --- ks/generic-x11-mbr-i586.yaml | 10 --- ks/generic-x11-mbr-x86_64.yaml | 10 --- .../{meta-generic.changes => meta-common.changes} | 0 packaging/{meta-generic.spec => meta-common.spec} | 10 +-- partitions/{README.generic => README.common} | 2 +- partitions/{generic-mbr => common-mbr} | 2 +- patterns/common-adaptation.yaml | 5 ++ patterns/common-applications.yaml | 7 ++ patterns/common-autoqa.yaml | 7 ++ ...eric-base-micro.yaml => common-base-micro.yaml} | 6 +- patterns/{generic-base.yaml => common-base.yaml} | 6 +- ...eneric-bluetooth.yaml => common-bluetooth.yaml} | 6 +- ...onsole-tools.yaml => common-console-tools.yaml} | 6 +- patterns/common-crosswalk.yaml | 8 +++ patterns/common-desktop-applications.yaml | 9 +++ ...ic-development.yaml => common-development.yaml} | 6 +- ...eric-middleware.yaml => common-middleware.yaml} | 6 +- ...eric-multimedia.yaml => common-multimedia.yaml} | 6 +- patterns/common-packaging.yaml | 6 ++ patterns/{generic-qa.yaml => common-qa.yaml} | 6 +- patterns/common-qt5.yaml | 5 ++ .../{generic-wayland.yaml => common-wayland.yaml} | 12 ++-- .../{generic-webkit.yaml => common-webkit.yaml} | 6 +- patterns/{generic-x11.yaml => common-x11.yaml} | 6 +- patterns/generic-adaptation.yaml | 5 -- patterns/generic-applications.yaml | 7 -- patterns/generic-autoqa.yaml | 7 -- patterns/generic-crosswalk.yaml | 8 --- patterns/generic-desktop-applications.yaml | 9 --- patterns/generic-packaging.yaml | 6 -- patterns/generic-qt5.yaml | 5 -- scripts/common-adaptation.post | 1 + scripts/common-applications.post | 2 + .../{generic-autoqa.post => common-autoqa.post} | 2 +- scripts/common-base-micro.post | 2 + scripts/{generic-base.post => common-base.post} | 2 +- scripts/common-bluetooth.post | 2 + ...onsole-tools.post => common-console-tools.post} | 2 +- ...eneric-crosswalk.post => common-crosswalk.post} | 2 +- ...tions.post => common-desktop-applications.post} | 2 +- scripts/common-development.post | 2 + scripts/common-middleware.post | 2 + ...eric-multimedia.post => common-multimedia.post} | 2 +- ...eneric-packaging.post => common-packaging.post} | 9 ++- scripts/common-qa.post | 2 + scripts/common-qt5.post | 2 + .../{generic-wayland.post => common-wayland.post} | 2 +- .../{generic-webkit.post => common-webkit.post} | 2 +- scripts/{generic-x11.post => common-x11.post} | 2 +- scripts/generic-adaptation.post | 1 - scripts/generic-applications.post | 2 - scripts/generic-base-micro.post | 2 - scripts/generic-bluetooth.post | 2 - scripts/generic-development.post | 2 - scripts/generic-middleware.post | 2 - scripts/generic-qa.post | 2 - scripts/generic-qt5.post | 2 - 84 files changed, 367 insertions(+), 364 deletions(-) create mode 100644 common-repos.yaml create mode 100644 common.yaml delete mode 100644 generic-repos.yaml delete mode 100644 generic.yaml create mode 100644 ks/common-minimal-mbr-i586.yaml create mode 100644 ks/common-minimal-mbr-x86_64.yaml create mode 100644 ks/common-qa-unsafe-minimal-mbr-i586.yaml create mode 100644 ks/common-qa-unsafe-minimal-mbr-x86_64.yaml create mode 100644 ks/common-qa-unsafe-wayland-mbr-i586.yaml create mode 100644 ks/common-qa-unsafe-wayland-mbr-x86_64.yaml create mode 100644 ks/common-qa-unsafe-x11-mbr-i586.yaml create mode 100644 ks/common-qa-unsafe-x11-mbr-x86_64.yaml create mode 100644 ks/common-wayland-mbr-i586.yaml create mode 100644 ks/common-wayland-mbr-x86_64.yaml create mode 100644 ks/common-x11-mbr-i586.yaml create mode 100644 ks/common-x11-mbr-x86_64.yaml delete mode 100644 ks/generic-minimal-mbr-i586.yaml delete mode 100644 ks/generic-minimal-mbr-x86_64.yaml delete mode 100644 ks/generic-qa-unsafe-minimal-mbr-i586.yaml delete mode 100644 ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml delete mode 100644 ks/generic-qa-unsafe-wayland-mbr-i586.yaml delete mode 100644 ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml delete mode 100644 ks/generic-qa-unsafe-x11-mbr-i586.yaml delete mode 100644 ks/generic-qa-unsafe-x11-mbr-x86_64.yaml delete mode 100644 ks/generic-wayland-mbr-i586.yaml delete mode 100644 ks/generic-wayland-mbr-x86_64.yaml delete mode 100644 ks/generic-x11-mbr-i586.yaml delete mode 100644 ks/generic-x11-mbr-x86_64.yaml rename packaging/{meta-generic.changes => meta-common.changes} (100%) rename packaging/{meta-generic.spec => meta-common.spec} (76%) rename partitions/{README.generic => README.common} (54%) rename partitions/{generic-mbr => common-mbr} (81%) create mode 100644 patterns/common-adaptation.yaml create mode 100644 patterns/common-applications.yaml create mode 100644 patterns/common-autoqa.yaml rename patterns/{generic-base-micro.yaml => common-base-micro.yaml} (64%) rename patterns/{generic-base.yaml => common-base.yaml} (83%) rename patterns/{generic-bluetooth.yaml => common-bluetooth.yaml} (50%) rename patterns/{generic-console-tools.yaml => common-console-tools.yaml} (73%) create mode 100644 patterns/common-crosswalk.yaml create mode 100644 patterns/common-desktop-applications.yaml rename patterns/{generic-development.yaml => common-development.yaml} (84%) rename patterns/{generic-middleware.yaml => common-middleware.yaml} (71%) rename patterns/{generic-multimedia.yaml => common-multimedia.yaml} (77%) create mode 100644 patterns/common-packaging.yaml rename patterns/{generic-qa.yaml => common-qa.yaml} (66%) create mode 100644 patterns/common-qt5.yaml rename patterns/{generic-wayland.yaml => common-wayland.yaml} (51%) rename patterns/{generic-webkit.yaml => common-webkit.yaml} (79%) rename patterns/{generic-x11.yaml => common-x11.yaml} (69%) delete mode 100644 patterns/generic-adaptation.yaml delete mode 100644 patterns/generic-applications.yaml delete mode 100644 patterns/generic-autoqa.yaml delete mode 100644 patterns/generic-crosswalk.yaml delete mode 100644 patterns/generic-desktop-applications.yaml delete mode 100644 patterns/generic-packaging.yaml delete mode 100644 patterns/generic-qt5.yaml create mode 100644 scripts/common-adaptation.post create mode 100644 scripts/common-applications.post rename scripts/{generic-autoqa.post => common-autoqa.post} (96%) create mode 100644 scripts/common-base-micro.post rename scripts/{generic-base.post => common-base.post} (98%) create mode 100644 scripts/common-bluetooth.post rename scripts/{generic-console-tools.post => common-console-tools.post} (92%) rename scripts/{generic-crosswalk.post => common-crosswalk.post} (95%) rename scripts/{generic-desktop-applications.post => common-desktop-applications.post} (76%) create mode 100644 scripts/common-development.post create mode 100644 scripts/common-middleware.post rename scripts/{generic-multimedia.post => common-multimedia.post} (83%) rename scripts/{generic-packaging.post => common-packaging.post} (50%) create mode 100644 scripts/common-qa.post create mode 100644 scripts/common-qt5.post rename scripts/{generic-wayland.post => common-wayland.post} (95%) rename scripts/{generic-webkit.post => common-webkit.post} (97%) rename scripts/{generic-x11.post => common-x11.post} (68%) delete mode 100644 scripts/generic-adaptation.post delete mode 100644 scripts/generic-applications.post delete mode 100644 scripts/generic-base-micro.post delete mode 100644 scripts/generic-bluetooth.post delete mode 100644 scripts/generic-development.post delete mode 100644 scripts/generic-middleware.post delete mode 100644 scripts/generic-qa.post delete mode 100644 scripts/generic-qt5.post diff --git a/Makefile b/Makefile index 9720056..4fd30ee 100644 --- 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 index 0000000..8275a5a --- /dev/null +++ b/common-repos.yaml @@ -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 index 0000000..a55dcf2 --- /dev/null +++ b/common.yaml @@ -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 index cccba81..0000000 --- a/generic-repos.yaml +++ /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 index a3faca9..0000000 --- a/generic.yaml +++ /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 index 0000000..60fbe97 --- /dev/null +++ b/ks/common-minimal-mbr-i586.yaml @@ -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 index 0000000..4d3545e --- /dev/null +++ b/ks/common-minimal-mbr-x86_64.yaml @@ -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 index 0000000..70f6959 --- /dev/null +++ b/ks/common-qa-unsafe-minimal-mbr-i586.yaml @@ -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 index 0000000..c80e280 --- /dev/null +++ b/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml @@ -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 index 0000000..e85b011 --- /dev/null +++ b/ks/common-qa-unsafe-wayland-mbr-i586.yaml @@ -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 index 0000000..a5174bf --- /dev/null +++ b/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml @@ -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 index 0000000..d2a2515 --- /dev/null +++ b/ks/common-qa-unsafe-x11-mbr-i586.yaml @@ -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 index 0000000..cb9214c --- /dev/null +++ b/ks/common-qa-unsafe-x11-mbr-x86_64.yaml @@ -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 index 0000000..9d4fd81 --- /dev/null +++ b/ks/common-wayland-mbr-i586.yaml @@ -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 index 0000000..9bd7087 --- /dev/null +++ b/ks/common-wayland-mbr-x86_64.yaml @@ -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 index 0000000..601e510 --- /dev/null +++ b/ks/common-x11-mbr-i586.yaml @@ -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 index 0000000..0c18a0b --- /dev/null +++ b/ks/common-x11-mbr-x86_64.yaml @@ -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 index f473eb7..0000000 --- a/ks/generic-minimal-mbr-i586.yaml +++ /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 index 5b2482d..0000000 --- a/ks/generic-minimal-mbr-x86_64.yaml +++ /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 index 626485b..0000000 --- a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml +++ /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 index 1286541..0000000 --- a/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml +++ /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 index 5ea7315..0000000 --- a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml +++ /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 index 7f8dc28..0000000 --- a/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml +++ /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 index e40b43a..0000000 --- a/ks/generic-qa-unsafe-x11-mbr-i586.yaml +++ /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 index 28b72d1..0000000 --- a/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml +++ /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 index b85cca2..0000000 --- a/ks/generic-wayland-mbr-i586.yaml +++ /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 index 4131173..0000000 --- a/ks/generic-wayland-mbr-x86_64.yaml +++ /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 index 2574ca4..0000000 --- a/ks/generic-x11-mbr-i586.yaml +++ /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 index 62fb1d7..0000000 --- a/ks/generic-x11-mbr-x86_64.yaml +++ /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 diff --git a/packaging/meta-generic.changes b/packaging/meta-common.changes similarity index 100% rename from packaging/meta-generic.changes rename to packaging/meta-common.changes diff --git a/packaging/meta-generic.spec b/packaging/meta-common.spec similarity index 76% rename from packaging/meta-generic.spec rename to packaging/meta-common.spec index e10c6f2..7cace06 100644 --- a/packaging/meta-generic.spec +++ b/packaging/meta-common.spec @@ -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 diff --git a/partitions/README.generic b/partitions/README.common similarity index 54% rename from partitions/README.generic rename to partitions/README.common index c708236..9f1d2dc 100644 --- a/partitions/README.generic +++ b/partitions/README.common @@ -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 diff --git a/partitions/generic-mbr b/partitions/common-mbr similarity index 81% rename from partitions/generic-mbr rename to partitions/common-mbr index 5b79934..5ecadde 100644 --- a/partitions/generic-mbr +++ b/partitions/common-mbr @@ -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 index 0000000..aae04bc --- /dev/null +++ b/patterns/common-adaptation.yaml @@ -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 index 0000000..80d63d7 --- /dev/null +++ b/patterns/common-applications.yaml @@ -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 index 0000000..9a6e432 --- /dev/null +++ b/patterns/common-autoqa.yaml @@ -0,0 +1,7 @@ +Summary: Common Automated QA Tools +Description: Common Automated QA Tools +Name: common-autoqa +Packages: +- testkit-lite +- screen +- which diff --git a/patterns/generic-base-micro.yaml b/patterns/common-base-micro.yaml similarity index 64% rename from patterns/generic-base-micro.yaml rename to patterns/common-base-micro.yaml index 754fd59..c914659 100644 --- a/patterns/generic-base-micro.yaml +++ b/patterns/common-base-micro.yaml @@ -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 diff --git a/patterns/generic-base.yaml b/patterns/common-base.yaml similarity index 83% rename from patterns/generic-base.yaml rename to patterns/common-base.yaml index 6090af5..141443b 100644 --- a/patterns/generic-base.yaml +++ b/patterns/common-base.yaml @@ -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 diff --git a/patterns/generic-bluetooth.yaml b/patterns/common-bluetooth.yaml similarity index 50% rename from patterns/generic-bluetooth.yaml rename to patterns/common-bluetooth.yaml index b4cfc6b..7e07296 100644 --- a/patterns/generic-bluetooth.yaml +++ b/patterns/common-bluetooth.yaml @@ -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 diff --git a/patterns/generic-console-tools.yaml b/patterns/common-console-tools.yaml similarity index 73% rename from patterns/generic-console-tools.yaml rename to patterns/common-console-tools.yaml index 552cac2..68076e9 100644 --- a/patterns/generic-console-tools.yaml +++ b/patterns/common-console-tools.yaml @@ -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 index 0000000..71d91dc --- /dev/null +++ b/patterns/common-crosswalk.yaml @@ -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 index 0000000..c16e8f3 --- /dev/null +++ b/patterns/common-desktop-applications.yaml @@ -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 diff --git a/patterns/generic-development.yaml b/patterns/common-development.yaml similarity index 84% rename from patterns/generic-development.yaml rename to patterns/common-development.yaml index 1259a12..26b1504 100644 --- a/patterns/generic-development.yaml +++ b/patterns/common-development.yaml @@ -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 diff --git a/patterns/generic-middleware.yaml b/patterns/common-middleware.yaml similarity index 71% rename from patterns/generic-middleware.yaml rename to patterns/common-middleware.yaml index 7aa7b6e..85ce583 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/common-middleware.yaml @@ -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 diff --git a/patterns/generic-multimedia.yaml b/patterns/common-multimedia.yaml similarity index 77% rename from patterns/generic-multimedia.yaml rename to patterns/common-multimedia.yaml index b4388b4..4d2c455 100644 --- a/patterns/generic-multimedia.yaml +++ b/patterns/common-multimedia.yaml @@ -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 index 0000000..1a17c08 --- /dev/null +++ b/patterns/common-packaging.yaml @@ -0,0 +1,6 @@ +Summary: Common Packaging +Description: Common Packaging +Name: common-packaging +Packages: +- gpg2 +- zypper diff --git a/patterns/generic-qa.yaml b/patterns/common-qa.yaml similarity index 66% rename from patterns/generic-qa.yaml rename to patterns/common-qa.yaml index 69e039c..4defad2 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/common-qa.yaml @@ -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 index 0000000..71030b1 --- /dev/null +++ b/patterns/common-qt5.yaml @@ -0,0 +1,5 @@ +Summary: Common QT5 +Description: Common QT5 +Name: common-qt5 +Packages: +- qt5-tools diff --git a/patterns/generic-wayland.yaml b/patterns/common-wayland.yaml similarity index 51% rename from patterns/generic-wayland.yaml rename to patterns/common-wayland.yaml index 2e694ae..9f9747e 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/common-wayland.yaml @@ -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 diff --git a/patterns/generic-webkit.yaml b/patterns/common-webkit.yaml similarity index 79% rename from patterns/generic-webkit.yaml rename to patterns/common-webkit.yaml index 25950ab..5868caf 100644 --- a/patterns/generic-webkit.yaml +++ b/patterns/common-webkit.yaml @@ -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 diff --git a/patterns/generic-x11.yaml b/patterns/common-x11.yaml similarity index 69% rename from patterns/generic-x11.yaml rename to patterns/common-x11.yaml index c95e778..93d81f9 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/common-x11.yaml @@ -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 index f59df02..0000000 --- a/patterns/generic-adaptation.yaml +++ /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 index a7b2cc8..0000000 --- a/patterns/generic-applications.yaml +++ /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 index 4330b72..0000000 --- a/patterns/generic-autoqa.yaml +++ /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 index e391a87..0000000 --- a/patterns/generic-crosswalk.yaml +++ /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 index fc8a1e9..0000000 --- a/patterns/generic-desktop-applications.yaml +++ /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 index 427f3f2..0000000 --- a/patterns/generic-packaging.yaml +++ /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 index e37dcc9..0000000 --- a/patterns/generic-qt5.yaml +++ /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 index 0000000..f40abd4 --- /dev/null +++ b/scripts/common-adaptation.post @@ -0,0 +1 @@ +############### common-adaptation.post ################ diff --git a/scripts/common-applications.post b/scripts/common-applications.post new file mode 100644 index 0000000..5a7c804 --- /dev/null +++ b/scripts/common-applications.post @@ -0,0 +1,2 @@ +############### common-applications.post ################ + diff --git a/scripts/generic-autoqa.post b/scripts/common-autoqa.post similarity index 96% rename from scripts/generic-autoqa.post rename to scripts/common-autoqa.post index 952e88c..c34dc2a 100644 --- a/scripts/generic-autoqa.post +++ b/scripts/common-autoqa.post @@ -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 index 0000000..cc211f5 --- /dev/null +++ b/scripts/common-base-micro.post @@ -0,0 +1,2 @@ +############### common-base-micro.post ################ + diff --git a/scripts/generic-base.post b/scripts/common-base.post similarity index 98% rename from scripts/generic-base.post rename to scripts/common-base.post index 3ce69b3..e0dca6b 100644 --- a/scripts/generic-base.post +++ b/scripts/common-base.post @@ -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 index 0000000..6759999 --- /dev/null +++ b/scripts/common-bluetooth.post @@ -0,0 +1,2 @@ +############### common-bluetooth.post ################ + diff --git a/scripts/generic-console-tools.post b/scripts/common-console-tools.post similarity index 92% rename from scripts/generic-console-tools.post rename to scripts/common-console-tools.post index decef35..75cbba0 100644 --- a/scripts/generic-console-tools.post +++ b/scripts/common-console-tools.post @@ -1,4 +1,4 @@ -##################### generic-console-tools.post #################### +##################### common-console-tools.post #################### # customize bash prompt cat >/etc/profile.d/bash_prompt_custom.sh <<'EOF' diff --git a/scripts/generic-crosswalk.post b/scripts/common-crosswalk.post similarity index 95% rename from scripts/generic-crosswalk.post rename to scripts/common-crosswalk.post index f32a535..071a5f7 100644 --- a/scripts/generic-crosswalk.post +++ b/scripts/common-crosswalk.post @@ -1,4 +1,4 @@ -############### generic-crosswalk.post ################ +############### common-crosswalk.post ################ # Initialize the native application database pkg_initdb diff --git a/scripts/generic-desktop-applications.post b/scripts/common-desktop-applications.post similarity index 76% rename from scripts/generic-desktop-applications.post rename to scripts/common-desktop-applications.post index ecf2e70..0368b71 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/common-desktop-applications.post @@ -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 index 0000000..3d27306 --- /dev/null +++ b/scripts/common-development.post @@ -0,0 +1,2 @@ +############### common-development.post ################ + diff --git a/scripts/common-middleware.post b/scripts/common-middleware.post new file mode 100644 index 0000000..d3e9684 --- /dev/null +++ b/scripts/common-middleware.post @@ -0,0 +1,2 @@ +############### common-middleware.post ################ + diff --git a/scripts/generic-multimedia.post b/scripts/common-multimedia.post similarity index 83% rename from scripts/generic-multimedia.post rename to scripts/common-multimedia.post index 3ee6c4b..e60e498 100644 --- a/scripts/generic-multimedia.post +++ b/scripts/common-multimedia.post @@ -1,4 +1,4 @@ -############### generic-multimedia.post ################ +############### common-multimedia.post ################ if [ -f /usr/bin/weston ]; then diff --git a/scripts/generic-packaging.post b/scripts/common-packaging.post similarity index 50% rename from scripts/generic-packaging.post rename to scripts/common-packaging.post index 95f5b9c..be7af54 100644 --- a/scripts/generic-packaging.post +++ b/scripts/common-packaging.post @@ -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 index 0000000..4d1f554 --- /dev/null +++ b/scripts/common-qa.post @@ -0,0 +1,2 @@ +############### common-qa.post ################ + diff --git a/scripts/common-qt5.post b/scripts/common-qt5.post new file mode 100644 index 0000000..5122c67 --- /dev/null +++ b/scripts/common-qt5.post @@ -0,0 +1,2 @@ +############### common-qt5.post ################ + diff --git a/scripts/generic-wayland.post b/scripts/common-wayland.post similarity index 95% rename from scripts/generic-wayland.post rename to scripts/common-wayland.post index 33774c7..23f9cda 100644 --- a/scripts/generic-wayland.post +++ b/scripts/common-wayland.post @@ -1,4 +1,4 @@ -#################### generic-wayland.post ################## +#################### common-wayland.post ################## # Add 'app' user to the display group /usr/sbin/groupmod -A app display diff --git a/scripts/generic-webkit.post b/scripts/common-webkit.post similarity index 97% rename from scripts/generic-webkit.post rename to scripts/common-webkit.post index c41b119..c186deb 100644 --- a/scripts/generic-webkit.post +++ b/scripts/common-webkit.post @@ -1,4 +1,4 @@ -######### generic-webkit.post ############# +######### common-webkit.post ############# ################ WAYLAND MODE ##################################### # Add over-riding environment to enable the web runtime to diff --git a/scripts/generic-x11.post b/scripts/common-x11.post similarity index 68% rename from scripts/generic-x11.post rename to scripts/common-x11.post index a5f0674..c9e848e 100644 --- a/scripts/generic-x11.post +++ b/scripts/common-x11.post @@ -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 index f0ba774..0000000 --- a/scripts/generic-adaptation.post +++ /dev/null @@ -1 +0,0 @@ -############### generic-adaptation.post ################ diff --git a/scripts/generic-applications.post b/scripts/generic-applications.post deleted file mode 100644 index a24d02e..0000000 --- a/scripts/generic-applications.post +++ /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 index 0a2008d..0000000 --- a/scripts/generic-base-micro.post +++ /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 index 3d572d6..0000000 --- a/scripts/generic-bluetooth.post +++ /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 index 002aed4..0000000 --- a/scripts/generic-development.post +++ /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 index a89c0a5..0000000 --- a/scripts/generic-middleware.post +++ /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 index 626d792..0000000 --- a/scripts/generic-qa.post +++ /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 index 15ae1b5..0000000 --- a/scripts/generic-qt5.post +++ /dev/null @@ -1,2 +0,0 @@ -############### generic-qt5.post ################ - -- 2.7.4