Tizen 2.1 base

diff --git a/common/startx b/common/startx
index b15a4df..c7d1c21 100755 (executable)
--- a/common/startx
+++ b/common/startx
@@ -2,10 +2,12 @@
 
 DISPLAY=":0"
 XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07 -nocursor"
+OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07 -nocursor -sharevts"
 
 udevadm trigger --subsystem-match=input &
 
+[ -x /usr/bin/pvrsrvinit ] && /usr/bin/pvrsrvinit
+
 if [ -e ~/.xinitrc ]; then
        XINITRC=~/.xinitrc
 else

diff --git a/common/xinitrc b/common/xinitrc
index 28b913b..21a2d8c 100755 (executable)
--- a/common/xinitrc
+++ b/common/xinitrc
@@ -9,13 +9,7 @@ if [ -x /usr/bin/xmodmap ]; then
        fi
 fi
 
-/usr/bin/scim -d
-/usr/bin/system_server &
-
-# Link .e
-if [ ! -d ${HOME}/.e ]; then
-       ln -s /opt/home/root/.e ${HOME}/.e
-fi
+/usr/bin/scim -d &
 
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
@@ -26,4 +20,13 @@ if [ -x /usr/bin/xrdb ]; then
        fi
 fi
 [ -x /usr/bin/rotate.sh ] && /usr/bin/rotate.sh
-/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &
+
+# Copy .e directory if not exist
+export HOME=/opt/home/app
+
+if [ ! -d ${HOME}/.e ]; then
+        cp -rf /opt/home/root/.e ${HOME}/.e
+        chown -R app:app ${HOME}/.e
+fi
+
+su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app

diff --git a/common/xorg.conf b/common/xorg.conf
index 651c5a2..d4cf7c6 100755 (executable)
--- a/common/xorg.conf
+++ b/common/xorg.conf
@@ -38,14 +38,6 @@ Section "InputClass"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchScreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-        Option "MultiTouch"     "2"
-EndSection
-
-Section "InputClass"
        Identifier "evdev keyboard catchall"
        MatchIsKeyboard "on"
        MatchDevicePath "/dev/input/event*"

diff --git a/packaging/xorg-server-configs-mfld-blackbay.changes b/packaging/xorg-server-configs-mfld-blackbay.changes
new file mode 100644 (file)
index 0000000..333ed08
--- /dev/null
+++ b/packaging/xorg-server-configs-mfld-blackbay.changes
@@ -0,0 +1,10 @@
+* Wed Oct 24 2012 Chengwei Yang <chengwei.yang@intel.com> - 0.0.1
+- start system-server here raised a issue TZSP-3442
+
+* Tue Jul 24 2012 Austin Zhang <austin.zhang@intel.com> - 0.0.1
+- Removed default touchscreen config for IA, instead different
+  products have their own config.
+ 
+* Fri Jul 20 2012 Peng Li <peng.li@intel.com> - 0.0.1
+- add "-sharevts" parameter for X launch on IA
+

diff --git a/packaging/xorg-server-configs-mfld-blackbay.spec b/packaging/xorg-server-configs-mfld-blackbay.spec
new file mode 100644 (file)
index 0000000..04d4f29
--- /dev/null
+++ b/packaging/xorg-server-configs-mfld-blackbay.spec
@@ -0,0 +1,61 @@
+%define debug_package %{nil}
+
+Name:       xorg-server-configs-mfld-blackbay
+Summary:    X.Org X11 X server mdfld blackbay packages
+Version:       0.0.5
+Release:    1
+Group:      System/X11
+License:    MIT
+Source0:    %{name}-%{version}.tar.bz2
+Provides:   xorg-x11-server-misc-emulfb
+
+%description
+Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
+
+
+%prep
+%setup -q 
+
+
+%build
+
+%install
+
+mkdir -p %{buildroot}/etc/rc.d/init.d/
+mkdir -p %{buildroot}/etc/rc.d/rc3.d/
+mkdir -p %{buildroot}/etc/rc.d/rc4.d/
+mkdir -p %{buildroot}/etc/profile.d/
+mkdir -p %{buildroot}/etc/X11/
+mkdir -p %{buildroot}/usr/bin
+mkdir -p  %{buildroot}/etc/X11/xorg.conf.d/
+cp -af common/evdev.conf  %{buildroot}/etc/X11/xorg.conf.d/
+cp -af common/xserver %{buildroot}/etc/rc.d/init.d/
+cp -af common/xresources %{buildroot}/etc/rc.d/init.d/
+cp -af common/xinitrc %{buildroot}//etc/X11/
+cp -af common/scripts/* %{buildroot}/usr/bin
+cp -af common/startx %{buildroot}/usr/bin
+
+
+ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S20xserver
+ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S20xserver
+ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
+ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
+
+cp -af common/Xorg.sh %{buildroot}/etc/profile.d/
+
+cp  Xmodmap %{buildroot}/etc/X11
+cp common/Xresources %{buildroot}/etc/X11/
+
+%files
+/etc/X11/xorg.conf.d
+%{_sysconfdir}/profile.d/Xorg.sh
+%{_sysconfdir}/rc.d/init.d/*
+%{_sysconfdir}/rc.d/rc3.d/*
+%{_sysconfdir}/rc.d/rc4.d/*
+%attr(-,app,app) /etc/X11/Xresources
+/etc/X11/xinitrc
+%{_bindir}/setcpu
+%{_bindir}/setpoll
+%{_bindir}/startx
+/etc/X11/xorg.conf.d/evdev.conf
+/etc/X11/Xmodmap