From e166598ba06e504262b9ab19fc435b46b64ed2d8 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 15 Jul 2014 16:07:17 +0200 Subject: [PATCH 01/16] define patterns and scripts available for all tizen profiles Most patterns and scripts were taken from profile/common/meta to make these definitions inheritable for other Tizen profiles Bug-Tizen: PTREL-807 Change-Id: I08a5e0b39646c2419b871a7691226b4a379f452e Signed-off-by: Stephane Desneux --- Makefile | 2 + packaging/meta-generic.spec | 4 +- patterns/generic-adaptation-x86-multimedia.yaml | 8 --- patterns/generic-base.yaml | 1 + patterns/generic-console-tools.yaml | 1 - patterns/generic-crosswalk.yaml | 1 - patterns/generic-desktop-applications.yaml | 4 -- patterns/generic-middleware.yaml | 8 +-- patterns/generic-multimedia-intel.yaml | 8 +++ patterns/generic-multimedia.yaml | 4 -- patterns/generic-qa.yaml | 2 - patterns/generic-qt5.yaml | 3 +- patterns/generic-wayland.yaml | 1 - patterns/generic-webkit.yaml | 17 ------ patterns/generic-x11-intel.yaml | 8 +++ patterns/generic-x11.yaml | 9 +++ scripts/buildname.nochroot | 6 ++ scripts/generic-adaptation.post | 3 + scripts/generic-applications.post | 3 + scripts/generic-autoqa.post | 35 +++++++++++ scripts/generic-base-micro.post | 3 + scripts/generic-base.post | 81 +++++++++++++++++++++++++ scripts/generic-bluetooth.post | 3 + scripts/generic-console-tools.post | 41 +++++++++++++ scripts/generic-crosswalk.post | 8 +++ scripts/generic-desktop-applications.post | 40 ++++++++++++ scripts/generic-development.post | 3 + scripts/generic-middleware.post | 3 + scripts/generic-multimedia-intel.post | 3 + scripts/generic-multimedia.post | 3 + scripts/generic-packaging.post | 9 +++ scripts/generic-qa.post | 3 + scripts/generic-qt5.post | 3 + scripts/generic-wayland.post | 3 + scripts/generic-x11-intel.post | 3 + scripts/generic-x11.post | 9 +++ 36 files changed, 301 insertions(+), 45 deletions(-) delete mode 100644 patterns/generic-adaptation-x86-multimedia.yaml create mode 100644 patterns/generic-multimedia-intel.yaml delete mode 100644 patterns/generic-webkit.yaml create mode 100644 patterns/generic-x11-intel.yaml create mode 100644 patterns/generic-x11.yaml create mode 100644 scripts/buildname.nochroot create mode 100644 scripts/generic-adaptation.post create mode 100644 scripts/generic-applications.post create mode 100644 scripts/generic-autoqa.post create mode 100644 scripts/generic-base-micro.post create mode 100644 scripts/generic-base.post create mode 100644 scripts/generic-bluetooth.post create mode 100644 scripts/generic-console-tools.post 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-intel.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-x11-intel.post create mode 100644 scripts/generic-x11.post diff --git a/Makefile b/Makefile index ec74ec4..4db9456 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,9 @@ all: install: install -d ${DESTDIR}/usr/share/package-groups/generic + install -d ${DESTDIR}/usr/share/image-configurations/generic/scripts install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/generic + install -D scripts/* ${DESTDIR}/usr/share/image-configurations/generic/scripts test: merge-patterns -o output/ -p patterns -s diff --git a/packaging/meta-generic.spec b/packaging/meta-generic.spec index 697e05b..be1ecda 100644 --- a/packaging/meta-generic.spec +++ b/packaging/meta-generic.spec @@ -24,4 +24,6 @@ make %files %manifest %{name}.manifest -/usr/share/package-groups/generic/*.yaml +%attr(644,-,-) %{_datadir}/package-groups/generic/*.yaml +%{_datadir}/image-configurations/generic/scripts + diff --git a/patterns/generic-adaptation-x86-multimedia.yaml b/patterns/generic-adaptation-x86-multimedia.yaml deleted file mode 100644 index 24ea5ef..0000000 --- a/patterns/generic-adaptation-x86-multimedia.yaml +++ /dev/null @@ -1,8 +0,0 @@ -Summary: Generic Adaptation x86 Multimedia -Description: Generic Adaptation x86 Multimedia -Name: generic-adaptation-x86-multimedia -Packages: -- gst-libav -- gstreamer-vaapi -- libva-intel-driver -- vaapi-tools diff --git a/patterns/generic-base.yaml b/patterns/generic-base.yaml index 6090af5..314720f 100644 --- a/patterns/generic-base.yaml +++ b/patterns/generic-base.yaml @@ -30,3 +30,4 @@ Packages: - default-ac-domains - wpa_supplicant - prelink +- usbutils diff --git a/patterns/generic-console-tools.yaml b/patterns/generic-console-tools.yaml index 552cac2..f94aeeb 100644 --- a/patterns/generic-console-tools.yaml +++ b/patterns/generic-console-tools.yaml @@ -27,4 +27,3 @@ Packages: - ca-certificates-mozilla - iptables - tree -- intel-gpu-tools diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml index e391a87..4161aaa 100644 --- a/patterns/generic-crosswalk.yaml +++ b/patterns/generic-crosswalk.yaml @@ -4,5 +4,4 @@ Name: generic-crosswalk Packages: - crosswalk - tizen-extensions-crosswalk -- wrt-widgets diff --git a/patterns/generic-desktop-applications.yaml b/patterns/generic-desktop-applications.yaml index fc8a1e9..6cfa5a0 100644 --- a/patterns/generic-desktop-applications.yaml +++ b/patterns/generic-desktop-applications.yaml @@ -3,7 +3,3 @@ Description: Generic Desktop Applications Name: generic-desktop-applications Packages: - emotion -#- econnman -#- bluetooth-agent -- net-config -- org.tizen.calculator diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 7aa7b6e..3d618bf 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -8,10 +8,10 @@ Packages: - efl-theme-tizen-hd - evolution-data-server - libprivilege-control-conf -- model-config-generic -- neard -- neardal +- notification-service - obexd -- ofono - pkgmgr-server - sqlite3 +- usb-server +- sdbd +- security-server diff --git a/patterns/generic-multimedia-intel.yaml b/patterns/generic-multimedia-intel.yaml new file mode 100644 index 0000000..bb76856 --- /dev/null +++ b/patterns/generic-multimedia-intel.yaml @@ -0,0 +1,8 @@ +Summary: Generic Multimedia Intel +Description: Generic Multimedia Intel +Name: generic-multimedia-intel +Packages: +- gst-libav +- gstreamer-vaapi +- libva-intel-driver +- vaapi-tools diff --git a/patterns/generic-multimedia.yaml b/patterns/generic-multimedia.yaml index b4388b4..a05fca7 100644 --- a/patterns/generic-multimedia.yaml +++ b/patterns/generic-multimedia.yaml @@ -9,12 +9,8 @@ Packages: - 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 diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index 69e039c..9060b70 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -9,7 +9,5 @@ Packages: - eet-tools - gdb - gstreamer-utils -- neard-test -- ofono-test - python-xml - wget diff --git a/patterns/generic-qt5.yaml b/patterns/generic-qt5.yaml index e52d061..c9c496f 100644 --- a/patterns/generic-qt5.yaml +++ b/patterns/generic-qt5.yaml @@ -2,5 +2,4 @@ Summary: Generic Qt5 Description: Generic Qt5 Name: generic-qt5 Packages: -- qt5-tools -- qt5-qtdeclarative-examples +- qt-tizen-full diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index 908b3f7..6f68f57 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -5,7 +5,6 @@ Packages: - cantarell-fonts - dejavu-fonts - weston -- weston-clients - mesa - xkeyboard-config - tizen-branding-default diff --git a/patterns/generic-webkit.yaml b/patterns/generic-webkit.yaml deleted file mode 100644 index 25950ab..0000000 --- a/patterns/generic-webkit.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Summary: Generic Webkit -Description: Generic Webkit -Name: generic-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 diff --git a/patterns/generic-x11-intel.yaml b/patterns/generic-x11-intel.yaml new file mode 100644 index 0000000..7059021 --- /dev/null +++ b/patterns/generic-x11-intel.yaml @@ -0,0 +1,8 @@ +Summary: Generic X11 Intel +Description: Generic X11 Intel +Name: generic-x11-intel +Packages: +- xf86-input-synaptics +- xf86-video-intel +- xf86-input-keyboard + diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml new file mode 100644 index 0000000..c46dd76 --- /dev/null +++ b/patterns/generic-x11.yaml @@ -0,0 +1,9 @@ +Summary: Generic X11 +Description: Generic X11 +Name: generic-x11 +Packages: +- xorg-server +- xorg-launch-helper +- enlightenment +- user-session-units + diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot new file mode 100644 index 0000000..b248084 --- /dev/null +++ b/scripts/buildname.nochroot @@ -0,0 +1,6 @@ +####################### buildname.nochroot ####################### +if [ -n "$IMG_NAME" ]; then + echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release + echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release + echo "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot +fi diff --git a/scripts/generic-adaptation.post b/scripts/generic-adaptation.post new file mode 100644 index 0000000..beebb60 --- /dev/null +++ b/scripts/generic-adaptation.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "#################### generic-adaptation.post ####################" + diff --git a/scripts/generic-applications.post b/scripts/generic-applications.post new file mode 100644 index 0000000..a6ceebd --- /dev/null +++ b/scripts/generic-applications.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "#################### generic-applications.post ####################" + diff --git a/scripts/generic-autoqa.post b/scripts/generic-autoqa.post new file mode 100644 index 0000000..145c449 --- /dev/null +++ b/scripts/generic-autoqa.post @@ -0,0 +1,35 @@ +#!/bin/sh +echo "#################### generic-autoqa.post ####################" + +# 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----- +MIIBugIBAAKBgQCE/Ulli3iKf8IwKVacoGCDyZhuabZ+h2oBSd/xlURZa/p3EQVg +9cFXcyYcjDvKqDu/OZ82l1L33ytZQ1D7Ag/4WOTdUZImQiQakntE6tMLeEtkiXBd +l4s9QQY8BrHcuoB4fZoLlbs2Jqbz+e2HDlUD+rKmzba/5d70Ze9YmFyDRQIVANH/ +yWdBBWXrFRexL6DIBTwFATM3AoGAcTiEj7Ai18KkajMW/TeiTWA+O3ZeBCFHLPGx +tSyQKkJ0EUJfTSg9ixn4XfLW61JuY/pkhRDMwCbAto1ymy11hqWKRadpxAmu4czQ +vWYUSERiS/28xGjKrazWjpM0sSmqZ+Tgezc1FWfCWAfHHpEg0YcttnOvJTB8hj6V +d84WHKoCgYAw/uP6bE7xxCWUqAtQKob2P/xkXPPWKZ2nAWCxgnYVimGuXc+jThOo +UBhkIpD+fdMtbRHdLtbzOLohUgaZokgEi58+pjJAJU/tW4Lvzw0nBfReG5OTvfuu +CLchiFnppSDLi8u4Q4URorg4WFudXrGvUBwvHSGJYNczj7e3XJissAIUTPS6vh9U +pp1kboovuWeQFduOSOU= +-----END DSA PRIVATE KEY----- +EOF + +# the public key +cat </root/.ssh/id_eat_dsa.pub +ssh-dss AAAAB3NzaC1kc3MAAACBAIT9SWWLeIp/wjApVpygYIPJmG5ptn6HagFJ3/GVRFlr+ncRBWD1wVdzJhyMO8qoO785nzaXUvffK1lDUPsCD/hY5N1RkiZCJBqSe0Tq0wt4S2SJcF2Xiz1BBjwGsdy6gHh9mguVuzYmpvP57YcOVQP6sqbNtr/l3vRl71iYXINFAAAAFQDR/8lnQQVl6xUXsS+gyAU8BQEzNwAAAIBxOISPsCLXwqRqMxb9N6JNYD47dl4EIUcs8bG1LJAqQnQRQl9NKD2LGfhd8tbrUm5j+mSFEMzAJsC2jXKbLXWGpYpFp2nECa7hzNC9ZhRIRGJL/bzEaMqtrNaOkzSxKapn5OB7NzUVZ8JYB8cekSDRhy22c68lMHyGPpV3zhYcqgAAAIAw/uP6bE7xxCWUqAtQKob2P/xkXPPWKZ2nAWCxgnYVimGuXc+jThOoUBhkIpD+fdMtbRHdLtbzOLohUgaZokgEi58+pjJAJU/tW4Lvzw0nBfReG5OTvfuuCLchiFnppSDLi8u4Q4URorg4WFudXrGvUBwvHSGJYNczj7e3XJissA== meego@testCtrlPC +EOF + +# public key is authorized to login (automatically) +cat /root/.ssh/id_eat_dsa.pub >>/root/.ssh/authorized_keys + +# adjust permissions on ssh config files +chmod 600 /root/.ssh/* diff --git a/scripts/generic-base-micro.post b/scripts/generic-base-micro.post new file mode 100644 index 0000000..9601280 --- /dev/null +++ b/scripts/generic-base-micro.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "#################### generic-base-micro.post ####################" + diff --git a/scripts/generic-base.post b/scripts/generic-base.post new file mode 100644 index 0000000..5311de3 --- /dev/null +++ b/scripts/generic-base.post @@ -0,0 +1,81 @@ +#!/bin/sh +echo "#################### generic-base.post ####################" + +# setup systemd default target for user session +cat <<'EOF' >>/lib/systemd/user/default.target +[Unit] +Description=User session default target +EOF +mkdir -p /lib/systemd/user/default.target.wants + +# start dbus session +ln -s ../dbus.service /lib/systemd/user/default.target.wants/ + +# Run prelink to speed up dynamic binary/library loading +/usr/sbin/prelink --all + +ln -sf /proc/self/mounts /etc/mtab + +# fix TIVI-2291 +sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" /etc/modprobe.d/blacklist.conf + +# sdx: fix smack labels on /var/log +chsmack -a '*' /var/log + +# workaround for bug PTREL-763 +patch -b -p1 -d/ <<'EOF' +--- 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 + +# extra fix to avoid root and display sessions (PTREL-763) +patch -b -p1 -d/ <<'EOF' +--- bad/etc/pam.d/system-auth 2014-04-07 06:16:51.888018876 -0700 ++++ good/etc/pam.d/system-auth 2014-04-07 06:16:46.335018503 -0700 +@@ -11,7 +11,6 @@ + password required pam_deny.so + + session optional pam_keyinit.so revoke +-session optional pam_systemd.so + session required pam_limits.so + session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid + session required pam_unix.so +EOF + +# create appfw dirs inside homes +function generic_base_user_exists() { + user=$1 + getent passwd | grep -q ^${user}: +} + +function generic_base_user_home() { + user=$1 + getent passwd | grep ^${user}: | cut -f6 -d':' +} + +function generic_base_fix_user_homedir() { + user=$1 + generic_base_user_exists $user || return 1 + + homedir=$(generic_base_user_home $user) + for appdir in desktop manifest dbspace; do + mkdir -p $homedir/.applications/$appdir + done + find $homedir -type d -exec chsmack -a User {} \; + chown -R $user:users $homedir + return 0 +} + +# create appfw dirs for user 'app' +generic_base_fix_user_homedir app + +# adjust app group: main group 'users', extra group 'app' +usermod -g users app +usermod -G app app diff --git a/scripts/generic-bluetooth.post b/scripts/generic-bluetooth.post new file mode 100644 index 0000000..e2a3d25 --- /dev/null +++ b/scripts/generic-bluetooth.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "#################### generic-bluetooth.post ####################" + diff --git a/scripts/generic-console-tools.post b/scripts/generic-console-tools.post new file mode 100644 index 0000000..739f905 --- /dev/null +++ b/scripts/generic-console-tools.post @@ -0,0 +1,41 @@ +#!/bin/sh +echo "#################### generic-console-tools.post ####################" + +# customize bash prompt +cat >/etc/profile.d/bash_prompt_custom.sh <<'EOF' +if [ "$PS1" ]; then + + function proml { + # set a fancy prompt (overwrite the one in /etc/profile) + local default="\[\e[0m\]" + local usercol='\[\e[1;34m\]' # blue + local hostcol='\[\e[1;32m\]' # green + local pathcol='\[\e[1;33m\]' # yellow + local gitcol='\[\e[1;31m\]' # light red + local termcmd='' + local _p="$"; + + if [ "`id -u`" -eq 0 ]; then + usercol='\[\e[1;31m\]' + _p="#" + fi + + PS1="${usercol}\u${default}@${hostcol}\h${default}:${pathcol}\w${default}${gitcol}${default}${_p} ${termcmd}" + } + + proml + + function rcd () { + [ "${1:0:1}" == "/" ] && { cd $1; } || { cd $(pwd -P)/$1; } + } + + alias ll="ls -lZ" + alias lr="ls -ltrZ" + alias la="ls -alZ" + + function get_manifest () { + rpm -qa --queryformat="%{name} %{Version} %{Release} %{VCS}\n" | sort + } +fi +EOF + diff --git a/scripts/generic-crosswalk.post b/scripts/generic-crosswalk.post new file mode 100644 index 0000000..d2a3176 --- /dev/null +++ b/scripts/generic-crosswalk.post @@ -0,0 +1,8 @@ +#!/bin/sh +echo "#################### generic-crosswalk.post ####################" + +# make crosswak start in user session (default target) +mkdir -p /lib/systemd/user/default.target.wants/ +ln -s ../xwalk.service /lib/systemd/user/default.target.wants/ + + diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post new file mode 100644 index 0000000..684d4ab --- /dev/null +++ b/scripts/generic-desktop-applications.post @@ -0,0 +1,40 @@ +#!/bin/sh +echo "#################### generic-desktop-applications.post ####################" + +# temp workaround to fill each user app_info database with global db infos +. /etc/tizen-platform.conf +ail_initdb +pkg_initdb + +echo "Fixing multiuser app_info dbs" +chsmack -a "_" $TZ_SYS_DB/.app_info.db* +chmod 764 $TZ_SYS_DB/.app_info.db* + +# depends on generic-base functions +function generic_desktop_applications_fix_userhome() { + user=$1 + + generic_base_user_exists $user || return 1 + homedir=$(generic_base_user_home $user) + + echo "Fix app_info.db of $user" + chown -R $user:users $homedir/.applications/dbspace/ + + if [ -f $homedir/.applications/dbspace/.app_info.db ]; then + sqlite3 $homedir/.applications/dbspace/.app_info.db <>/etc/ssh/sshd_config + echo "AddressFamily inet" >>/etc/ssh/sshd_config +fi + -- 2.7.4 From 6bd135d9a8de8d6b2df2eeb762c2b5be27f96984 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 6 Aug 2014 10:27:49 +0300 Subject: [PATCH 02/16] Move obexd to Bluetooth pattern Change-Id: I2c2563989aa4c03014028290bc3e641008dbe316 Signed-off-by: Mikko Ylinen --- patterns/generic-bluetooth.yaml | 1 + patterns/generic-middleware.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/generic-bluetooth.yaml b/patterns/generic-bluetooth.yaml index 61012ba..23799c5 100644 --- a/patterns/generic-bluetooth.yaml +++ b/patterns/generic-bluetooth.yaml @@ -7,3 +7,4 @@ Packages: - bluetooth-frwk-service - bluetooth-share - bluetooth-tools-no-firmware +- obexd diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 3d618bf..604bf16 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -9,7 +9,6 @@ Packages: - evolution-data-server - libprivilege-control-conf - notification-service -- obexd - pkgmgr-server - sqlite3 - usb-server -- 2.7.4 From 984fd6ab0cb8f900fdc9ca7523e082ba68ea4c6d Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 6 Aug 2014 10:28:54 +0300 Subject: [PATCH 03/16] Move TIVI-2291 hotfix to generic-adaption.post Change-Id: I027d9bbfb1afe0e1de02dbe2573a8dafff19aee9 Signed-off-by: Mikko Ylinen --- scripts/generic-adaptation.post | 3 +++ scripts/generic-base.post | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/generic-adaptation.post b/scripts/generic-adaptation.post index beebb60..2ae0730 100644 --- a/scripts/generic-adaptation.post +++ b/scripts/generic-adaptation.post @@ -1,3 +1,6 @@ #!/bin/sh echo "#################### generic-adaptation.post ####################" +# fix TIVI-2291 +sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" /etc/modprobe.d/blacklist.conf + diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 5311de3..a9515c4 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -16,9 +16,6 @@ ln -s ../dbus.service /lib/systemd/user/default.target.wants/ ln -sf /proc/self/mounts /etc/mtab -# fix TIVI-2291 -sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" /etc/modprobe.d/blacklist.conf - # sdx: fix smack labels on /var/log chsmack -a '*' /var/log -- 2.7.4 From 10f735f6159c4c1a5fb09b9d1da00b6a286f454c Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 13 Aug 2014 19:09:30 +0200 Subject: [PATCH 04/16] generic-desktop-applications.post: remove workarounds for appfw databases Change-Id: I8cf7782b9a7c02b84a8928c4fcb0691b36fed1f2 Signed-off-by: Stephane Desneux --- scripts/generic-desktop-applications.post | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index 684d4ab..f5365a8 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -9,6 +9,9 @@ pkg_initdb echo "Fixing multiuser app_info dbs" chsmack -a "_" $TZ_SYS_DB/.app_info.db* chmod 764 $TZ_SYS_DB/.app_info.db* +echo "Fixing multiuser pkgmgr-info dbs" +chsmack -a "_" $TZ_SYS_DB/.pkgmgr*.db* +chmod 764 $TZ_SYS_DB/.pkgmgr*.db* # depends on generic-base functions function generic_desktop_applications_fix_userhome() { @@ -19,18 +22,6 @@ function generic_desktop_applications_fix_userhome() { echo "Fix app_info.db of $user" chown -R $user:users $homedir/.applications/dbspace/ - - if [ -f $homedir/.applications/dbspace/.app_info.db ]; then - sqlite3 $homedir/.applications/dbspace/.app_info.db < Date: Thu, 21 Aug 2014 15:41:02 +0300 Subject: [PATCH 05/16] Remove usb-server from Generic Middleware usb-server is not available in Tizen IVI. Thus, it cannot be in a Generic pattern. Change-Id: Ic21dcd718ca7c4834616f943a40d88265ab04c82 Signed-off-by: Mikko Ylinen --- patterns/generic-middleware.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 604bf16..dda0ab3 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -11,6 +11,5 @@ Packages: - notification-service - pkgmgr-server - sqlite3 -- usb-server - sdbd - security-server -- 2.7.4 From 5cbc7fdb7f236af5f50e194a00e3188371edd0e3 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 29 Aug 2014 09:16:54 +0200 Subject: [PATCH 06/16] Migrate 'Generic EFI Boot' pattern and scripts from profile/common/meta Rename them as well to setup-boot since setup-scripts package aims to manage different bootloaders Change-Id: I14195de6ed53887bd043cda44989fafcf988cd88 Bug-Tizen: TC-1513 Signed-off-by: Stephane Desneux Signed-off-by: Philippe Coval --- patterns/generic-setup-boot.yaml | 8 ++++++++ scripts/generic-setup-boot.post | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 patterns/generic-setup-boot.yaml create mode 100644 scripts/generic-setup-boot.post diff --git a/patterns/generic-setup-boot.yaml b/patterns/generic-setup-boot.yaml new file mode 100644 index 0000000..bce38b4 --- /dev/null +++ b/patterns/generic-setup-boot.yaml @@ -0,0 +1,8 @@ +Summary: Generic Setup Boot +Description: Generic Setup Boot +Name: generic-setup-boot +Packages: +- gummiboot-splash +- setup-scripts-gummiboot +- setup-scripts-clone +- gptfdisk diff --git a/scripts/generic-setup-boot.post b/scripts/generic-setup-boot.post new file mode 100644 index 0000000..217d822 --- /dev/null +++ b/scripts/generic-setup-boot.post @@ -0,0 +1,5 @@ +#!/bin/sh +echo "#################### generic-setup-boot.post ##################" + +# Install and configure the boot-loader, /etc/fstab, and so on +/usr/sbin/setup-scripts-boot -- 2.7.4 From 3c4a1a0aec1bf11d803d1fd0416fb3f0ea878a6a Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 29 Aug 2014 11:22:53 +0200 Subject: [PATCH 07/16] Generic Middleware: migreation from csr-framework to csf-framework Change-Id: Id7b9294dcca96e1896570b9a78687cb5a6612d27 Bug-Tizen: TC-1551 Signed-off-by: Stephane Desneux --- patterns/generic-middleware.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index dda0ab3..e8ddb82 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -3,7 +3,7 @@ Description: Generic Middleware Name: generic-middleware Packages: - calendar-service -- csr-framework +- csf-framework - elm-misc - efl-theme-tizen-hd - evolution-data-server -- 2.7.4 From 794a8331cb577438beb9b5b6a9dd7cb9ba87c07a Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Thu, 4 Sep 2014 17:27:09 +0200 Subject: [PATCH 08/16] Generic X11: add "xf86-input-evdev" for USB input devices Without "xf86-input-evdev", hotplugged input devices (such as USB mouses, keyboards...) will not be recognized. Moreover, as we do not have "xf86-input-mouse", this means that without this fix, mouses will never work. Change-Id: I58e9bb644701dda87b31cf6ed25ce9fa5125f1ef Signed-off-by: Manuel Bachmann --- patterns/generic-x11.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml index c46dd76..c2ad5e0 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/generic-x11.yaml @@ -6,4 +6,5 @@ Packages: - xorg-launch-helper - enlightenment - user-session-units +- xf86-input-evdev -- 2.7.4 From b7559f23b03f841824afd9d422f947eb8dd3f87f Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 2 Sep 2014 22:30:19 +0300 Subject: [PATCH 09/16] Disable zypper snapper plugin snapper daemon isn't properly configured so disable zypper snapper commit plugin until then. Change-Id: I5ba90add84269e8e235b3dafdfc960e38f2bc2d7 Signed-off-by: Mikko Ylinen --- patterns/generic-console-tools.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/generic-console-tools.yaml b/patterns/generic-console-tools.yaml index f94aeeb..5347d5a 100644 --- a/patterns/generic-console-tools.yaml +++ b/patterns/generic-console-tools.yaml @@ -2,7 +2,6 @@ Summary: Generic Console Tools Description: Generic Console Tools Name: generic-console-tools Packages: -- snapper-zypp-plugin - tar - wget - grep -- 2.7.4 From 85c5240520a4deacc863201f2ec9ed09068cdbe4 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 17 Sep 2014 10:50:56 +0200 Subject: [PATCH 10/16] Create appfw dbs at first boot (workaround for TC-1624) Change-Id: Ic94bb91288c5fd511e4389225bea3d06e0eafdea Bug-Tizen: TC-1624 Signed-off-by: Stephane Desneux --- scripts/generic-desktop-applications.post | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index f5365a8..d644ad0 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -6,12 +6,19 @@ echo "#################### generic-desktop-applications.post ################### ail_initdb pkg_initdb -echo "Fixing multiuser app_info dbs" -chsmack -a "_" $TZ_SYS_DB/.app_info.db* -chmod 764 $TZ_SYS_DB/.app_info.db* -echo "Fixing multiuser pkgmgr-info dbs" -chsmack -a "_" $TZ_SYS_DB/.pkgmgr*.db* -chmod 764 $TZ_SYS_DB/.pkgmgr*.db* +# workaround TC-1624 (ail-initdb/pkg_initdb segfault in MIC) +cat >/usr/lib/systemd/system/appfw_initdb.service <<'EOF' +[Unit] +Description=First boot script for init App DB (workaround TC-1624) +ConditionPathExists=!/usr/dbspace/.app_info.db +Before=ac.service + +[Service] +ExecStart=/usr/bin/ail_initdb ; /usr/bin/pkg_initdb +Type=oneshot +RemainAfterExit=yes +EOF +ln -s appfw_initdb.service /usr/lib/systemd/system/graphical.target.wants/ # depends on generic-base functions function generic_desktop_applications_fix_userhome() { -- 2.7.4 From 18988fec4a3d80ede0e18f1d6728678ba03a6065 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 23 Sep 2014 14:36:50 +0200 Subject: [PATCH 11/16] Remove workaround for TC-1624 ail_initdb has been fixed by https://review.tizen.org/gerrit/#/c/27946/ so, running ail_initdb and pkg_initdb at firstboot is useless Change-Id: I6d406ddb596d61d838801570bca605c021f1440e Signed-off-by: Stephane Desneux --- scripts/generic-desktop-applications.post | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index d644ad0..42ce06a 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -6,20 +6,6 @@ echo "#################### generic-desktop-applications.post ################### ail_initdb pkg_initdb -# workaround TC-1624 (ail-initdb/pkg_initdb segfault in MIC) -cat >/usr/lib/systemd/system/appfw_initdb.service <<'EOF' -[Unit] -Description=First boot script for init App DB (workaround TC-1624) -ConditionPathExists=!/usr/dbspace/.app_info.db -Before=ac.service - -[Service] -ExecStart=/usr/bin/ail_initdb ; /usr/bin/pkg_initdb -Type=oneshot -RemainAfterExit=yes -EOF -ln -s appfw_initdb.service /usr/lib/systemd/system/graphical.target.wants/ - # depends on generic-base functions function generic_desktop_applications_fix_userhome() { user=$1 -- 2.7.4 From a0385703dfe20a676192556cff672dc4442703cb Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 23 Sep 2014 11:26:51 +0200 Subject: [PATCH 12/16] replace @BUILD_ID@ and @BUILD_DATE@ in /etc/tizen-build.conf tizen-release now ships /etc/tizen-build.conf with build information This information must be completed at image creation time with the snapshot ID and the image build date. Change-Id: I7e5055dace50286f760e462ecdec7f4d2393ac73 Signed-off-by: Stephane Desneux --- scripts/buildname.nochroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot index b248084..330adc5 100644 --- a/scripts/buildname.nochroot +++ b/scripts/buildname.nochroot @@ -3,4 +3,9 @@ if [ -n "$IMG_NAME" ]; then echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release echo "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot + + sed -ri \ + -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \ + -e "s|@BUILD_DATE[@]|$(date +%Y%m%d_%H%M%S)|g" \ + $INSTALL_ROOT/etc/tizen-build.conf fi -- 2.7.4 From a1e65de17a7adcf5ef58f8c179b17c280879ca26 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 24 Sep 2014 15:16:47 +0200 Subject: [PATCH 13/16] Remove Tizen:Common specific package desktop-skin Removed from pattern generic-wayland Change-Id: I42c7a2d2981304510ce412113ac555aa9ef62ed5 Signed-off-by: Stephane Desneux --- patterns/generic-wayland.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index 6f68f57..4a974ce 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -9,4 +9,3 @@ Packages: - xkeyboard-config - tizen-branding-default - user-session-units -- desktop-skin -- 2.7.4 From 2d6292dc992332f1e183b264d496f086ee4b5766 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 30 Sep 2014 09:56:41 +0200 Subject: [PATCH 14/16] Allow multithread debugging of xwalk in QA images Images using the 'Generic QA' pattern will allow the debugging of crosswalk threads by installing libthread_db packaged in glibc-devel-utils Change-Id: Ibbd290d6cc06b238f528e570711d65b8743874af Bug-Tizen: TC-179 Signed-off-by: Stephane Desneux --- patterns/generic-qa.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index 9060b70..c7a4973 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -8,6 +8,7 @@ Packages: - dlogutil - eet-tools - gdb +- glibc-devel-utils - gstreamer-utils - python-xml - wget -- 2.7.4 From 6f4da3319485690d097a4eceba2417780938cd98 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 2 Oct 2014 18:43:16 +0200 Subject: [PATCH 15/16] post scripts: remove fixes for 'app' user 'app' user was removed from platform/upstream/setup so there's no more needs to fix anything for this user Change-Id: Ia1d7f9aa29d91cdc1191dc06b72ab548d861800a Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 7 ------- scripts/generic-desktop-applications.post | 4 ---- 2 files changed, 11 deletions(-) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index a9515c4..5ed3d5c 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -69,10 +69,3 @@ function generic_base_fix_user_homedir() { chown -R $user:users $homedir return 0 } - -# create appfw dirs for user 'app' -generic_base_fix_user_homedir app - -# adjust app group: main group 'users', extra group 'app' -usermod -g users app -usermod -G app app diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index 42ce06a..c026a94 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -17,8 +17,4 @@ function generic_desktop_applications_fix_userhome() { chown -R $user:users $homedir/.applications/dbspace/ } -# fix app user -generic_desktop_applications_fix_userhome app - - -- 2.7.4 From f930bd66c8a2f3bfa0aecde0038224daf17cef0d Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 3 Oct 2014 15:16:36 +0200 Subject: [PATCH 16/16] generic-base.post: remove patch on /etc/pam.d/system-auth This is not needed anymore as pam_systemd.so has been removed from /etc/pam.d/system-auth by commit f879c183 on platform/upstream/pam Change-Id: I1f5348bb173dfb79d8e4baf4c584c3c0ff54b395 Bug-Tizen: TC-1357 , TC-1685 Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 5ed3d5c..93efb86 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -32,20 +32,6 @@ patch -b -p1 -d/ <<'EOF' password required pam_deny.so EOF -# extra fix to avoid root and display sessions (PTREL-763) -patch -b -p1 -d/ <<'EOF' ---- bad/etc/pam.d/system-auth 2014-04-07 06:16:51.888018876 -0700 -+++ good/etc/pam.d/system-auth 2014-04-07 06:16:46.335018503 -0700 -@@ -11,7 +11,6 @@ - password required pam_deny.so - - session optional pam_keyinit.so revoke --session optional pam_systemd.so - session required pam_limits.so - session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid - session required pam_unix.so -EOF - # create appfw dirs inside homes function generic_base_user_exists() { user=$1 -- 2.7.4