From 5cbc7fdb7f236af5f50e194a00e3188371edd0e3 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 29 Aug 2014 09:16:54 +0200 Subject: [PATCH 01/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 02/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 03/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 04/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 05/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 06/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 07/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 08/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 09/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 10/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 11/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 From fc60ec482d7da9dbddbd29bdeb1328aad3eedcec Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Fri, 3 Oct 2014 17:34:59 +0200 Subject: [PATCH 12/16] Add app_rw directory creation for each user This directory is referenced : TZ_USER_APP=${TZ_USER_HOME}/apps_rw BUG=TC-1387 Signed-off-by: Baptiste DURAND Change-Id: I935e75d9580231d5e4bd9f3f456bca1a52fd365d --- scripts/generic-base.post | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 93efb86..875fd24 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -48,6 +48,7 @@ function generic_base_fix_user_homedir() { generic_base_user_exists $user || return 1 homedir=$(generic_base_user_home $user) + mkdir -p $homedir/app_rw for appdir in desktop manifest dbspace; do mkdir -p $homedir/.applications/$appdir done -- 2.7.4 From 966ec85226e3aeb07dc4294d77c32a5746994690 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Mon, 6 Oct 2014 17:03:20 +0200 Subject: [PATCH 13/16] Fix developer home directory creation (emulator only) The user 'developer' must behave as a normal user on emalator images Change-Id: I2cd7976de732b313c0652dec9602e989d5cf3fc3 Bug-Tizen: TC-320 Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 4 ++++ scripts/generic-desktop-applications.post | 3 +++ 2 files changed, 7 insertions(+) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 875fd24..820c266 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -56,3 +56,7 @@ function generic_base_fix_user_homedir() { chown -R $user:users $homedir return 0 } + +# fix TC-320 for SDK +. /etc/tizen-build.conf +[ "${TZ_BUILD_WITH_EMULATOR}" == "1" ] && generic_base_fix_user_homedir developer diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index c026a94..1c5f89e 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -17,4 +17,7 @@ function generic_desktop_applications_fix_userhome() { chown -R $user:users $homedir/.applications/dbspace/ } +# fix TC-320 for SDK +. /etc/tizen-build.conf +[ "${TZ_BUILD_WITH_EMULATOR}" == "1" ] && generic_desktop_applications_fix_userhome developer -- 2.7.4 From e004cf9375570711deb255f5ccc1b774b204d4d7 Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Wed, 8 Oct 2014 11:39:03 +0200 Subject: [PATCH 14/16] Fix directory name for app to apps_rw according to /etc/tizen-platform.conf BUG=TC-1387 Change-Id: I0ddec26fbdb5b9accfd925939012e6077544fa1d Signed-off-by: Baptiste DURAND --- scripts/generic-base.post | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 820c266..59472b4 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -48,7 +48,7 @@ function generic_base_fix_user_homedir() { generic_base_user_exists $user || return 1 homedir=$(generic_base_user_home $user) - mkdir -p $homedir/app_rw + mkdir -p $homedir/apps_rw for appdir in desktop manifest dbspace; do mkdir -p $homedir/.applications/$appdir done -- 2.7.4 From 77bb487ee42a9eb15f4d8650e5488cf9d901e722 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 8 Oct 2014 12:02:20 +0200 Subject: [PATCH 15/16] generic-adaptation: add mesa support for vmware Change-Id: I4b8b482c3ca3f075c251f2bf40eada7544512768 Bug-Tizen: TC-1043/part Signed-off-by: Philippe Coval --- Makefile | 1 + src/generic-adaptation/Makefile | 3 +++ src/generic-adaptation/generic-adaptation.sh | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 src/generic-adaptation/Makefile create mode 100644 src/generic-adaptation/generic-adaptation.sh diff --git a/Makefile b/Makefile index 4db9456..e990878 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ install: 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 + make -C src/generic-adaptation $@ test: merge-patterns -o output/ -p patterns -s diff --git a/src/generic-adaptation/Makefile b/src/generic-adaptation/Makefile new file mode 100644 index 0000000..69b512b --- /dev/null +++ b/src/generic-adaptation/Makefile @@ -0,0 +1,3 @@ +install: generic-adaptation.sh + install -d ${DESTDIR}/etc/profile.d/ + install $< ${DESTDIR}/etc/profile.d/ diff --git a/src/generic-adaptation/generic-adaptation.sh b/src/generic-adaptation/generic-adaptation.sh new file mode 100644 index 0000000..9a2fabb --- /dev/null +++ b/src/generic-adaptation/generic-adaptation.sh @@ -0,0 +1,13 @@ +do_gallium=true + +/usr/sbin/lspci \ + | grep 'VGA compatible controller: VMware' >/dev/null 2>&1 \ + || do_gallium=false + +if $do_gallium ; then + EGL_PLATFORM=gallium + export EGL_PLATFORM + + EGL_DRIVER=egl_gallium + export EGL_DRIVER +fi -- 2.7.4 From b7d3ced2f1ab861d84626c24e2c4912730ca4b08 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 8 Oct 2014 12:03:10 +0200 Subject: [PATCH 16/16] packaging: add generic-adaptation subpackage Change-Id: Ibc255fa5893d9b8770523cd295a69bda1bee4ca0 Bug-Tizen: TC-1043/part Signed-off-by: Philippe Coval --- packaging/meta-generic.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packaging/meta-generic.spec b/packaging/meta-generic.spec index be1ecda..5d114a7 100644 --- a/packaging/meta-generic.spec +++ b/packaging/meta-generic.spec @@ -1,16 +1,25 @@ Summary: Tizen Package Groups and Images Configurations Name: meta-generic Version: 0 -Release: 1 +Release: 0 License: GPL-2.0 Group: Base/Configuration URL: http://www.tizen.org Source: %{name}-%{version}.tar.bz2 Source1001: meta-generic.manifest +BuildArch: noarch %description Tizen Package Groups and Image Configurations for Base OS + +%package adaptation +Summary: Hardware adataption configuration files +BuildArch: noarch + +%description adaptation +Hardware adaptation tweaks to ship inside image + %prep %setup -q cp %{SOURCE1001} . @@ -27,3 +36,7 @@ make %attr(644,-,-) %{_datadir}/package-groups/generic/*.yaml %{_datadir}/image-configurations/generic/scripts + +%files adaptation +%{_sysconfdir}/profile.d/generic-adaptation.sh + -- 2.7.4