From f8345337a251ab980cf95540ec17ad7c4df82e30 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 12 Feb 2014 12:28:23 +0100 Subject: [PATCH 01/16] added packages to automated QA pattern Change-Id: Iae528486ecabbe4bac78a2bd7266eeca72005599 Signed-off-by: Stephane Desneux --- patterns/generic-autoqa.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patterns/generic-autoqa.yaml b/patterns/generic-autoqa.yaml index 713aa3a..9b04aed 100644 --- a/patterns/generic-autoqa.yaml +++ b/patterns/generic-autoqa.yaml @@ -2,4 +2,6 @@ Description: Generic Automated QA Tools Name: generic-autoqa Packages: - testkit-lite +- screen +- which Summary: Generic Automated QA Tools -- 2.7.4 From f54c1d22b3ed00491ccb70a7d8f8e8e7b9cb1b2c Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 18 Feb 2014 11:00:14 +0100 Subject: [PATCH 02/16] Create new pattern for generic profile. Signed-off-by: Ronan Le Martret Change-Id: I7c6188f29118a19e34905079a2e0da3cf2e752f0 --- generic-repos.yaml | 7 +++-- generic.yaml | 18 +++++++---- patterns/generic-adaptation.yaml | 3 -- patterns/generic-applications.yaml | 2 +- patterns/generic-base-micro.yaml | 17 +++++++++++ patterns/generic-base.yaml | 32 +++++++++++++++++++ patterns/generic-bluetooth.yaml | 8 +++++ patterns/generic-console-tools.yaml | 30 ++++++++++++++++++ patterns/generic-desktop-applications.yaml | 7 +++++ patterns/generic-development.yaml | 49 ++++++++++++++++++++++++++++++ patterns/generic-middleware.yaml | 48 +---------------------------- patterns/generic-multimedia.yaml | 20 ++++++++++++ patterns/generic-qa.yaml | 1 - patterns/generic-webkit.yaml | 17 +++++++++++ 14 files changed, 198 insertions(+), 61 deletions(-) create mode 100644 patterns/generic-base-micro.yaml create mode 100644 patterns/generic-base.yaml create mode 100644 patterns/generic-bluetooth.yaml create mode 100644 patterns/generic-console-tools.yaml create mode 100644 patterns/generic-desktop-applications.yaml create mode 100644 patterns/generic-development.yaml create mode 100644 patterns/generic-multimedia.yaml create mode 100644 patterns/generic-webkit.yaml diff --git a/generic-repos.yaml b/generic-repos.yaml index 3de3fb4..cccba81 100644 --- a/generic-repos.yaml +++ b/generic-repos.yaml @@ -2,15 +2,16 @@ 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 index 7622340..7f6c23b 100644 --- a/generic.yaml +++ b/generic.yaml @@ -17,12 +17,12 @@ Default: StartX: False Desktop: None Repos: - - Generic + - Generic SaveRepos: False UserGroups: "audio,video" Groups: - - Base System - - Console Tools + - Generic Base System + - Generic Console Tools - Generic Packaging PostScripts: - base-general @@ -30,7 +30,7 @@ Default: - optimization - customize NoChrootScripts: - - buildname + - buildname Minimal: Part: generic-mbr @@ -52,7 +52,6 @@ Wayland: - Generic Applications PostScripts: - base-weston-default - - wrt-widgets - vconf-keys-default Wayland_QA: @@ -66,7 +65,6 @@ Wayland_QA: - Generic Automated QA Tools PostScripts: - base-weston-default - - wrt-widgets - vconf-keys-default - autoqa @@ -77,6 +75,10 @@ X11: - Generic Adaptation - Generic Middleware - Generic Applications + - Generic Bluetooth + - Generic Multimedia + - Generic Webkit + - Generic Desktop Applications PostScripts: - base-x11-default - wrt-widgets @@ -89,6 +91,10 @@ X11_QA: - Generic Adaptation - Generic Middleware - Generic Applications + - Generic Bluetooth + - Generic Multimedia + - Generic Webkit + - Generic Desktop Applications - Generic Automated QA Tools PostScripts: - base-x11-default diff --git a/patterns/generic-adaptation.yaml b/patterns/generic-adaptation.yaml index 0e30bc0..0b444d1 100644 --- a/patterns/generic-adaptation.yaml +++ b/patterns/generic-adaptation.yaml @@ -2,7 +2,4 @@ Description: Generic Adaptation Name: generic-adaptation Packages: - linux-firmware -- kernel-x86-generic -- dlogutil -- system-installer Summary: Generic Adaptation diff --git a/patterns/generic-applications.yaml b/patterns/generic-applications.yaml index 89fd479..a330676 100644 --- a/patterns/generic-applications.yaml +++ b/patterns/generic-applications.yaml @@ -3,5 +3,5 @@ Name: generic-applications Packages: - ail - ca-certificates -- webkit2-efl-test +- ca-certificates-mozilla Summary: Generic Applications diff --git a/patterns/generic-base-micro.yaml b/patterns/generic-base-micro.yaml new file mode 100644 index 0000000..f74448a --- /dev/null +++ b/patterns/generic-base-micro.yaml @@ -0,0 +1,17 @@ +Description: Generic Base System +Name: base micro +Packages: +- bluez +- kmod +- tzdata +- pam +- setup +- filesystem +- systemd +- busybox +- default-ac-domains +- tizen-release +- glibc-locale +- pciutils +- lrzsz +Summary: Base System diff --git a/patterns/generic-base.yaml b/patterns/generic-base.yaml new file mode 100644 index 0000000..ec9435d --- /dev/null +++ b/patterns/generic-base.yaml @@ -0,0 +1,32 @@ +Description: Generic Base System +Name: base +Packages: +- e2fsprogs +- connman +- rfkill +- util-linux +- kmod-compat +- kmod +- tzdata +- pwdutils +- pam +- setup +- filesystem +- systemd +- bash +- coreutils +- rpm +- rpm-security-plugin +- default-ac-domains +- tizen-release +- pam-locale +- procps +- psmisc +- net-tools +- kbd +- glibc-locale +- pciutils +- default-ac-domains +- wpa_supplicant +- prelink +Summary: Base System diff --git a/patterns/generic-bluetooth.yaml b/patterns/generic-bluetooth.yaml new file mode 100644 index 0000000..4beb9a1 --- /dev/null +++ b/patterns/generic-bluetooth.yaml @@ -0,0 +1,8 @@ +Description: Generic Bluetooth +Name: generic-bluetooth +Packages: +- bluez +- bluetooth-frwk +- bluetooth-share +- bluetooth-tools-no-firmware +Summary: Generic Bluetooth diff --git a/patterns/generic-console-tools.yaml b/patterns/generic-console-tools.yaml new file mode 100644 index 0000000..07a9361 --- /dev/null +++ b/patterns/generic-console-tools.yaml @@ -0,0 +1,30 @@ +Description: Generic Console Tools +Name: generic-console-tools +Packages: +- snapper-zypp-plugin +- tar +- wget +- grep +- gzip +- openssh +- rsync +- parted +- zip +- vim +- unzip +- less +- xz +- nano +- curl +- strace +- diffutils +- patch +- findutils +- wdiff +- powertop +- sudo +- ca-certificates-mozilla +- iptables +- net-config +- tree +Summary: Generic Console Tools diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml new file mode 100644 index 0000000..fcbbbbb --- /dev/null +++ b/patterns/generic-desktop-applications.yaml @@ -0,0 +1,7 @@ +Description: Generic Desktop Applications +Name: generic-desktop-applications +Packages: +- emotion +- econnman +- bluetooth-agent +Summary: Generic Desktop Applications diff --git a/patterns/generic-development.yaml b/patterns/generic-development.yaml new file mode 100644 index 0000000..0abe277 --- /dev/null +++ b/patterns/generic-development.yaml @@ -0,0 +1,49 @@ +Description:Generic Development +Name: generic-development +Packages: +- zip +- unzip +- less +- gcc +- glibc-devel +- libtool +- gcc-fortran +- cmake +- xz +- tcl +- gdb +- gdb-server +- nano +- strace +- yasm +- make +- diffutils +- patch +- autoconf +- automake +- binutils-devel +- bison +- flex +- gcc-c++ +- libstdc++-devel +- libtool +- findutils +- wdiff +- nasm +- vim-enhanced +- powertop +- pulseaudio-utils +- gstreamer-utils +- alsa-utils +- connman-test +- pacrunner +- git-core +- valgrind +- lsof +- attr +- smack +- corewatcher +- iputils +- iproute2 +- which +Summary: Generic Development diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index ea367ea..565463a 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -1,64 +1,18 @@ Description: Generic Middleware Name: generic-middleware Packages: -- alsa-utils -- alsa-plugins-pulse -- bluez -- bluetooth-agent -- bluetooth-frwk -- bluetooth-share -- bluetooth-tools-no-firmware - calendar-service - csr-framework -- default-ac-domains -- econnman - elm-misc -- emotion - efl-theme-tizen-hd - evolution-data-server -- gdb-server -- gpg2 -- gst-libav -- gst-plugins-bad -- gst-plugins-base -- gst-plugins-good -- gstreamer -- gstreamer-vaapi -- gstreamer-utils -- iptables - libprivilege-control-conf -- libva-intel-driver - media-data-sdk - model-config-generic - neard -- neardal -- net-config +- neardal - obexd - ofono -- pam-locale - pkgmgr-server -- prelink -- pulseaudio -- pulseaudio-config -- pulseaudio-locale -- pulseaudio-module-bluetooth -- pulseaudio-utils -- rfkill - sqlite3 -- tree -- vaapi-tools -- wpa_supplicant -- web-ui-fw -- web-ui-fw-demo-tizen-winsets -- web-ui-fw-theme-default -- web-ui-fw-theme-tizen-black -- web-ui-fw-theme-tizen-white -- wrt -- wrt-commons -- wrt-installer -- wrt-installer-preinstall-service -- wrt-plugins-tizen -- wrt-security -- wrt-widgets -- zypper Summary: Generic Middleware diff --git a/patterns/generic-multimedia.yaml b/patterns/generic-multimedia.yaml new file mode 100644 index 0000000..ec7d83d --- /dev/null +++ b/patterns/generic-multimedia.yaml @@ -0,0 +1,20 @@ +Description: Generic Multimedia +Name: generic-multimedia +Packages: +- alsa-utils +- alsa-plugins-pulse +- pulseaudio +- pulseaudio-config +- pulseaudio-locale +- pulseaudio-module-bluetooth +- pulseaudio-utils +- gst-libav +- gst-plugins-bad +- gst-plugins-base +- gst-plugins-good +- gstreamer +- gstreamer-vaapi +- gstreamer-utils +- libva-intel-driver +- vaapi-tools +Summary: Generic Multimedia diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index ee7594f..96fba3b 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -12,5 +12,4 @@ Packages: - ofono-test - python-xml - wget -- zypper Summary: Generic QA Tools diff --git a/patterns/generic-webkit.yaml b/patterns/generic-webkit.yaml new file mode 100644 index 0000000..5e3996a --- /dev/null +++ b/patterns/generic-webkit.yaml @@ -0,0 +1,17 @@ +Description: Generic Webkit +Name: webkit +Packages: +- wrt-widgets +- wrt +- wrt-commons +- wrt-installer +- wrt-installer-preinstall-service +- wrt-plugins-tizen +- wrt-security +- webkit2-efl-test +- web-ui-fw +- web-ui-fw-demo-tizen-winsets +- web-ui-fw-theme-default +- web-ui-fw-theme-tizen-black +- web-ui-fw-theme-tizen-white +Summary: Base System \ No newline at end of file -- 2.7.4 From b16ab53f5bd0dff84a0bcd982141e51fff453288 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 18 Feb 2014 13:45:19 +0100 Subject: [PATCH 03/16] script/autoqa: fix /root/.ssh creation Change-Id: I36f84e46d9d580fb7ae61cc94f53c147284c8e43 Signed-off-by: Stephane Desneux --- scripts/autoqa.post | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/autoqa.post b/scripts/autoqa.post index 5a461e6..f6f0064 100644 --- a/scripts/autoqa.post +++ b/scripts/autoqa.post @@ -2,6 +2,10 @@ # generate private/public key for autologin as root +mkdir /root/.ssh +chown root:root /root/.ssh +chmod 700 /root/.ssh + # the private key: use the following key on the ssh client side (copied here for reference) cat </root/.ssh/id_eat_dsa -----BEGIN DSA PRIVATE KEY----- -- 2.7.4 From a81f04b12f9c0f207bcef4008f9f757453ae988d Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 18 Feb 2014 14:09:45 +0100 Subject: [PATCH 04/16] fix pattern generic-development Change-Id: I247241704fff9a98ea197f45a95dc2211c6f93da Signed-off-by: Stephane Desneux --- patterns/generic-development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/generic-development.yaml b/patterns/generic-development.yaml index 0abe277..c452c98 100644 --- a/patterns/generic-development.yaml +++ b/patterns/generic-development.yaml @@ -1,4 +1,4 @@ -Description:Generic Development +Description: Generic Development Name: generic-development Packages: - zip -- 2.7.4 From b506a8abd1446805edc01c4174888d624d427633 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 18 Feb 2014 16:45:55 +0100 Subject: [PATCH 05/16] Change generic base description. Change-Id: I9bd8061cb01133c7237e94f8441cb3a51f27d7eb Signed-off-by: Ronan Le Martret --- patterns/generic-base-micro.yaml | 6 +++--- patterns/generic-base.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patterns/generic-base-micro.yaml b/patterns/generic-base-micro.yaml index f74448a..95ed75f 100644 --- a/patterns/generic-base-micro.yaml +++ b/patterns/generic-base-micro.yaml @@ -1,5 +1,5 @@ -Description: Generic Base System -Name: base micro +Description: Generic Base Micro System +Name: generic-base-micro-system Packages: - bluez - kmod @@ -14,4 +14,4 @@ Packages: - glibc-locale - pciutils - lrzsz -Summary: Base System +Summary: Generic Base Micro System diff --git a/patterns/generic-base.yaml b/patterns/generic-base.yaml index ec9435d..ae4b014 100644 --- a/patterns/generic-base.yaml +++ b/patterns/generic-base.yaml @@ -1,5 +1,5 @@ Description: Generic Base System -Name: base +Name: generic-base-system Packages: - e2fsprogs - connman @@ -29,4 +29,4 @@ Packages: - default-ac-domains - wpa_supplicant - prelink -Summary: Base System +Summary: Generic Base System -- 2.7.4 From 7bd780344b09ca9db3fafadfce690b91979a3e2e Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 19 Feb 2014 13:04:23 +0100 Subject: [PATCH 06/16] Add mesa package to weston for pure Wayland profile. Change-Id: Ifec2850ada82974689b9d6b43aeaed39474d0e9c Signed-off-by: Ronan Le Martret --- patterns/generic-console-tools.yaml | 1 - patterns/generic-desktop-applications.yaml | 1 + patterns/generic-wayland.yaml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/patterns/generic-console-tools.yaml b/patterns/generic-console-tools.yaml index 07a9361..6400f8b 100644 --- a/patterns/generic-console-tools.yaml +++ b/patterns/generic-console-tools.yaml @@ -25,6 +25,5 @@ Packages: - sudo - ca-certificates-mozilla - iptables -- net-config - tree Summary: Generic Console Tools diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml index fcbbbbb..f0d2136 100644 --- a/patterns/generic-desktop-applications.yaml +++ b/patterns/generic-desktop-applications.yaml @@ -4,4 +4,5 @@ Packages: - emotion - econnman - bluetooth-agent +- net-config Summary: Generic Desktop Applications diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index 09bae5a..d43a6bc 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -4,6 +4,7 @@ Packages: - cantarell-fonts - dejavu-fonts - weston +- mesa - xkeyboard-config - tizen-branding-default - user-session-units -- 2.7.4 From 32f92bb1aaba28c45c7936cb25169233988313b3 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 27 Feb 2014 14:17:22 +0100 Subject: [PATCH 07/16] refactor patterns, scripts and ks Change-Id: I71ce2e385973f1fee6ae48fc193a2a17668386cd Signed-off-by: Stephane Desneux --- generic.yaml | 67 ++++++-------------- ks/generic-minimal-mbr-i586.yaml | 9 +++ ks/generic-minimal-mbr-x86_64.yaml | 10 +++ ks/generic-qa-unsafe-minimal-mbr-i586.yaml | 14 +++++ ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml | 14 +++++ ks/generic-qa-unsafe-wayland-mbr-i586.yaml | 6 +- ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml | 6 +- ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml | 15 +++++ ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml | 16 +++++ ks/generic-qa-unsafe-x11-mbr-i586.yaml | 6 +- ks/generic-qa-unsafe-x11-mbr-x86_64.yaml | 6 +- ks/generic-wayland-xwalk-mbr-i586.yaml | 13 ++++ ks/generic-wayland-xwalk-mbr-x86_64.yaml | 14 +++++ patterns/generic-adaptation.yaml | 2 +- patterns/generic-applications.yaml | 2 +- patterns/generic-autoqa.yaml | 2 +- patterns/generic-base-micro.yaml | 6 +- patterns/generic-base.yaml | 6 +- patterns/generic-bluetooth.yaml | 2 +- patterns/generic-console-tools.yaml | 3 +- patterns/generic-crosswalk.yaml | 6 ++ patterns/generic-desktop-applications.yaml | 6 +- patterns/generic-development.yaml | 2 +- patterns/generic-middleware.yaml | 2 +- patterns/generic-multimedia.yaml | 2 +- patterns/generic-packaging.yaml | 2 +- patterns/generic-qa.yaml | 2 +- patterns/generic-qt5.yaml | 5 ++ patterns/generic-wayland.yaml | 2 +- patterns/generic-webkit.yaml | 4 +- patterns/generic-x11.yaml | 5 +- scripts/base-general.post | 6 -- scripts/base-generic-minimal.post | 4 -- scripts/base-weston-default.post | 72 ---------------------- scripts/generic-adaptation.post | 1 + scripts/generic-applications.post | 2 + scripts/{autoqa.post => generic-autoqa.post} | 2 +- scripts/generic-base-micro.post | 2 + scripts/generic-base.post | 26 ++++++++ scripts/generic-bluetooth.post | 2 + .../{customize.post => generic-console-tools.post} | 12 +--- scripts/generic-crosswalk.post | 24 ++++++++ scripts/generic-desktop-applications.post | 2 + scripts/generic-development.post | 2 + scripts/generic-middleware.post | 2 + scripts/generic-multimedia.post | 17 +++++ scripts/generic-packaging.post | 31 ++++++++++ scripts/generic-qa.post | 2 + scripts/generic-qt5.post | 2 + scripts/generic-wayland.post | 22 +++++++ scripts/generic-webkit.post | 59 ++++++++++++++++++ .../{base-x11-default.post => generic-x11.post} | 2 +- scripts/optimization.post | 4 -- scripts/rpm.post | 4 -- scripts/vconf-keys-default.post | 4 -- scripts/wrt-widgets.post | 7 --- 56 files changed, 383 insertions(+), 187 deletions(-) create mode 100644 ks/generic-minimal-mbr-i586.yaml create mode 100644 ks/generic-minimal-mbr-x86_64.yaml create mode 100644 ks/generic-qa-unsafe-minimal-mbr-i586.yaml create mode 100644 ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml create mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml create mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml create mode 100644 ks/generic-wayland-xwalk-mbr-i586.yaml create mode 100644 ks/generic-wayland-xwalk-mbr-x86_64.yaml create mode 100644 patterns/generic-crosswalk.yaml create mode 100644 patterns/generic-qt5.yaml delete mode 100644 scripts/base-general.post delete mode 100644 scripts/base-generic-minimal.post delete mode 100644 scripts/base-weston-default.post create mode 100644 scripts/generic-adaptation.post create mode 100644 scripts/generic-applications.post rename scripts/{autoqa.post => generic-autoqa.post} (96%) create mode 100644 scripts/generic-base-micro.post create mode 100644 scripts/generic-base.post create mode 100644 scripts/generic-bluetooth.post rename scripts/{customize.post => generic-console-tools.post} (68%) create mode 100644 scripts/generic-crosswalk.post create mode 100644 scripts/generic-desktop-applications.post create mode 100644 scripts/generic-development.post create mode 100644 scripts/generic-middleware.post create mode 100644 scripts/generic-multimedia.post create mode 100644 scripts/generic-packaging.post create mode 100644 scripts/generic-qa.post create mode 100644 scripts/generic-qt5.post create mode 100644 scripts/generic-wayland.post create mode 100644 scripts/generic-webkit.post rename scripts/{base-x11-default.post => generic-x11.post} (66%) delete mode 100644 scripts/optimization.post delete mode 100644 scripts/rpm.post delete mode 100644 scripts/vconf-keys-default.post delete mode 100644 scripts/wrt-widgets.post diff --git a/generic.yaml b/generic.yaml index 7f6c23b..8d60df7 100644 --- a/generic.yaml +++ b/generic.yaml @@ -21,27 +21,19 @@ Default: SaveRepos: False UserGroups: "audio,video" Groups: - - Generic Base System + - Generic Base - Generic Console Tools - Generic Packaging PostScripts: - - base-general - - rpm - - optimization - - customize + - generic-base + - generic-console-tools + - generic-packaging NoChrootScripts: - buildname Minimal: Part: generic-mbr -Minimal_QA: - Part: generic-mbr - Groups: - - Generic Automated QA Tools - PostScripts: - - autoqa - Wayland: Part: generic-mbr UserGroups: "audio,video,weston-launch" @@ -50,41 +42,19 @@ Wayland: - Generic Adaptation - Generic Middleware - Generic Applications - PostScripts: - - base-weston-default - - vconf-keys-default - -Wayland_QA: - Part: generic-mbr - UserGroups: "audio,video,weston-launch" - Groups: - - Generic Wayland - - Generic Adaptation - - Generic Middleware - - Generic Applications - - Generic Automated QA Tools - PostScripts: - - base-weston-default - - vconf-keys-default - - autoqa - -X11: - Part: generic-mbr - Groups: - - Generic X11 - - Generic Adaptation - - Generic Middleware - - Generic Applications - Generic Bluetooth - Generic Multimedia - - Generic Webkit - Generic Desktop Applications PostScripts: - - base-x11-default - - wrt-widgets - - vconf-keys-default + - generic-wayland + - generic-adaptation + - generic-middleware + - generic-applications + - generic-bluetooth + - generic-multimedia + - generic-desktop-applications -X11_QA: +X11: Part: generic-mbr Groups: - Generic X11 @@ -95,10 +65,13 @@ X11_QA: - Generic Multimedia - Generic Webkit - Generic Desktop Applications - - Generic Automated QA Tools PostScripts: - - base-x11-default - - wrt-widgets - - vconf-keys-default - - autoqa + - generic-x11 + - generic-adaptation + - generic-middleware + - generic-applications + - generic-bluetooth + - generic-multimedia + - generic-webkit + - generic-desktop-applications diff --git a/ks/generic-minimal-mbr-i586.yaml b/ks/generic-minimal-mbr-i586.yaml new file mode 100644 index 0000000..1fa3f7d --- /dev/null +++ b/ks/generic-minimal-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic Minimal MBR i586 +Schedule: "*" +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 new file mode 100644 index 0000000..a3ea9b8 --- /dev/null +++ b/ks/generic-minimal-mbr-x86_64.yaml @@ -0,0 +1,10 @@ +Name: Generic Minimal MBR x86_64 +Architecture: x86_64 +Schedule: "*" +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 new file mode 100644 index 0000000..e875731 --- /dev/null +++ b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml @@ -0,0 +1,14 @@ +Name: Generic Minimal MBR i586 +Schedule: "*" +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 new file mode 100644 index 0000000..d9fb996 --- /dev/null +++ b/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml @@ -0,0 +1,14 @@ +Name: Generic Minimal MBR x86_64 +Architecture: x86_64 +Schedule: "*" +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 index 6a143d6..3c1d8fb 100644 --- a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml @@ -1,9 +1,13 @@ Name: Generic QA Unsafe Wayland MBR i586 Schedule: "*" Active: True -Platform: Wayland_QA +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 index cc821d1..7f8dc28 100644 --- a/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml +++ b/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml @@ -2,9 +2,13 @@ Name: Generic QA Unsafe Wayland MBR x86_64 Architecture: x86_64 Schedule: "*" Active: True -Platform: Wayland_QA +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-wayland-xwalk-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml new file mode 100644 index 0000000..e4d9990 --- /dev/null +++ b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml @@ -0,0 +1,15 @@ +Name: Generic QA Unsafe Wayland XWalk MBR i586 +Schedule: "*" +Active: True +Platform: Wayland +Part: generic-mbr +FileName: generic-qa-unsafe-wayland-xwalk-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_i586 +Groups: + - Generic Crosswalk + - Generic Automated QA Tools +PostScripts: + - generic-crosswalk + - generic-autoqa diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml new file mode 100644 index 0000000..13b3165 --- /dev/null +++ b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml @@ -0,0 +1,16 @@ +Name: Generic QA Unsafe Wayland XWalk MBR x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: Wayland +Part: generic-mbr +FileName: generic-qa-unsafe-wayland-xwalk-mbr-x86_64 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_x86_64 +Groups: + - Generic Crosswalk + - Generic Automated QA Tools +PostScripts: + - generic-crosswalk + - generic-autoqa diff --git a/ks/generic-qa-unsafe-x11-mbr-i586.yaml b/ks/generic-qa-unsafe-x11-mbr-i586.yaml index 77d1bdc..99297ac 100644 --- a/ks/generic-qa-unsafe-x11-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-x11-mbr-i586.yaml @@ -1,9 +1,13 @@ Name: Generic QA Unsafe X11 MBR i586 Schedule: "*" Active: True -Platform: X11_QA +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 index c140742..28b72d1 100644 --- a/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml +++ b/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml @@ -2,9 +2,13 @@ Name: Generic QA Unsafe X11 MBR x86_64 Architecture: x86_64 Schedule: "*" Active: True -Platform: X11_QA +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-xwalk-mbr-i586.yaml b/ks/generic-wayland-xwalk-mbr-i586.yaml new file mode 100644 index 0000000..156300b --- /dev/null +++ b/ks/generic-wayland-xwalk-mbr-i586.yaml @@ -0,0 +1,13 @@ +Name: Generic Wayland XWalk MBR i586 +Schedule: "*" +Active: True +Platform: Wayland +Part: generic-mbr +FileName: generic-wayland-xwalk-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_i586 +Groups: + - Generic Crosswalk +PostScripts: + - generic-crosswalk diff --git a/ks/generic-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-wayland-xwalk-mbr-x86_64.yaml new file mode 100644 index 0000000..2f4b4c4 --- /dev/null +++ b/ks/generic-wayland-xwalk-mbr-x86_64.yaml @@ -0,0 +1,14 @@ +Name: Generic Wayland XWalk MBR x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: Wayland +Part: generic-mbr +FileName: generic-wayland-xwalk-mbr-x86_64 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_x86_64 +Groups: + - Generic Crosswalk +PostScripts: + - generic-crosswalk diff --git a/patterns/generic-adaptation.yaml b/patterns/generic-adaptation.yaml index 0b444d1..f59df02 100644 --- a/patterns/generic-adaptation.yaml +++ b/patterns/generic-adaptation.yaml @@ -1,5 +1,5 @@ +Summary: Generic Adaptation Description: Generic Adaptation Name: generic-adaptation Packages: - linux-firmware -Summary: Generic Adaptation diff --git a/patterns/generic-applications.yaml b/patterns/generic-applications.yaml index a330676..a7b2cc8 100644 --- a/patterns/generic-applications.yaml +++ b/patterns/generic-applications.yaml @@ -1,7 +1,7 @@ +Summary: Generic Applications Description: Generic Applications Name: generic-applications Packages: - ail - ca-certificates - ca-certificates-mozilla -Summary: Generic Applications diff --git a/patterns/generic-autoqa.yaml b/patterns/generic-autoqa.yaml index 9b04aed..4330b72 100644 --- a/patterns/generic-autoqa.yaml +++ b/patterns/generic-autoqa.yaml @@ -1,7 +1,7 @@ +Summary: Generic Automated QA Tools Description: Generic Automated QA Tools Name: generic-autoqa Packages: - testkit-lite - screen - which -Summary: Generic Automated QA Tools diff --git a/patterns/generic-base-micro.yaml b/patterns/generic-base-micro.yaml index 95ed75f..754fd59 100644 --- a/patterns/generic-base-micro.yaml +++ b/patterns/generic-base-micro.yaml @@ -1,5 +1,6 @@ -Description: Generic Base Micro System -Name: generic-base-micro-system +Summary: Generic Base Micro +Description: Generic Base Micro +Name: generic-base-micro Packages: - bluez - kmod @@ -14,4 +15,3 @@ Packages: - glibc-locale - pciutils - lrzsz -Summary: Generic Base Micro System diff --git a/patterns/generic-base.yaml b/patterns/generic-base.yaml index ae4b014..6090af5 100644 --- a/patterns/generic-base.yaml +++ b/patterns/generic-base.yaml @@ -1,5 +1,6 @@ -Description: Generic Base System -Name: generic-base-system +Summary: Generic Base +Description: Generic Base +Name: generic-base Packages: - e2fsprogs - connman @@ -29,4 +30,3 @@ Packages: - default-ac-domains - wpa_supplicant - prelink -Summary: Generic Base System diff --git a/patterns/generic-bluetooth.yaml b/patterns/generic-bluetooth.yaml index 4beb9a1..b4cfc6b 100644 --- a/patterns/generic-bluetooth.yaml +++ b/patterns/generic-bluetooth.yaml @@ -1,3 +1,4 @@ +Summary: Generic Bluetooth Description: Generic Bluetooth Name: generic-bluetooth Packages: @@ -5,4 +6,3 @@ Packages: - bluetooth-frwk - bluetooth-share - bluetooth-tools-no-firmware -Summary: Generic Bluetooth diff --git a/patterns/generic-console-tools.yaml b/patterns/generic-console-tools.yaml index 6400f8b..552cac2 100644 --- a/patterns/generic-console-tools.yaml +++ b/patterns/generic-console-tools.yaml @@ -1,3 +1,4 @@ +Summary: Generic Console Tools Description: Generic Console Tools Name: generic-console-tools Packages: @@ -26,4 +27,4 @@ Packages: - ca-certificates-mozilla - iptables - tree -Summary: Generic Console Tools +- intel-gpu-tools diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml new file mode 100644 index 0000000..a1005d1 --- /dev/null +++ b/patterns/generic-crosswalk.yaml @@ -0,0 +1,6 @@ +Summary: Generic Crosswalk +Description: Generic Crosswalk +Name: generic-crosswalk +Packages: +- crosswalk + diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml index f0d2136..d56cc7d 100644 --- a/patterns/generic-desktop-applications.yaml +++ b/patterns/generic-desktop-applications.yaml @@ -1,8 +1,8 @@ +Summary: Generic Desktop Applications Description: Generic Desktop Applications Name: generic-desktop-applications Packages: - emotion -- econnman -- bluetooth-agent +#- econnman +#- bluetooth-agent - net-config -Summary: Generic Desktop Applications diff --git a/patterns/generic-development.yaml b/patterns/generic-development.yaml index c452c98..1259a12 100644 --- a/patterns/generic-development.yaml +++ b/patterns/generic-development.yaml @@ -1,3 +1,4 @@ +Summary: Generic Development Description: Generic Development Name: generic-development Packages: @@ -46,4 +47,3 @@ Packages: - iputils - iproute2 - which -Summary: Generic Development diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 565463a..95ece19 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -1,3 +1,4 @@ +Summary: Generic Middleware Description: Generic Middleware Name: generic-middleware Packages: @@ -15,4 +16,3 @@ Packages: - ofono - pkgmgr-server - sqlite3 -Summary: Generic Middleware diff --git a/patterns/generic-multimedia.yaml b/patterns/generic-multimedia.yaml index ec7d83d..b4388b4 100644 --- a/patterns/generic-multimedia.yaml +++ b/patterns/generic-multimedia.yaml @@ -1,3 +1,4 @@ +Summary: Generic Multimedia Description: Generic Multimedia Name: generic-multimedia Packages: @@ -17,4 +18,3 @@ Packages: - gstreamer-utils - libva-intel-driver - vaapi-tools -Summary: Generic Multimedia diff --git a/patterns/generic-packaging.yaml b/patterns/generic-packaging.yaml index a32efa8..427f3f2 100644 --- a/patterns/generic-packaging.yaml +++ b/patterns/generic-packaging.yaml @@ -1,6 +1,6 @@ +Summary: Generic Packaging Description: Generic Packaging Name: generic-packaging Packages: - gpg2 - zypper -Summary: Generic Packaging diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index 96fba3b..69e039c 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -1,3 +1,4 @@ +Summary: Generic QA Tools Description: Generic QA Tools Name: generic-qa Packages: @@ -12,4 +13,3 @@ Packages: - ofono-test - python-xml - wget -Summary: Generic QA Tools diff --git a/patterns/generic-qt5.yaml b/patterns/generic-qt5.yaml new file mode 100644 index 0000000..e37dcc9 --- /dev/null +++ b/patterns/generic-qt5.yaml @@ -0,0 +1,5 @@ +Summary: Generic QT5 +Description: Generic QT5 +Name: generic-qt5 +Packages: +- qt5-tools diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index d43a6bc..6f68f57 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -1,3 +1,4 @@ +Summary: Generic Wayland Description: Generic Wayland Name: generic-wayland Packages: @@ -9,4 +10,3 @@ Packages: - tizen-branding-default - user-session-units - desktop-skin -Summary: Generic Wayland diff --git a/patterns/generic-webkit.yaml b/patterns/generic-webkit.yaml index 5e3996a..25950ab 100644 --- a/patterns/generic-webkit.yaml +++ b/patterns/generic-webkit.yaml @@ -1,5 +1,6 @@ +Summary: Generic Webkit Description: Generic Webkit -Name: webkit +Name: generic-webkit Packages: - wrt-widgets - wrt @@ -14,4 +15,3 @@ Packages: - web-ui-fw-theme-default - web-ui-fw-theme-tizen-black - web-ui-fw-theme-tizen-white -Summary: Base System \ No newline at end of file diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml index 5b722a6..c95e778 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/generic-x11.yaml @@ -1,3 +1,4 @@ +Summary: Generic X11 Description: Generic X11 Name: generic-x11 Packages: @@ -5,4 +6,6 @@ Packages: - xf86-input-synaptics - xf86-video-intel - xf86-input-keyboard -Summary: Generic X11 +- xorg-launch-helper +- enlightenment +- user-session-units diff --git a/scripts/base-general.post b/scripts/base-general.post deleted file mode 100644 index 5a74bad..0000000 --- a/scripts/base-general.post +++ /dev/null @@ -1,6 +0,0 @@ -################ base-general.post ################## - -ln -sf /proc/self/mounts /etc/mtab - -rm -rf /root/.zypp - diff --git a/scripts/base-generic-minimal.post b/scripts/base-generic-minimal.post deleted file mode 100644 index 65e09eb..0000000 --- a/scripts/base-generic-minimal.post +++ /dev/null @@ -1,4 +0,0 @@ -################### base-generic-minimal.post ################# - -rm /usr/lib/systemd/system/default.target -ln -sf multi-user.target /usr/lib/systemd/system/default.target diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post deleted file mode 100644 index 4facb35..0000000 --- a/scripts/base-weston-default.post +++ /dev/null @@ -1,72 +0,0 @@ -#################### base-weston-default.post ################## -# Initialize the native application database -pkg_initdb - -# Add 'app' user to the weston-launch group -/usr/sbin/groupmod -A app weston-launch - -# Temporary work around for bug in filesystem package resulting in the 'app' user home -# directory being only readable by root -chown -R app:app /opt/home/app - -# Since weston-launch runs with the "User" label, the app -# home dir must have the same label -chsmack -a User /opt/home/app - -# Enable a logind session for 'app' user on seat0 (the default seat for -# graphical sessions) -mkdir -p /usr/lib/systemd/system/graphical.target.wants -ln -s ../user-session-launch@.service /usr/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5000.service -ln -sf weston.target /usr/lib/systemd/user/default.target - -# Enable user@5000.service by setting the linger for user 'app' -#mkdir -p /var/lib/systemd/linger -#touch /var/lib/systemd/linger/app - -# Add over-riding environment to enable the web runtime to -# run as a different user than the tizen user -# Some notes on some of the variables: -# - ELM_THEME is needed in order for the wrt to have visible content -# - WRT_PROCESS_POOL_DISABLE is a work around for TIVI-2062 -cat > /etc/sysconfig/wrt < /etc/udev/rules.d/99-dri.rules <>/etc/profile.d/weston.sh <<'EOF' -# sdx: patch commfrom meta-generic/scripts/base-weston-default.post -export ELM_THEME=tizen-HD-light -EOF - -# sdx: set DBUS env inside weston shell (login shell) -cat >/etc/profile.d/user-dbus.sh <<'EOF' -export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/dbus/user_bus_socket -EOF - -# sdx: user 'app' must own /dev/tty1 for weston to start correctly -cat >/usr/lib/udev/rules.d/99-tty.rules </etc/profile.d/bash_prompt_custom.sh <<'EOF' if [ "$PS1" ]; then - function parse_git_branch { - [ -x "/usr/bin/git" ] && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' - } - function proml { # set a fancy prompt (overwrite the one in /etc/profile) local default="\[\e[0m\]" @@ -23,7 +19,7 @@ if [ "$PS1" ]; then _p="#" fi - PS1="${usercol}\u${default}@${hostcol}\h${default}:${pathcol}\w${default}${gitcol}\$(parse_git_branch)${default}${_p} ${termcmd}" + PS1="${usercol}\u${default}@${hostcol}\h${default}:${pathcol}\w${default}${gitcol}${default}${_p} ${termcmd}" } proml @@ -36,10 +32,6 @@ if [ "$PS1" ]; then alias lr="ls -ltrZ" alias la="ls -alZ" - function dbus_find () { - echo export $(tr '\0' '\n' >/etc/xdg/weston/weston.ini <>/etc/xdg/weston/weston.ini <> /etc/zypp/repos.d/${reponame}.repo << EOF +[${reponame}] +name=${reponame} +enabled=1 +autorefresh=0 +baseurl= +baseurl=${url}?ssl_verify=no +type=rpm-md +gpgcheck=0 +EOF +} + +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/ +else + genrepo generic-x11-@ARCH@ http://download.tizen.org/snapshots/tizen/generic/generic-x11-@ARCH@/latest/repos/generic/@ARCH@/packages/ +fi + diff --git a/scripts/generic-qa.post b/scripts/generic-qa.post new file mode 100644 index 0000000..626d792 --- /dev/null +++ b/scripts/generic-qa.post @@ -0,0 +1,2 @@ +############### generic-qa.post ################ + diff --git a/scripts/generic-qt5.post b/scripts/generic-qt5.post new file mode 100644 index 0000000..15ae1b5 --- /dev/null +++ b/scripts/generic-qt5.post @@ -0,0 +1,2 @@ +############### generic-qt5.post ################ + diff --git a/scripts/generic-wayland.post b/scripts/generic-wayland.post new file mode 100644 index 0000000..89c8367 --- /dev/null +++ b/scripts/generic-wayland.post @@ -0,0 +1,22 @@ +#################### generic-wayland.post ################## + +# Add 'app' user to the weston-launch group +/usr/sbin/groupmod -A app weston-launch + +# Enable a logind session for 'app' user on seat0 (the default seat for +# graphical sessions) +mkdir -p /usr/lib/systemd/system/graphical.target.wants +ln -s ../user-session-launch@.service /usr/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5000.service +ln -sf weston.target /usr/lib/systemd/user/default.target + +# Add a rule to ensure the app user has permissions to +# open the graphics device +cat > /etc/udev/rules.d/99-dri.rules </usr/lib/udev/rules.d/99-tty.rules < /etc/sysconfig/wrt <>/etc/xdg/weston/weston.ini <>/etc/ssh/sshd_config diff --git a/scripts/optimization.post b/scripts/optimization.post deleted file mode 100644 index 9f1c964..0000000 --- a/scripts/optimization.post +++ /dev/null @@ -1,4 +0,0 @@ -######################## optimization.post ####################### - -# Run prelink to speed up dynamic binary/library loading -/usr/sbin/prelink --all diff --git a/scripts/rpm.post b/scripts/rpm.post deleted file mode 100644 index 36da676..0000000 --- a/scripts/rpm.post +++ /dev/null @@ -1,4 +0,0 @@ -##################### rpm.post ####################### - -rm -f /var/lib/rpm/__db* -rpmdb --rebuilddb diff --git a/scripts/vconf-keys-default.post b/scripts/vconf-keys-default.post deleted file mode 100644 index 6149b75..0000000 --- a/scripts/vconf-keys-default.post +++ /dev/null @@ -1,4 +0,0 @@ -##################### vconf-keys-default.post ####################### - -# Needed to fix TIVI-1629 -vconftool set -t int -f db/setting/default_memory/wap 0 diff --git a/scripts/wrt-widgets.post b/scripts/wrt-widgets.post deleted file mode 100644 index beb8fa4..0000000 --- a/scripts/wrt-widgets.post +++ /dev/null @@ -1,7 +0,0 @@ -######### wrt-widgets.post ############# - -# start wrt widgets preinstall -prepare_widgets.sh -install_widgets.sh - - -- 2.7.4 From 915b7c98ed64f21019773a5a11795da6debd673d Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 28 Feb 2014 10:40:10 +0100 Subject: [PATCH 08/16] ks files: added missing archs, removed some schedules Change-Id: I224aad3d2c90db55aa3fdcb3a008f545ab3f204f Signed-off-by: Stephane Desneux --- ks/generic-minimal-mbr-i586.yaml | 2 +- ks/generic-minimal-mbr-x86_64.yaml | 1 - ks/generic-qa-unsafe-minimal-mbr-i586.yaml | 3 +-- ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml | 1 - ks/generic-qa-unsafe-wayland-mbr-i586.yaml | 1 + ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml | 2 +- ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml | 1 - ks/generic-qa-unsafe-x11-mbr-i586.yaml | 1 + ks/generic-wayland-mbr-i586.yaml | 1 + ks/generic-wayland-xwalk-mbr-i586.yaml | 2 +- ks/generic-wayland-xwalk-mbr-x86_64.yaml | 1 - ks/generic-x11-mbr-i586.yaml | 1 + 12 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ks/generic-minimal-mbr-i586.yaml b/ks/generic-minimal-mbr-i586.yaml index 1fa3f7d..1dc2f6a 100644 --- a/ks/generic-minimal-mbr-i586.yaml +++ b/ks/generic-minimal-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Minimal MBR i586 -Schedule: "*" +Architecture: i586 Active: True Platform: Minimal Part: generic-mbr diff --git a/ks/generic-minimal-mbr-x86_64.yaml b/ks/generic-minimal-mbr-x86_64.yaml index a3ea9b8..5b2482d 100644 --- a/ks/generic-minimal-mbr-x86_64.yaml +++ b/ks/generic-minimal-mbr-x86_64.yaml @@ -1,6 +1,5 @@ Name: Generic Minimal MBR x86_64 Architecture: x86_64 -Schedule: "*" Active: True Platform: Minimal Part: generic-mbr diff --git a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml index e875731..cfeba29 100644 --- a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Minimal MBR i586 -Schedule: "*" +Architecture: i586 Active: True Platform: Minimal Part: generic-mbr @@ -11,4 +11,3 @@ 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 index d9fb996..1286541 100644 --- a/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml +++ b/ks/generic-qa-unsafe-minimal-mbr-x86_64.yaml @@ -1,6 +1,5 @@ Name: Generic Minimal MBR x86_64 Architecture: x86_64 -Schedule: "*" Active: True Platform: Minimal Part: generic-mbr diff --git a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml index 3c1d8fb..6e9d834 100644 --- a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml @@ -1,4 +1,5 @@ Name: Generic QA Unsafe Wayland MBR i586 +Architecture: i586 Schedule: "*" Active: True Platform: Wayland diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml index e4d9990..02e7f37 100644 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic QA Unsafe Wayland XWalk MBR i586 -Schedule: "*" +Architecture: i586 Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml index 13b3165..ef53458 100644 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml +++ b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml @@ -1,6 +1,5 @@ Name: Generic QA Unsafe Wayland XWalk MBR x86_64 Architecture: x86_64 -Schedule: "*" Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-qa-unsafe-x11-mbr-i586.yaml b/ks/generic-qa-unsafe-x11-mbr-i586.yaml index 99297ac..b08ae2a 100644 --- a/ks/generic-qa-unsafe-x11-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-x11-mbr-i586.yaml @@ -1,4 +1,5 @@ Name: Generic QA Unsafe X11 MBR i586 +Architecture: i586 Schedule: "*" Active: True Platform: X11 diff --git a/ks/generic-wayland-mbr-i586.yaml b/ks/generic-wayland-mbr-i586.yaml index b914080..0b3bb42 100644 --- a/ks/generic-wayland-mbr-i586.yaml +++ b/ks/generic-wayland-mbr-i586.yaml @@ -1,4 +1,5 @@ Name: Generic Wayland MBR i586 +Architecture: i586 Schedule: "*" Active: True Platform: Wayland diff --git a/ks/generic-wayland-xwalk-mbr-i586.yaml b/ks/generic-wayland-xwalk-mbr-i586.yaml index 156300b..5accacd 100644 --- a/ks/generic-wayland-xwalk-mbr-i586.yaml +++ b/ks/generic-wayland-xwalk-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Wayland XWalk MBR i586 -Schedule: "*" +Architecture: i586 Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-wayland-xwalk-mbr-x86_64.yaml index 2f4b4c4..8e7a7cf 100644 --- a/ks/generic-wayland-xwalk-mbr-x86_64.yaml +++ b/ks/generic-wayland-xwalk-mbr-x86_64.yaml @@ -1,6 +1,5 @@ Name: Generic Wayland XWalk MBR x86_64 Architecture: x86_64 -Schedule: "*" Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-x11-mbr-i586.yaml b/ks/generic-x11-mbr-i586.yaml index 2ae7dc4..af8e8bc 100644 --- a/ks/generic-x11-mbr-i586.yaml +++ b/ks/generic-x11-mbr-i586.yaml @@ -1,4 +1,5 @@ Name: Generic X11 MBR i586 +Architecture: i586 Schedule: "*" Active: True Platform: X11 -- 2.7.4 From 21f702f89de38a6ade6fc5eb18b86168b025144d Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sat, 1 Mar 2014 00:24:08 +0100 Subject: [PATCH 09/16] ks: fix post scripts for multimedia and xwalk Change-Id: I1c7115d8725957496a29e4e5b3004f2263e97c18 Signed-off-by: Stephane Desneux --- scripts/generic-crosswalk.post | 1 - scripts/generic-multimedia.post | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/generic-crosswalk.post b/scripts/generic-crosswalk.post index 2d7c1b8..cfd5678 100644 --- a/scripts/generic-crosswalk.post +++ b/scripts/generic-crosswalk.post @@ -14,7 +14,6 @@ if [ -f /usr/bin/weston ]; then [launcher] icon=/usr/share/icons/tizen/32x32/web-browser.png path=/usr/lib64/xwalk/xwalk http://www.tizen.org -EOF [launcher] icon=/usr/share/icons/tizen/32x32/web-browser.png diff --git a/scripts/generic-multimedia.post b/scripts/generic-multimedia.post index 88a53ec..3ee6c4b 100644 --- a/scripts/generic-multimedia.post +++ b/scripts/generic-multimedia.post @@ -14,4 +14,6 @@ path=/usr/bin/launch_cam.sh icon=/usr/share/icons/tizen/32x32/video.png path=/usr/bin/launch_video.sh +EOF + fi -- 2.7.4 From bac33e460dd64dd4480ec0a4aeb8d38b167d43ab Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sun, 2 Mar 2014 17:22:54 +0100 Subject: [PATCH 10/16] patterns: added weston-generic-config in Generic Wayland group Change-Id: I33cd8e5b645ec359f7b42820427b130f6112902e Signed-off-by: Stephane Desneux --- patterns/generic-wayland.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index 6f68f57..146041d 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -5,6 +5,7 @@ Packages: - cantarell-fonts - dejavu-fonts - weston +- weston-generic-config - mesa - xkeyboard-config - tizen-branding-default -- 2.7.4 From 3cfd8c16486e50114189ea2df13b6f83905e509c Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Sun, 2 Mar 2014 18:05:27 +0100 Subject: [PATCH 11/16] ks files: replace architectures i586 by ia32 for correct snapshots publication Change-Id: I8cb50f017f21cde288e5a6dd411e4c14b3407de3 Signed-off-by: Stephane Desneux --- ks/generic-minimal-mbr-i586.yaml | 2 +- ks/generic-qa-unsafe-minimal-mbr-i586.yaml | 2 +- ks/generic-qa-unsafe-wayland-mbr-i586.yaml | 2 +- ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml | 2 +- ks/generic-qa-unsafe-x11-mbr-i586.yaml | 2 +- ks/generic-wayland-mbr-i586.yaml | 2 +- ks/generic-wayland-xwalk-mbr-i586.yaml | 2 +- ks/generic-x11-mbr-i586.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ks/generic-minimal-mbr-i586.yaml b/ks/generic-minimal-mbr-i586.yaml index 1dc2f6a..f473eb7 100644 --- a/ks/generic-minimal-mbr-i586.yaml +++ b/ks/generic-minimal-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Minimal MBR i586 -Architecture: i586 +Architecture: ia32 Active: True Platform: Minimal Part: generic-mbr diff --git a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml index cfeba29..626485b 100644 --- a/ks/generic-qa-unsafe-minimal-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-minimal-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Minimal MBR i586 -Architecture: i586 +Architecture: ia32 Active: True Platform: Minimal Part: generic-mbr diff --git a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml index 6e9d834..5ea7315 100644 --- a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic QA Unsafe Wayland MBR i586 -Architecture: i586 +Architecture: ia32 Schedule: "*" Active: True Platform: Wayland diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml index 02e7f37..73930a8 100644 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic QA Unsafe Wayland XWalk MBR i586 -Architecture: i586 +Architecture: ia32 Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-qa-unsafe-x11-mbr-i586.yaml b/ks/generic-qa-unsafe-x11-mbr-i586.yaml index b08ae2a..e40b43a 100644 --- a/ks/generic-qa-unsafe-x11-mbr-i586.yaml +++ b/ks/generic-qa-unsafe-x11-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic QA Unsafe X11 MBR i586 -Architecture: i586 +Architecture: ia32 Schedule: "*" Active: True Platform: X11 diff --git a/ks/generic-wayland-mbr-i586.yaml b/ks/generic-wayland-mbr-i586.yaml index 0b3bb42..b85cca2 100644 --- a/ks/generic-wayland-mbr-i586.yaml +++ b/ks/generic-wayland-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Wayland MBR i586 -Architecture: i586 +Architecture: ia32 Schedule: "*" Active: True Platform: Wayland diff --git a/ks/generic-wayland-xwalk-mbr-i586.yaml b/ks/generic-wayland-xwalk-mbr-i586.yaml index 5accacd..77d7c93 100644 --- a/ks/generic-wayland-xwalk-mbr-i586.yaml +++ b/ks/generic-wayland-xwalk-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic Wayland XWalk MBR i586 -Architecture: i586 +Architecture: ia32 Active: True Platform: Wayland Part: generic-mbr diff --git a/ks/generic-x11-mbr-i586.yaml b/ks/generic-x11-mbr-i586.yaml index af8e8bc..2574ca4 100644 --- a/ks/generic-x11-mbr-i586.yaml +++ b/ks/generic-x11-mbr-i586.yaml @@ -1,5 +1,5 @@ Name: Generic X11 MBR i586 -Architecture: i586 +Architecture: ia32 Schedule: "*" Active: True Platform: X11 -- 2.7.4 From d3d48fbbf57fb930b6ca47fc5b018679fcbba42f Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 12 Mar 2014 16:52:37 +0100 Subject: [PATCH 12/16] added org.tizen.calculator in desktop apps pattern and script Change-Id: Iee814fbd63f7cdda7d5eaef78caa7034d19903f2 Signed-off-by: Stephane Desneux --- patterns/generic-desktop-applications.yaml | 1 + scripts/generic-desktop-applications.post | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml index d56cc7d..fc8a1e9 100644 --- a/patterns/generic-desktop-applications.yaml +++ b/patterns/generic-desktop-applications.yaml @@ -6,3 +6,4 @@ Packages: #- econnman #- bluetooth-agent - net-config +- org.tizen.calculator diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index c8f9b50..ecf2e70 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -1,2 +1,16 @@ ############### generic-desktop-applications.post ################ +if [ -f /usr/bin/weston ]; then + + cat >>/etc/xdg/weston/weston.ini < Date: Fri, 21 Mar 2014 12:46:26 +0100 Subject: [PATCH 13/16] workaround to generate /etc/locale.conf correctly MIC generates /etc/sysconfig/i18n but systemd expects /etc/locale.conf Change-Id: I9c9dce078eba82172c4790f9ab0912e612841064 Bug-Tizen: DEVT-160 Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index d4c3635..ce66530 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -23,4 +23,36 @@ chown -R app:app /opt/home/app # home dir must have the same label chsmack -a User /opt/home/app +# bug workaround on MIC (DEVT-160) +if [ -e /etc/sysconfig/i18n -a ! -e /etc/locale.conf ]; then + unset LANG + unset LC_CTYPE + unset LC_NUMERIC + unset LC_TIME + unset LC_COLLATE + unset LC_MONETARY + unset LC_MESSAGES + unset LC_PAPER + unset LC_NAME + unset LC_ADDRESS + unset LC_TELEPHONE + unset LC_MEASUREMENT + unset LC_IDENTIFICATION + . /etc/sysconfig/i18n + rm -f /etc/sysconfig/i18n + [ -n "$LANG" ] && echo LANG=$LANG > /etc/locale.conf + [ -n "$LC_CTYPE" ] && echo LC_CTYPE=$LC_CTYPE >> /etc/locale.conf + [ -n "$LC_NUMERIC" ] && echo LC_NUMERIC=$LC_NUMERIC >> /etc/locale.conf + [ -n "$LC_TIME" ] && echo LC_TIME=$LC_TIME >> /etc/locale.conf + [ -n "$LC_COLLATE" ] && echo LC_COLLATE=$LC_COLLATE >> /etc/locale.conf + [ -n "$LC_MONETARY" ] && echo LC_MONETARY=$LC_MONETARY >> /etc/locale.conf + [ -n "$LC_MESSAGES" ] && echo LC_MESSAGES=$LC_MESSAGES >> /etc/locale.conf + [ -n "$LC_PAPER" ] && echo LC_PAPER=$LC_PAPER >> /etc/locale.conf + [ -n "$LC_NAME" ] && echo LC_NAME=$LC_NAME >> /etc/locale.conf + [ -n "$LC_ADDRESS" ] && echo LC_ADDRESS=$LC_ADDRESS >> /etc/locale.conf + [ -n "$LC_TELEPHONE" ] && echo LC_TELEPHONE=$LC_TELEPHONE >> /etc/locale.conf + [ -n "$LC_MEASUREMENT" ] && echo LC_MEASUREMENT=$LC_MEASUREMENT >> /etc/locale.conf + [ -n "$LC_IDENTIFICATION" ] && echo LC_IDENTIFICATION=$LC_IDENTIFICATION >> /etc/locale.conf +fi + -- 2.7.4 From 869bde1dec913f5e035002579bb9a39bb7ad70e8 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 21 Mar 2014 16:53:44 +0100 Subject: [PATCH 14/16] workaround for bug PTREL-763 Change-Id: Ia4cb9f54ecb6afdd72b80122621681ca2743f9e8 Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index ce66530..2bd307b 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -55,4 +55,16 @@ if [ -e /etc/sysconfig/i18n -a ! -e /etc/locale.conf ]; then [ -n "$LC_IDENTIFICATION" ] && echo LC_IDENTIFICATION=$LC_IDENTIFICATION >> /etc/locale.conf fi - +# workaround for bug PTREL-763 +patch -p1 -d/ <<'EOF' +diff -urN bad/etc/pam.d/systemd-user good/etc/pam.d/systemd-user +--- bad/etc/pam.d/systemd-user 2014-03-20 10:01:36.657843073 +0100 ++++ good/etc/pam.d/systemd-user 2014-03-20 10:06:51.586121696 +0100 +@@ -4,5 +4,6 @@ + + account include system-auth + session include system-auth ++session required pam_systemd.so + auth required pam_deny.so + password required pam_deny.so +EOF -- 2.7.4 From ce46b2b5e92dceb5872b9d2ec41a61f215c065d4 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 21 Mar 2014 18:13:13 +0100 Subject: [PATCH 15/16] Add crosswalk to wayland images Change-Id: Id007396b9a2feeb0a0647e6a07001847db242226 Signed-off-by: Stephane Desneux --- generic.yaml | 2 + ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml | 15 -------- ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml | 15 -------- ks/generic-wayland-xwalk-mbr-i586.yaml | 13 ------- ks/generic-wayland-xwalk-mbr-x86_64.yaml | 13 ------- patterns/generic-crosswalk.yaml | 2 + scripts/generic-crosswalk.post | 43 ++++++++++++++++++---- 7 files changed, 40 insertions(+), 63 deletions(-) delete mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml delete mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml delete mode 100644 ks/generic-wayland-xwalk-mbr-i586.yaml delete mode 100644 ks/generic-wayland-xwalk-mbr-x86_64.yaml diff --git a/generic.yaml b/generic.yaml index 8d60df7..85bcca9 100644 --- a/generic.yaml +++ b/generic.yaml @@ -45,6 +45,7 @@ Wayland: - Generic Bluetooth - Generic Multimedia - Generic Desktop Applications + - Generic Crosswalk PostScripts: - generic-wayland - generic-adaptation @@ -53,6 +54,7 @@ Wayland: - generic-bluetooth - generic-multimedia - generic-desktop-applications + - generic-crosswalk X11: Part: generic-mbr diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml deleted file mode 100644 index 73930a8..0000000 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml +++ /dev/null @@ -1,15 +0,0 @@ -Name: Generic QA Unsafe Wayland XWalk MBR i586 -Architecture: ia32 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-qa-unsafe-wayland-xwalk-mbr-i586 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_i586 -Groups: - - Generic Crosswalk - - Generic Automated QA Tools -PostScripts: - - generic-crosswalk - - generic-autoqa diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml deleted file mode 100644 index ef53458..0000000 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ -Name: Generic QA Unsafe Wayland XWalk MBR x86_64 -Architecture: x86_64 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-qa-unsafe-wayland-xwalk-mbr-x86_64 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_x86_64 -Groups: - - Generic Crosswalk - - Generic Automated QA Tools -PostScripts: - - generic-crosswalk - - generic-autoqa diff --git a/ks/generic-wayland-xwalk-mbr-i586.yaml b/ks/generic-wayland-xwalk-mbr-i586.yaml deleted file mode 100644 index 77d7c93..0000000 --- a/ks/generic-wayland-xwalk-mbr-i586.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Name: Generic Wayland XWalk MBR i586 -Architecture: ia32 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-wayland-xwalk-mbr-i586 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_i586 -Groups: - - Generic Crosswalk -PostScripts: - - generic-crosswalk diff --git a/ks/generic-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-wayland-xwalk-mbr-x86_64.yaml deleted file mode 100644 index 8e7a7cf..0000000 --- a/ks/generic-wayland-xwalk-mbr-x86_64.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Name: Generic Wayland XWalk MBR x86_64 -Architecture: x86_64 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-wayland-xwalk-mbr-x86_64 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_x86_64 -Groups: - - Generic Crosswalk -PostScripts: - - generic-crosswalk diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml index a1005d1..e391a87 100644 --- a/patterns/generic-crosswalk.yaml +++ b/patterns/generic-crosswalk.yaml @@ -3,4 +3,6 @@ Description: Generic Crosswalk Name: generic-crosswalk Packages: - crosswalk +- tizen-extensions-crosswalk +- wrt-widgets diff --git a/scripts/generic-crosswalk.post b/scripts/generic-crosswalk.post index cfd5678..e3ea16d 100644 --- a/scripts/generic-crosswalk.post +++ b/scripts/generic-crosswalk.post @@ -1,9 +1,32 @@ ############### generic-crosswalk.post ################ -# patch install path of crosswalk -if [ -d /usr/lib64/xwalk ]; then - ln -s ../lib64/xwalk /usr/lib -fi +# Initialize the native application database +pkg_initdb +ail_initdb + +# start wrt widgets preinstall +prepare_widgets.sh + +# install widgets at first run +cat </lib/systemd/user/xwalk_widgets_preinstall.service +[Unit] +Description=Installation of pre-installed widgets +After=dbus.service +ConditionPathExists=!/home/app/.config/xwalk-service/applications.db + +[Service] +Type=oneshot +ExecStart=/usr/bin/install_widgets.sh + +[Install] +WantedBy=weston.target +EOF + +mkdir -p /lib/systemd/user/xwalk.target.wants +ln -sf ../xwalk_widgets_preinstall.service /lib/systemd/user/weston.target.wants/xwalk_widgets_preinstall.service + + +# add launchers to weston.ini if [ -f /usr/bin/weston ]; then @@ -13,11 +36,17 @@ if [ -f /usr/bin/weston ]; then [launcher] icon=/usr/share/icons/tizen/32x32/web-browser.png -path=/usr/lib64/xwalk/xwalk http://www.tizen.org +path=/usr/lib64/xwalk/xwalk http://www.google.com [launcher] -icon=/usr/share/icons/tizen/32x32/web-browser.png -path=/usr/lib64/xwalk/xwalk http://www.google.com +icon=/usr/share/icons/tizen/32x32/annex.png +path=/usr/bin/xwalk-launcher hnabpnbionlaokfnobomjleblmmiefig + +[launcher] +icon=/usr/share/icons/tizen/32x32/bubblewrap.png +path=/usr/bin/xwalk-launcher kmnbdhfbkjkeilhpbooaecgpllbollfn + EOF fi + -- 2.7.4 From 56585817ba109a9f945cb06dffb7a09b082c2c66 Mon Sep 17 00:00:00 2001 From: Corentin Lecouvey Date: Thu, 10 Apr 2014 11:47:50 +0200 Subject: [PATCH 16/16] add bluetooth-frwk-service and bluetooth-frwk-core packages to bluetooth pattern Previously just bluetooth-frwk was installed but it only contains a library. Now the needed bluetooth daemons will be installed in the image. Change-Id: I70639c389b9ec6683bec460536b0958ca002b070 Signed-off-by: Corentin Lecouvey --- patterns/generic-bluetooth.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patterns/generic-bluetooth.yaml b/patterns/generic-bluetooth.yaml index b4cfc6b..61012ba 100644 --- a/patterns/generic-bluetooth.yaml +++ b/patterns/generic-bluetooth.yaml @@ -3,6 +3,7 @@ Description: Generic Bluetooth Name: generic-bluetooth Packages: - bluez -- bluetooth-frwk +- bluetooth-frwk-core +- bluetooth-frwk-service - bluetooth-share - bluetooth-tools-no-firmware -- 2.7.4