From b7d3ced2f1ab861d84626c24e2c4912730ca4b08 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 8 Oct 2014 12:03:10 +0200 Subject: [PATCH 01/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 From 72a4d5300da9073826427213bad09ffc53d9934e Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Tue, 4 Nov 2014 17:09:26 +0100 Subject: [PATCH 02/16] Remove crosswalk autostart Change-Id: Id6e0e687f3f7a06725340aad6d11b528b4896530 Signed-off-by: Baptiste DURAND --- scripts/generic-crosswalk.post | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/generic-crosswalk.post b/scripts/generic-crosswalk.post index d2a3176..b925b1f 100644 --- a/scripts/generic-crosswalk.post +++ b/scripts/generic-crosswalk.post @@ -1,8 +1,3 @@ #!/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/ - - -- 2.7.4 From b197a0da56f6d41c67da40a7b268edaca71f072b Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 12 Nov 2014 11:46:45 +0100 Subject: [PATCH 03/16] setup-boot: add bios (syslinux) suppport Change-Id: Id4630c40b97770844df5de9c41e8e8e2b41921e3 Bug-Tizen: TC-1873/part Signed-off-by: Philippe Coval --- patterns/generic-setup-boot-bios.yaml | 7 +++++++ scripts/generic-setup-boot-bios.post | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 patterns/generic-setup-boot-bios.yaml create mode 100644 scripts/generic-setup-boot-bios.post diff --git a/patterns/generic-setup-boot-bios.yaml b/patterns/generic-setup-boot-bios.yaml new file mode 100644 index 0000000..68dc6e7 --- /dev/null +++ b/patterns/generic-setup-boot-bios.yaml @@ -0,0 +1,7 @@ +Summary: Generic Setup Boot Bios +Description: Generic Setup Boot Bios +Name: generic-setup-boot-bios +Packages: +- setup-scripts-extlinux +- setup-scripts-clone + diff --git a/scripts/generic-setup-boot-bios.post b/scripts/generic-setup-boot-bios.post new file mode 100644 index 0000000..5f8265f --- /dev/null +++ b/scripts/generic-setup-boot-bios.post @@ -0,0 +1,5 @@ +#!/bin/sh +echo "#################### generic-setup-boot-bios.post ##################" + +# Install and configure the boot-loader, /etc/fstab, and so on +/usr/sbin/setup-scripts-boot -- 2.7.4 From 2580122356e548b447974bd077239d4eae9a07ee Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 12 Nov 2014 11:15:45 +0100 Subject: [PATCH 04/16] scripts/buildname.nochroot: adjust datetime substitutions in /etc/tizen-build.conf New vars have been introduced by https://review.tizen.org/gerrit/30166. This patch changes the way that datetime variables are substituted in /etc/tizen-build.conf * correct the previous code by adding UTC representation * added substitution for @BUILD_TIME@ * added substitution for @BUILD_TS@ Change-Id: I43ec223019ba6699846effbf6a69c6b5f2b2dc19 Signed-off-by: Stephane Desneux --- scripts/buildname.nochroot | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot index 330adc5..5ed5601 100644 --- a/scripts/buildname.nochroot +++ b/scripts/buildname.nochroot @@ -4,8 +4,15 @@ if [ -n "$IMG_NAME" ]; then echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release echo "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot + + build_ts=$(date -u +%s) + build_date=$(date -u --date @$build_ts +%Y%m%d_%H%M%S) + build_time=$(date -u --date @$build_ts +%H:%M:%S) + sed -ri \ -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \ - -e "s|@BUILD_DATE[@]|$(date +%Y%m%d_%H%M%S)|g" \ + -e "s|@BUILD_DATE[@]|$build_date|g" \ + -e "s|@BUILD_TIME[@]|$build_time|g" \ + -e "s|@BUILD_TS[@]|$build_ts|g" \ $INSTALL_ROOT/etc/tizen-build.conf fi -- 2.7.4 From 964c0b89f0654f5b6833bf09c43d5bac64d608bd Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 12 Nov 2014 16:11:41 +0200 Subject: [PATCH 05/16] Finalize tizen-build.conf data in a .post script Change-Id: Idca61eea02b8ae309c6dcfb14d0f3fd387f58244 Signed-off-by: Mikko Ylinen --- scripts/buildname.nochroot | 12 ------------ scripts/generic-base.post | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot index 5ed5601..b248084 100644 --- a/scripts/buildname.nochroot +++ b/scripts/buildname.nochroot @@ -3,16 +3,4 @@ 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 - - - build_ts=$(date -u +%s) - build_date=$(date -u --date @$build_ts +%Y%m%d_%H%M%S) - build_time=$(date -u --date @$build_ts +%H:%M:%S) - - sed -ri \ - -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \ - -e "s|@BUILD_DATE[@]|$build_date|g" \ - -e "s|@BUILD_TIME[@]|$build_time|g" \ - -e "s|@BUILD_TS[@]|$build_ts|g" \ - $INSTALL_ROOT/etc/tizen-build.conf fi diff --git a/scripts/generic-base.post b/scripts/generic-base.post index 59472b4..bfe460d 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -1,6 +1,17 @@ #!/bin/sh echo "#################### generic-base.post ####################" +build_ts=$(date -u +%s) +build_date=$(date -u --date @$build_ts +%Y%m%d_%H%M%S) +build_time=$(date -u --date @$build_ts +%H:%M:%S) + +sed -ri \ + -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \ + -e "s|@BUILD_DATE[@]|$build_date|g" \ + -e "s|@BUILD_TIME[@]|$build_time|g" \ + -e "s|@BUILD_TS[@]|$build_ts|g" \ + /etc/tizen-build.conf + # setup systemd default target for user session cat <<'EOF' >>/lib/systemd/user/default.target [Unit] @@ -60,3 +71,6 @@ function generic_base_fix_user_homedir() { # fix TC-320 for SDK . /etc/tizen-build.conf [ "${TZ_BUILD_WITH_EMULATOR}" == "1" ] && generic_base_fix_user_homedir developer + +# Add info.ini for system-info CAPI (TC-2047) +/usr/bin/make_info_file.sh -- 2.7.4 From 146ff92e0e7bfecd4bbeefea6c49a2c82c1feab4 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 27 Nov 2014 14:09:56 +0100 Subject: [PATCH 06/16] pattern Generic X11: added missing packages Change-Id: I6ebee6f7ab62af2cecb46fdcb6a437534577e4ba Bug-Tizen: TINF-731 Signed-off-by: Stephane Desneux --- patterns/generic-x11.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml index c2ad5e0..511014a 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/generic-x11.yaml @@ -7,4 +7,10 @@ Packages: - enlightenment - user-session-units - xf86-input-evdev - +- xf86-module-xdbg +- libxcb-dri3 +- libxcb-present +- libxcb-sync +- xdpyinfo +- xeyes +- xrandr -- 2.7.4 From 25326439599a3679bec1eaa31502bab1c0276d5f Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Fri, 5 Dec 2014 17:15:42 +0200 Subject: [PATCH 07/16] Added Tizen login manager (tlm) to generic base as login manager. tlm service is enabled using profile specific tlm-config gum-utils is added for user management functionalities Change-Id: I0c2ecd87021a680becda95087410cc27c2f3048f Signed-off-by: Imran Zaman --- patterns/generic-base.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patterns/generic-base.yaml b/patterns/generic-base.yaml index 314720f..1e9ac27 100644 --- a/patterns/generic-base.yaml +++ b/patterns/generic-base.yaml @@ -31,3 +31,5 @@ Packages: - wpa_supplicant - prelink - usbutils +- gum-utils +- tlm -- 2.7.4 From 43158dfb5e2e66250c4ce696bdeac69dca8ffa7d Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 11 Dec 2014 09:30:07 +0100 Subject: [PATCH 08/16] script/generic-base: remove patch on /etc/pam.d/systemd-user Change-Id: Idd778b149b693382aa5ad7b91b5f51c489e4dbb6 Bug-Tizen: TC-2227 Signed-off-by: Stephane Desneux --- scripts/generic-base.post | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/generic-base.post b/scripts/generic-base.post index bfe460d..08ad466 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -30,19 +30,6 @@ ln -sf /proc/self/mounts /etc/mtab # 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 - # create appfw dirs inside homes function generic_base_user_exists() { user=$1 -- 2.7.4 From 48ff4579ca01e9e70079edd7c531c85d67c0246c Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 11 Dec 2014 13:54:17 +0100 Subject: [PATCH 09/16] patterns/generic-(x11,wayland): remove user-session-units which was replaced by tlm Change-Id: Id514042be1a25caea015a3d1072838cb90c52fe4 Signed-off-by: Stephane Desneux --- patterns/generic-wayland.yaml | 1 - patterns/generic-x11.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml index 4a974ce..c5a0636 100644 --- a/patterns/generic-wayland.yaml +++ b/patterns/generic-wayland.yaml @@ -8,4 +8,3 @@ Packages: - mesa - xkeyboard-config - tizen-branding-default -- user-session-units diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml index 511014a..af5bb2c 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/generic-x11.yaml @@ -5,7 +5,6 @@ Packages: - xorg-server - xorg-launch-helper - enlightenment -- user-session-units - xf86-input-evdev - xf86-module-xdbg - libxcb-dri3 -- 2.7.4 From 30641c6fd8dc4a0bafb9d31a79175c4a34ac713c Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Mon, 5 Jan 2015 15:48:54 +0100 Subject: [PATCH 10/16] Move xf86-video-fbdev to Generic X11 pattern Bug-Tizen: TINF-748 Change-Id: I9c875f75f54205c909618650850e75d86868d4eb Signed-off-by: Stephane Desneux --- patterns/generic-x11.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml index af5bb2c..7637445 100644 --- a/patterns/generic-x11.yaml +++ b/patterns/generic-x11.yaml @@ -7,6 +7,7 @@ Packages: - enlightenment - xf86-input-evdev - xf86-module-xdbg +- xf86-video-fbdev - libxcb-dri3 - libxcb-present - libxcb-sync -- 2.7.4 From 99e8e2ef92394c2a39a4904ee3bbf9b9a0f63a5d Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 12 Jan 2015 08:42:02 +0200 Subject: [PATCH 11/16] patterns: generic-middleware: remove calendar-service calendar-service is not started and it also seems there are no dependencies to it so it's better to remove it. Change-Id: I52430874a3e4572a13d9f8a16755f3dda712ced5 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 e8ddb82..944d766 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -2,7 +2,6 @@ Summary: Generic Middleware Description: Generic Middleware Name: generic-middleware Packages: -- calendar-service - csf-framework - elm-misc - efl-theme-tizen-hd -- 2.7.4 From f56b959e1c6fd74036c6bc98860ae1a40913332f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Fri, 23 Jan 2015 15:30:07 +0100 Subject: [PATCH 12/16] Adding unprotect/protect for buxton direct access MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Buxton direct accesses are granted only to users root and buxton. The database initialisations are running as tizenglobalapp. Inside MIC (image creation) this patch enable ail_initdb and pkg_initdb to run without failure. Change-Id: Iecb973f614316ffd724e7e5618d81225213d8946 Signed-off-by: José Bollo --- scripts/generic-desktop-applications.post | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post index 1c5f89e..5b89df4 100644 --- a/scripts/generic-desktop-applications.post +++ b/scripts/generic-desktop-applications.post @@ -1,10 +1,26 @@ #!/bin/sh echo "#################### generic-desktop-applications.post ####################" +function generic_desktop_applications_buxton_unprotect() { + chsmack -a '*' /var/lib/buxton || true + chsmack -a '*' /var/lib/buxton/* || true + chmod 0777 /var/lib/buxton || true + chmod 0666 /var/lib/buxton/* || true +} + +function generic_desktop_applications_buxton_protect() { + chmod 0600 /var/lib/buxton/* || true + chmod 0700 /var/lib/buxton || true + chsmack -a System /var/lib/buxton/* || true + chsmack -a System /var/lib/buxton || true +} + # temp workaround to fill each user app_info database with global db infos . /etc/tizen-platform.conf +generic_desktop_applications_buxton_unprotect ail_initdb pkg_initdb +generic_desktop_applications_buxton_protect # depends on generic-base functions function generic_desktop_applications_fix_userhome() { -- 2.7.4 From 89d7b89b7e307ed238749ecad12b3da3e3e679a6 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 5 Mar 2015 09:24:55 +0100 Subject: [PATCH 13/16] Generic Crosswalk: remove tizen-extensions-crosswalk Per request of developpers for Mobile and Wearable, t-e-crosswalk is moved to profile-specific metas (meta-common, meta-mobile, meta-tv, meta-wearable) Change-Id: Iab8335e9d393f58968724c04845d5935aedc0e17 Signed-off-by: Stephane Desneux --- patterns/generic-crosswalk.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml index 4161aaa..a1005d1 100644 --- a/patterns/generic-crosswalk.yaml +++ b/patterns/generic-crosswalk.yaml @@ -3,5 +3,4 @@ Description: Generic Crosswalk Name: generic-crosswalk Packages: - crosswalk -- tizen-extensions-crosswalk -- 2.7.4 From e5d0ea97cf5d194ba2e67e27159b7626651b6c56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Thu, 5 Mar 2015 17:14:59 +0100 Subject: [PATCH 14/16] Avoid weird message when pci miss MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Hardware aren't all using PCI bus. This patch improves the user experience by removing error message when PCI is missing. Change-Id: I198f08cb2b81870a2281107f4a0bf69316fcdad0 Signed-off-by: José Bollo --- src/generic-adaptation/generic-adaptation.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/generic-adaptation/generic-adaptation.sh b/src/generic-adaptation/generic-adaptation.sh index 9a2fabb..62def3b 100644 --- a/src/generic-adaptation/generic-adaptation.sh +++ b/src/generic-adaptation/generic-adaptation.sh @@ -1,13 +1,4 @@ -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 +# enforce use of gallium inside VMware +if /usr/sbin/lspci 2>/dev/null | grep -q 'VGA compatible controller: VMware'; then + export EGL_PLATFORM=gallium EGL_DRIVER=egl_gallium fi -- 2.7.4 From 3b00a672d61d02beb7c19a22c667445b8cf39a2f Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Mon, 22 Jun 2015 19:50:29 +0900 Subject: [PATCH 15/16] Fix the file's wrong path: make_info_file.sh For running TCT, it needs to run make_info_file.sh file. But there is wrong path in generic-base.post: (/usr/bin/make_info_file.sh -> /etc/make_info_file.sh) Bug report from WonYoung Choi(wy80.choi@samsung.com) Change-Id: Icc97eae4c3c37a7b68c0e9e559467f573f984712 --- 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 08ad466..83ef275 100644 --- a/scripts/generic-base.post +++ b/scripts/generic-base.post @@ -60,4 +60,4 @@ function generic_base_fix_user_homedir() { [ "${TZ_BUILD_WITH_EMULATOR}" == "1" ] && generic_base_fix_user_homedir developer # Add info.ini for system-info CAPI (TC-2047) -/usr/bin/make_info_file.sh +/etc/make_info_file.sh -- 2.7.4 From 5d272d3e302eba0526e9e140f4ac70fd1d28106f Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 24 Jun 2015 11:45:26 +0200 Subject: [PATCH 16/16] patterns/generic-middleware: remove security-server Change-Id: I931e3f50d69a794fdcf695a2268c618f5dc97b76 Signed-off-by: Stephane Desneux --- patterns/generic-middleware.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 944d766..274a31b 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -11,4 +11,3 @@ Packages: - pkgmgr-server - sqlite3 - sdbd -- security-server -- 2.7.4