From 32f92bb1aaba28c45c7936cb25169233988313b3 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 27 Feb 2014 14:17:22 +0100 Subject: [PATCH] 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