Fix scripts to accommodate Tizen 2.0 changes

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/i386-common/startx.in b/i386-common/startx.in
index 519896b..3ddbdfc 100755 (executable)
--- a/i386-common/startx.in
+++ b/i386-common/startx.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 DISPLAY=":0"
-XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir /opt/etc/X11/xorg.conf.d "
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
 OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07"
 
 udevadm trigger --subsystem-match=input &
@@ -9,7 +9,7 @@ udevadm trigger --subsystem-match=input &
 if [ -e ~/.xinitrc ]; then
        XINITRC=~/.xinitrc
 else
-       XINITRC=@PREFIX@/etc/X11/xinitrc
+       XINITRC=/etc/X11/xinitrc
 fi
 
 XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
@@ -20,7 +20,7 @@ else
        if [ "$1" = "--only" ]; then
                Xorg ${XSERVER_OPTIONS} &
        else
-               xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
+               xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
        fi
 fi    
 

diff --git a/i386-common/xinitrc b/i386-common/xinitrc
index 7394203..ffaec07 100755 (executable)
--- a/i386-common/xinitrc
+++ b/i386-common/xinitrc
@@ -1,29 +1,23 @@
 #!/bin/sh
 
-# Remapping the keycodes to our key-symbols
-if [ -x /usr/bin/xmodmap ]; then
-       if [ -f /root/.xmodmap ]; then
-               xmodmap /root/.xmodmap
-       else
-               xmodmap - < /opt/etc/X11/Xmodmap
-       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
 
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
        if [ -e ~/.Xresources ]; then
                /usr/bin/xrdb -load -nocpp ~/.Xresources
        else
-               /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
+               /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
        fi
 fi
 
-/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &
+# Link .e
+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/packaging/xorg-x11-server-misc.spec b/packaging/xorg-x11-server-misc.spec
index 16d3926..065ae4c 100644 (file)
--- a/packaging/xorg-x11-server-misc.spec
+++ b/packaging/xorg-x11-server-misc.spec
@@ -8,7 +8,7 @@
 
 Name:       xorg-x11-server-misc
 Summary:    X.Org X11 X server misc packages
-Version:    0.0.1
+Version:    0.1.1
 Release:    1
 Group:      System/X11
 License:    MIT
@@ -19,13 +19,14 @@ Source1001: packaging/xorg-x11-server-misc.manifest
 Description: %{summary}
 
 
-%package emulfb
-Summary:    X11 X server misc files for s5pc110
+%package ndis
+Summary:    X11 X server misc files for NDIS-166
 Group:      System/X11
 Requires:   xserver-xorg-core
 
-%description emulfb
-Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
+%description ndis
+Xorg server misc package which contains startx, xinitrc and xorg.conf file
+for an IA based NDIS-166
 
 
 %prep
@@ -36,8 +37,10 @@ Xorg server misc package which contains startx, xinitrc and xorg.conf file for e
 cp %{SOURCE1001} .
 for f in `find %{ARCH}-common/ -name "*.in"`; do
         cat $f > ${f%.in};
+%ifarch %{arm}
         sed -i -e "s#@PREFIX@#/usr#g" ${f%.in};
         sed -i -e "s#@DATADIR@#/opt#g" ${f%.in};
+%endif
         chmod a+x ${f%.in};
 done
 
@@ -54,29 +57,23 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d/
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d/
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
-mkdir -p %{buildroot}/opt/%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/X11/
-ln -sf %{_sysconfdir}/X11 %{buildroot}/opt/%{_sysconfdir}/X11
 cp -af %{ARCH}-common/xserver %{buildroot}%{_sysconfdir}/rc.d/init.d/
-cp -af %{ARCH}-common/xresources %{buildroot}%{_sysconfdir}/rc.d/init.d/
 cp -af %{ARCH}-common/xinitrc %{buildroot}/%{_sysconfdir}/X11/
 ln -sf %{_sysconfdir}/rc.d/init.d/xserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S20xserver
 ln -sf %{_sysconfdir}/rc.d/init.d/xserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S20xserver
-ln -sf %{_sysconfdir}/rc.d/init.d/xresources %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S80xresources
-ln -sf %{_sysconfdir}/rc.d/init.d/xresources %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S80xresources
 cp -af %{ARCH}-common/Xorg.sh %{buildroot}%{_sysconfdir}/profile.d/
-cp -af %{ARCH}-common/Xmodmap %{buildroot}/%{_sysconfdir}/X11/
 
 mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
 %ifarch %{arm}
 cp -a arm-emulfb/xorg.conf.d.default/* %{buildroot}/%{_sysconfdir}/X11/xorg.conf.d/
 %endif
 
-mv %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/Xresources %{buildroot}%{_sysconfdir}/X11/Xresources
+rm %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/Xresources
 mv %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/xorg.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf
 
 
-%files emulfb
+%files ndis
 %manifest xorg-x11-server-misc.manifest
 %{_sysconfdir}/profile.d/Xorg.sh
 %{_sysconfdir}/rc.d/init.d/*
@@ -86,12 +83,9 @@ mv %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/xorg.conf %{buildroot}%{_sy
 %{_bindir}/setcpu
 %{_bindir}/setpoll
 %{_bindir}/startx
-%config %{_sysconfdir}/X11/Xmodmap
-/opt/%{_sysconfdir}/X11
 %{_sysconfdir}/X11/xorg.conf.d
 %ifarch %{arm}
    %config %{_sysconfdir}/X11/xorg.conf.d/display.conf
    %config %{_sysconfdir}/X11/xorg.conf.d/input.conf
 %endif
-%config %attr(-,app,app) %{_sysconfdir}/X11/Xresources
 %config %{_sysconfdir}/X11/xorg.conf