tizen 2.4 release

diff --git a/arm-common/Xmodmap b/arm-common/Xmodmap
deleted file mode 100644 (file)
index be42e4b..0000000
--- a/arm-common/Xmodmap
+++ /dev/null
@@ -1,25 +0,0 @@
-keycode 123 = XF86AudioRaiseVolume
-keycode 122 = XF86AudioLowerVolume
-keycode 231 = Cancel
-keycode 177 = XF86Send
-keycode 147 = XF86Phone
-keycode 166 = XF86Stop
-keycode 225 = XF86Search
-keycode 124 = XF86PowerOff
-keycode 179 = XF86WebCam
-keycode 220 = XF86Pictures
-keycode 208 = XF86AudioPlay
-keycode 209 = XF86AudioPause
-keycode 174 = XF86AudioStop
-keycode 171 = XF86AudioNext
-keycode 173 = XF86AudioPrev
-keycode 176 = XF86AudioRewind
-keycode 216 = XF86AudioForward
-keycode 234 = XF86AudioMedia
-keycode 153 = 
-keycode 239 = 
-keycode 136 = 
-keycode 140 =
-keycode 182 =
-keycode 172 =
-keycode 215 =

diff --git a/arm-common/tizen_layout_mobile.txt b/arm-common/tizen_layout_mobile.txt
new file mode 100644 (file)
index 0000000..198796a
--- /dev/null
+++ b/arm-common/tizen_layout_mobile.txt
@@ -0,0 +1,37 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera 171
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86QuickPanel 183
+XF86TaskPane 184
+XF86HomePage 172
+XF86WWW 150
+XF86Mail 155
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+Hangul 122 keyboard
+XF86Apps 204
+XF86Call 218
+XF86Game 220
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203

diff --git a/arm-common/tizen_layout_tv.txt b/arm-common/tizen_layout_tv.txt
new file mode 100644 (file)
index 0000000..30e399e
--- /dev/null
+++ b/arm-common/tizen_layout_tv.txt
@@ -0,0 +1,129 @@
+XF86Back 1
+1 2 keyboard
+2 3 keyboard
+3 4 keyboard
+4 5 keyboard
+5 6 keyboard
+6 7 keyboard
+7 8 keyboard
+8 9 keyboard
+9 10 keyboard
+0 11 keyboard
+minus 12 keyboard
+Return 28 keyboard
+XF86Red 59
+XF86Green 60
+XF86Yellow 61
+XF86Blue 62
+XF86Home 63
+XF86Display 64
+XF86ChannelList 65
+XF86AudioMute 66
+XF86AudioLowerVolume 67
+XF86AudioRaiseVolume 68
+XF86LowerChannel 87
+XF86RaiseChannel 88
+Up 103 keyboard
+Left 105 keyboard
+Right 106 keyboard
+Down 108 keyboard
+XF86PowerOff 116
+XF86SysMenu 125
+XF86SimpleMenu 127
+XF86MBRRepeat 129
+XF86ChannelGuide 130
+XF86PictureSize 132
+XF86PictureMode 133
+XF86Hdmi 135
+XF86UsbHub 136
+XF86EManual 138
+XF86More 140
+XF86FactoryMode 141
+XF86Sleep 142
+XF86TV 145
+XF86DTV 146
+XF86STBPower 147
+XF86ChannelAddDel 148
+XF86PanelDown 149
+XF86WWW 150
+XF86BTColorMecha 151
+XF86StillPicture 152
+XF86BTPairing 153
+XF86BTHotkey 154
+XF86CinemaMode 155
+XF86BTContentsBar 156
+XF86Game 157
+XF86PIPChannelUp 159
+XF86PIPChannelDown 160
+XF86Antena 161
+XF86ChannelAutoTune 162
+XF86PanelEnter 163
+XF86MBRLink 164
+XF86PanelUp 165
+XF86AudioStop 166
+XF86AudioRecord 167
+XF86AudioRewind 168
+XF86Game3D 169
+XF86WheelLeftKey 170
+XF86WheelRightKey 171
+XF86PanelExit 173
+XF86Exit 174
+XF86MBRTV 175
+XF86MBRSTBGuide 176
+XF86MBRBDPopup 177
+XF86MBRBDDVDPower 178
+XF86MBRSetupFailure 179
+XF86MBRSetup 180
+XF86MBRWatchTV 181
+XF86PreviousChannel 182
+XF86FavoriteChannel 183
+XF86Recommend 184
+XF86NumberPad 185
+XF86AspectRatio169 186
+XF86MTS 187
+XF86Info 188
+XF86SoundMode 189
+XF863XSpeed 190
+XF863D 191
+XF86TTXMIX 192
+XF86SRSSXT 193
+XF86WIFIPairing 194
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86DualView 202
+XF86BTApps 203
+XF86FamilyMode 204
+XF86EnergySaving 205
+XF86MBRClear 206
+XF86Subtitle 207
+XF86AudioNext 208
+XF86TVSNS 209
+XF86DVR 210
+XF86Apps 211
+XF86Camera 212
+XF86Caption 213
+XF86ZoomIn 214
+XF86PanelPlus 215
+XF86BTVoice 216
+XF86Search 217
+XF86PanelMinus 219
+XF86SoccerMode 220
+XF86Amazon 221
+XF86AudioDescription 222
+XF86PreviousChapter 224
+XF86NextChapter 225
+XF86Netflix 226
+XF86PIP 227
+XF86MBRWatchMovie 228
+XF86MBRMenu 229
+XF86MBRConfirm 230
+XF86FamilyHub 231
+XF86HDMICEC 232
+XF86BTDevice 233
+XF86SoftWakeup 236
+XF86Wakeup 238
+XF86LeftPage 241
+XF86RightPage 242
+XF86PanelOn 243
+XF86PlayBack 244
+XF86ExtraApp 245

diff --git a/arm-common/tizen_layout_wearable.txt b/arm-common/tizen_layout_wearable.txt
new file mode 100644 (file)
index 0000000..66e3480
--- /dev/null
+++ b/arm-common/tizen_layout_wearable.txt
@@ -0,0 +1,30 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86TaskPane 184
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+XF86Apps 204
+XF86Call 218
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203

diff --git a/common/Xorg.sh b/common/Xorg.sh
index 79a0def..b6ff0aa 100755 (executable)
--- a/common/Xorg.sh
+++ b/common/Xorg.sh
@@ -1,2 +1,3 @@
 export HOME=/root
 export DISPLAY=:0
+export XDG_RUNTIME_DIR=/tmp

diff --git a/common/startx b/common/startx
index d8e579d..2b81960 100755 (executable)
--- a/common/startx
+++ b/common/startx
@@ -4,7 +4,7 @@
 
 DISPLAY=":0"
 LOGDIR="/var/log"
-XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d -nolisten tcp "
 OTHER_OPTIONS=" -logfile /var/log/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone $XORG_ARCH_OPTS"
 
 # Xorg automatically preserves logs in $LOGDIR/Xorg.DPY.log.(old)

diff --git a/common/xinitrc b/common/xinitrc
index b3beafa..25e8b59 100755 (executable)
--- a/common/xinitrc
+++ b/common/xinitrc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-/usr/bin/scim -d &
-
 # Link .e
 export HOME=/opt/home/app
 

diff --git a/common/xresources b/common/xresources
index 0f61295..351004b 100755 (executable)
--- a/common/xresources
+++ b/common/xresources
@@ -11,7 +11,6 @@ case "$1" in
       else
         /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
-      touch /tmp/hibernation/xresources_ready
     fi
   ;;
 

diff --git a/conf-arm-emulfb-mobile/input.conf b/conf-arm-emulfb-mobile/input.conf
index dfbbbc6..6c62a09 100644 (file)
--- a/conf-arm-emulfb-mobile/input.conf
+++ b/conf-arm-emulfb-mobile/input.conf
@@ -8,7 +8,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
+        Driver "evdev"
         Option "MultiTouch"     "10"
 EndSection
 
@@ -30,4 +30,19 @@ Section "InputDevice"
         Identifier "Gesture"
         Driver  "gesture"
         Option  "Device"        "/dev/null"
+        Option  "PassKey1"     "121"   #Audio Mute Key
+        Option  "PassKey2"     "122"   #Volume Down Key
+        Option  "PassKey3"     "123"   #Volume Up Key
+        Option  "PassKey4"     "124"   #Power Key
+        Option  "PassKey5"     "171"   #Next Song Key
+        Option  "PassKey6"     "172"   #Audio PlayPause Key
+        Option  "PassKey7"     "173"   #Previous Song Key
+        Option  "PassKey8"     "174"   #Audio Stop Key
+        Option  "PassKey9"     "176"   #Audio Rewind Key
+        Option  "PassKey10"    "208"   #Audio Play Key
+        Option  "PassKey11"    "209"   #Audio Pause Key
+        Option  "PassKey12"    "216"   #Audio Forward Key
+        Option  "PassKey13"    "234"   #Audio Media Key
+        Option  "PassKey14"    "210"   #Voice Wakeup LPSD Key
+        Option  "PassKey15"    "211"   #Voice Wakeup Key
 EndSection

diff --git a/conf-arm-emulfb-wearable/input.conf b/conf-arm-emulfb-wearable/input.conf
index 7c4f59b..e1a12d5 100644 (file)
--- a/conf-arm-emulfb-wearable/input.conf
+++ b/conf-arm-emulfb-wearable/input.conf
@@ -8,7 +8,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
+        Driver "evdev"
         Option "MultiTouch" "2"
 EndSection
 

diff --git a/conf-i386-emulfb-mobile/display.conf b/conf-i386-emulfb-mobile/display.conf
index 3173c3e..a8ec198 100644 (file)
--- a/conf-i386-emulfb-mobile/display.conf
+++ b/conf-i386-emulfb-mobile/display.conf
@@ -1,6 +1,7 @@
 Section "ServerLayout"
        Identifier              "Test Layout"
        Screen          0       "Screen0" 0 0
+       InputDevice             "Gesture"
 EndSection
 
 Section "Screen"
@@ -21,4 +22,5 @@ Section "Device"
        Identifier              "emulfb"
        Driver                  "vigs"
        Option                  "fbdev"         "/dev/fb0"
+       Option                  "HWCursor"      "false"
 EndSection

diff --git a/conf-i386-emulfb-mobile/input.conf b/conf-i386-emulfb-mobile/input.conf
index 0975681..8e0789c 100644 (file)
--- a/conf-i386-emulfb-mobile/input.conf
+++ b/conf-i386-emulfb-mobile/input.conf
@@ -3,6 +3,7 @@ Section "InputClass"
        MatchIsPointer "on"
        MatchDevicePath "/dev/input/event*"
        Driver "evdev"
+       Option "AccelerationProfile" "-1"
 EndSection
 
 Section "InputClass"
@@ -13,10 +14,10 @@ Section "InputClass"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchScreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
+       Identifier "evdev touchscreen catchall"
+       MatchIsTouchScreen "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
        Option "MultiTouch"     "6"
 EndSection
 
@@ -26,3 +27,24 @@ Section "InputClass"
        MatchDevicePath "/dev/input/event*"
        Driver "evdev"
 EndSection
+
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"        "/dev/null"
+        Option  "PassKey1"     "121"   #Audio Mute Key
+        Option  "PassKey2"     "122"   #Volume Down Key
+        Option  "PassKey3"     "123"   #Volume Up Key
+        Option  "PassKey4"     "124"   #Power Key
+        Option  "PassKey5"     "171"   #Next Song Key
+        Option  "PassKey6"     "172"   #Audio PlayPause Key
+        Option  "PassKey7"     "173"   #Previous Song Key
+        Option  "PassKey8"     "174"   #Audio Stop Key
+        Option  "PassKey9"     "176"   #Audio Rewind Key
+        Option  "PassKey10"    "208"   #Audio Play Key
+        Option  "PassKey11"    "209"   #Audio Pause Key
+        Option  "PassKey12"    "216"   #Audio Forward Key
+        Option  "PassKey13"    "234"   #Audio Media Key
+        Option  "PassKey14"    "210"   #Voice Wakeup LPSD Key
+        Option  "PassKey15"    "211"   #Voice Wakeup Key
+EndSection
\ No newline at end of file

diff --git a/conf-i386-emulfb-wearable/input.conf b/conf-i386-emulfb-wearable/input.conf
index e263e48..7151aa5 100644 (file)
--- a/conf-i386-emulfb-wearable/input.conf
+++ b/conf-i386-emulfb-wearable/input.conf
@@ -16,7 +16,7 @@ Section "InputClass"
        Identifier "evdev touchscreen catchall"
        MatchIsTouchScreen "on"
        MatchDevicePath "/dev/input/event*"
-       Driver "evdevmultitouch"
+       Driver "evdev"
        Option "MultiTouch" "2"
 EndSection
 

diff --git a/conf-i386-emulfb-wearable/input.conf.wc1 b/conf-i386-emulfb-wearable/input.conf.wc1
deleted file mode 100644 (file)
index b329efd..0000000
--- a/conf-i386-emulfb-wearable/input.conf.wc1
+++ /dev/null
@@ -1,51 +0,0 @@
-Section "InputClass"
-       Identifier "evdev pointer catchall"
-       MatchIsPointer "on"
-       MatchDevicePath "/dev/input/event*"
-       Driver "evdev"
-EndSection
-
-Section "InputClass"
-       Identifier "evdev pointer catchall"
-       MatchIsTablet   "on"
-       MatchDevicePath "/dev/input/event*"
-       Driver "evdev"
-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*"
-       Driver "evdev"
-EndSection
-
-Section "InputDevice"
-        Identifier "Gesture"
-        Driver  "gesture"
-        Option  "Device"                                       "/dev/null"
-        Option  "Activate"                                     "1"
-        Option "ScreenWidth"                   "320"
-        Option "ScreenHeight"                  "320"
-        Option  "FlickDownKeycode"             "166"
-        Option  "FlickUpKeycode"               "177"
-        Option  "FlickPressArea"               "45"
-        Option  "FlickPressArea_LEFT"          "80"
-        Option "FlickMinimumHeight"    "80"
-        Option "ShutdownKeycode"               "0"
-        Option "SingleTapThresHold"    "200"
-        Option "DoubleTapThresHold"    "400"
-        Option "HoldAreaThresHold"             "1.3"
-        Option "HoldMoveThresHold"             "20"
-        Option "HoldTimeThresHold"             "500"
-        Option  "ActivateFlickDown"     "1"
-        Option  "ActivateFlickUp"       "0"
-        Option  "ActivateFlickRight"    "0"
-EndSection

diff --git a/i386-common/Xmodmap b/i386-common/Xmodmap
deleted file mode 100644 (file)
index be42e4b..0000000
--- a/i386-common/Xmodmap
+++ /dev/null
@@ -1,25 +0,0 @@
-keycode 123 = XF86AudioRaiseVolume
-keycode 122 = XF86AudioLowerVolume
-keycode 231 = Cancel
-keycode 177 = XF86Send
-keycode 147 = XF86Phone
-keycode 166 = XF86Stop
-keycode 225 = XF86Search
-keycode 124 = XF86PowerOff
-keycode 179 = XF86WebCam
-keycode 220 = XF86Pictures
-keycode 208 = XF86AudioPlay
-keycode 209 = XF86AudioPause
-keycode 174 = XF86AudioStop
-keycode 171 = XF86AudioNext
-keycode 173 = XF86AudioPrev
-keycode 176 = XF86AudioRewind
-keycode 216 = XF86AudioForward
-keycode 234 = XF86AudioMedia
-keycode 153 = 
-keycode 239 = 
-keycode 136 = 
-keycode 140 =
-keycode 182 =
-keycode 172 =
-keycode 215 =

diff --git a/i386-common/startx b/i386-common/startx
index 9166ab1..70e19a8 100755 (executable)
--- a/i386-common/startx
+++ b/i386-common/startx
@@ -4,7 +4,7 @@
 
 DISPLAY=":0"
 LOGDIR="/var/log"
-XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d -nolisten tcp "
 OTHER_OPTIONS=" -logfile /var/log/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone $XORG_ARCH_OPTS"
 
 # Xorg automatically preserves logs in $LOGDIR/Xorg.DPY.log.(old)

diff --git a/i386-common/xinitrc b/i386-common/xinitrc
index 6446a7c..b75a0fb 100755 (executable)
--- a/i386-common/xinitrc
+++ b/i386-common/xinitrc
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-/usr/bin/scim -d &
-/usr/bin/xmodmap /etc/X11/Xmodmap
-
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
     if [ -e ~/.Xresources ]; then

diff --git a/i386-common/xorg.service b/i386-common/xorg.service
index d0226a2..ac5e885 100644 (file)
--- a/i386-common/xorg.service
+++ b/i386-common/xorg.service
@@ -7,7 +7,7 @@ After=systemd-udev-trigger.service opt.mount smack-default-labeling.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/startx
-EnvironmentFile=-/run/tizen-mobile-env
+EnvironmentFile=/run/tizen-mobile-env
 
 [Install]
 WantedBy=basic.target

diff --git a/i386-common/xresources b/i386-common/xresources
index d7a6b1f..9c29bdb 100755 (executable)
--- a/i386-common/xresources
+++ b/i386-common/xresources
@@ -11,8 +11,6 @@ case "$1" in
       else
         /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
-      mkdir -p /tmp/hibernation
-      touch /tmp/hibernation/xresources_ready
     fi
   ;;
 

diff --git a/i386-common/xresources.service b/i386-common/xresources.service
index 60f93b9..6a25f16 100644 (file)
--- a/i386-common/xresources.service
+++ b/i386-common/xresources.service
@@ -8,8 +8,6 @@ ConditionFileIsExecutable=/usr/bin/xrdb
 Type=oneshot
 EnvironmentFile=/run/tizen-mobile-env
 ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
-ExecStartPost=/bin/mkdir -p /tmp/hibernation
-ExecStartPost=/bin/touch /tmp/hibernation/xresources_ready
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/xorg-x11-misc.spec b/packaging/xorg-x11-misc.spec
index 285eefe..b04d96e 100644 (file)
--- a/packaging/xorg-x11-misc.spec
+++ b/packaging/xorg-x11-misc.spec
@@ -8,7 +8,7 @@
 
 Name:      xorg-x11-misc
 Summary:    X.Org X11 X server misc packages
-Version:    0.0.12
+Version:    0.0.22
 Release:    1
 Group:      System/X11
 License:    MIT
@@ -21,7 +21,6 @@ Description: %{summary}
 Summary:    architecture independent set of X11 X server configuration files
 Group:      System/X11
 Requires:   xserver-xorg-core
-Requires:   xorg-x11-drv-evdev-multitouch
 
 %description common
 Set of architecture independent files and scripts for X server
@@ -50,6 +49,7 @@ Xorg server misc package which contains device specific configuration files
 %setup -q
 
 %install
+
 mkdir -p %{buildroot}/usr/share/license
 cp -af COPYING %{buildroot}/usr/share/license/%{name}-emulfb
 
@@ -81,7 +81,6 @@ install -m 644 common/xorg.conf %{buildroot}/etc/X11/xorg.conf
 install -m 755 common/Xorg.sh %{buildroot}/etc/profile.d/Xorg.sh
 install -m 755 common/xserver %{buildroot}/etc/rc.d/init.d/xserver
 
-install -m 644 %{ARCH}-common/Xmodmap %{buildroot}/etc/X11/Xmodmap
 install -m 644 %{ARCH}-common/Xresources %{buildroot}/etc/X11/Xresources
 install -m 644 %{ARCH}-common/Xorg.arch-options %{buildroot}/etc/X11/Xorg.arch-options
 install -m 755 %{ARCH}-common/xsetrc %{buildroot}/etc/X11/xsetrc
@@ -104,13 +103,6 @@ ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
 ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
 %if "%{?tizen_profile_name}" == "wearable"
 cp -Rd conf-%{ARCH}-emulfb-wearable %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
-  %if "%{ARCH}" == "i386"
-    %if "%{?_repository}" == "emulator-circle"
-    mv %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf.wc1 %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf
-    %else
-    rm %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf.wc1
-    %endif
-  %endif
 %else
 cp -Rd conf-%{ARCH}-emulfb-mobile %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
 %endif
@@ -126,6 +118,19 @@ install -m 0644 %{ARCH}-common/xresources.service %{buildroot}%{_libdir}/systemd
 ln -s ../xresources.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/xresources.service
 %endif
 
+mkdir -p %{buildroot}/opt/var/xkb
+%if "%{?tizen_profile_name}" == "mobile"
+  cp -rf arm-common/tizen_layout_mobile.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+%else
+  %if "%{?tizen_profile_name}" == "wearable"
+    cp -rf arm-common/tizen_layout_wearable.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+  %else
+    %if "%{?tizen_profile_name}" == "tv"
+      cp -rf arm-common/tizen_layout_tv.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+    %endif
+  %endif
+%endif
+
 # arm/i386 emulfb
 
 %post emulfb
@@ -138,6 +143,7 @@ for i in /etc/X11/conf-%{ARCH}-emulfb/*; do
 done
 
 %files common
+%manifest xorg-x11-misc-common.manifest
 /usr/bin/startx
 /usr/bin/setcpu
 /usr/bin/setpoll
@@ -147,10 +153,10 @@ done
 /etc/rc.d/rc3.d/*
 /etc/rc.d/rc4.d/*
 /etc/X11/xorg.conf
-
+/opt/var/xkb/tizen_key_layout_temp.txt
 
 %files %{ARCH}-common
-/etc/X11/Xmodmap
+%manifest xorg-x11-misc-%{ARCH}-common.manifest
 /etc/X11/Xresources
 %attr(755,root,root) /etc/X11/xsetrc
 /etc/X11/Xorg.arch-options

diff --git a/xorg-x11-misc-arm-common.manifest b/xorg-x11-misc-arm-common.manifest
index 5df55dc..faa39f2 100644 (file)
--- a/xorg-x11-misc-arm-common.manifest
+++ b/xorg-x11-misc-arm-common.manifest
@@ -9,5 +9,6 @@
                 <filesystem path="/etc/rc.d/rc4.d/S02xserver" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
        </assign>
 </manifest>

diff --git a/xorg-x11-misc-common.manifest b/xorg-x11-misc-common.manifest
new file mode 100644 (file)
index 0000000..dca36ae
--- /dev/null
+++ b/xorg-x11-misc-common.manifest
@@ -0,0 +1,15 @@
+<manifest>
+       <request>
+               <domain name="xorg"/>
+       </request>
+       <assign>
+                <filesystem path="/etc/rc.d/init.d/xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/init.d/xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S20xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S20xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/xorg.conf" label="_" exec_label="none" />
+       </assign>
+</manifest>

diff --git a/xorg-x11-misc-emulfb.manifest b/xorg-x11-misc-emulfb.manifest
index bf728b0..dbd7670 100644 (file)
--- a/xorg-x11-misc-emulfb.manifest
+++ b/xorg-x11-misc-emulfb.manifest
@@ -2,4 +2,13 @@
        <request>
                <domain name="xorg"/>
        </request>
+       <assign>
+               <filesystem path="/etc/X11/conf-i386-emulfb/display.conf" label="_" exec_label="none" />
+               <filesystem path="/etc/X11/conf-i386-emulfb/input.conf" label="_" exec_label="none" />
+               <filesystem path="/etc/X11/conf-i386-emulfb/module.conf" label="_" exec_label="none" />
+
+               <filesystem path="/etc/X11/conf-arm-emulfb/display.conf" label="_" exec_label="none" />
+               <filesystem path="/etc/X11/conf-arm-emulfb/input.conf" label="_" exec_label="none" />
+               <filesystem path="/etc/X11/conf-arm-emulfb/module.conf" label="_" exec_label="none" />
+       </assign>
 </manifest>

diff --git a/xorg-x11-misc-i386-common.manifest b/xorg-x11-misc-i386-common.manifest
index 306c7f8..366d997 100644 (file)
--- a/xorg-x11-misc-i386-common.manifest
+++ b/xorg-x11-misc-i386-common.manifest
@@ -9,5 +9,6 @@
                 <filesystem path="/etc/rc.d/rc4.d/S20xserver" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
        </assign>
 </manifest>