mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
merging trunk
This commit is contained in:
commit
af9afeb935
@ -18,7 +18,7 @@ mkdir -p $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/dri
|
||||
cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri
|
||||
cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
|
||||
# todo: only in devel build
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
|
@ -1,26 +0,0 @@
|
||||
# starting Mediacenter
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
args="--standalone -fs --lircdev $LIRC_OUTPUT"
|
||||
|
||||
progress "starting Mediacenter"
|
||||
|
||||
if test "$XBMC_CACHING" = "yes" ; then
|
||||
wait_for_xbmc_cache
|
||||
XBMC_BIN="/var/cache/bin/xbmc.bin"
|
||||
else
|
||||
XBMC_BIN="/usr/share/xbmc/xbmc.bin"
|
||||
fi
|
||||
|
||||
while true; do
|
||||
|
||||
DISPLAY=:0.0 $XBMC_BIN ${args} > /dev/null 2>&1
|
||||
RET=$?
|
||||
echo "Exited with code $RET"
|
||||
|
||||
[ "$RET" == 0 ] && break
|
||||
[ "$RET" == 64 ] && sync && poweroff
|
||||
[ "$RET" == 66 ] && sync && reboot
|
||||
|
||||
done
|
@ -65,7 +65,7 @@ $SCRIPTS/install samba
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -PR $PKG_DIR/scripts/xbmc $INSTALL/usr/bin
|
||||
cp -PR $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc
|
||||
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
|
||||
|
@ -1,18 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /etc/sysconfig
|
||||
|
||||
export DISPLAY=":0.0"
|
||||
|
||||
/usr/share/xbmc/xbmc.bin \
|
||||
--standalone \
|
||||
-fs \
|
||||
--lircdev $LIRC_OUTPUT \
|
||||
$@
|
||||
|
||||
RET=$?
|
||||
echo "Exited with code $RET"
|
||||
|
||||
[ "$RET" == 0 ] && initctl emit shutdown REBOOT=no
|
||||
[ "$RET" == 64 ] && initctl emit shutdown REBOOT=no
|
||||
[ "$RET" == 66 ] && initctl emit shutdown REBOOT=yes
|
26
packages/mediacenter/xbmc/scripts/xbmc-session
Executable file
26
packages/mediacenter/xbmc/scripts/xbmc-session
Executable file
@ -0,0 +1,26 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /etc/sysconfig
|
||||
|
||||
XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT"
|
||||
|
||||
if test "$XBMC_CACHING" = "yes" ; then
|
||||
wait_for_xbmc_cache
|
||||
XBMC_BIN="/var/cache/bin/xbmc.bin"
|
||||
else
|
||||
XBMC_BIN="/usr/share/xbmc/xbmc.bin"
|
||||
fi
|
||||
|
||||
while true; do
|
||||
|
||||
[ $START_WM="yes" ] && $WINDOWMANAGER &
|
||||
|
||||
$XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
|
||||
RET=$?
|
||||
echo "Exited with code $RET"
|
||||
|
||||
[ "$RET" == 0 ] && break
|
||||
[ "$RET" == 64 ] && sync && poweroff
|
||||
[ "$RET" == 66 ] && sync && reboot
|
||||
|
||||
done
|
8
packages/network/connman/init.d/40_connman
Executable file
8
packages/network/connman/init.d/40_connman
Executable file
@ -0,0 +1,8 @@
|
||||
# start connman network manager
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
progress "Starting Connection Manager"
|
||||
$IONICE mkdir -p /var/run
|
||||
$IONICE touch /var/run/resolv.conf
|
||||
connmand
|
@ -1 +1 @@
|
||||
http://poc.ginf.hu/SABnzbd-0.5.0.tar.gz
|
||||
http://switch.dl.sourceforge.net/sourceforge/sabnzbdplus/SABnzbd-0.5.0-src.tar.gz
|
||||
|
@ -8,6 +8,6 @@
|
||||
$IONICE install -m 755 -d /var/log/ConsoleKit
|
||||
$IONICE install -m 755 -d /var/run/ConsoleKit
|
||||
|
||||
# console-kit-daemon
|
||||
# ck-launch-session
|
||||
console-kit-daemon
|
||||
ck-launch-session
|
||||
)&
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# start cron daemon
|
||||
# start syslog daemon
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
|
@ -1,9 +0,0 @@
|
||||
# store boot time
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
(
|
||||
progress "saving Bootdate"
|
||||
|
||||
/bin/date > /tmp/bootdate
|
||||
)&
|
19
packages/sysutils/busybox/init.d/02_network
Executable file
19
packages/sysutils/busybox/init.d/02_network
Executable file
@ -0,0 +1,19 @@
|
||||
#
|
||||
# start syslog daemon
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
HOSTNAME=`cat /etc/hostname`
|
||||
|
||||
export $HOSTNAME
|
||||
|
||||
# bring lo up, whether we have network card or not
|
||||
progress "starting Loopback Network interface"
|
||||
ifconfig lo 127.0.0.1 up
|
||||
|
||||
# setup hostname
|
||||
progress "Setup hostname"
|
||||
echo $HOSTNAME > /proc/sys/kernel/hostname
|
||||
|
||||
# create /etc/hosts file, useful for gethostbyname(localhost)
|
||||
echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts
|
15
packages/sysutils/busybox/init.d/10_debugshell
Executable file
15
packages/sysutils/busybox/init.d/10_debugshell
Executable file
@ -0,0 +1,15 @@
|
||||
# start the ACPI daemon subsystem
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
TTY="3"
|
||||
|
||||
(
|
||||
echo "#############################################"
|
||||
echo "### it seems we are running in Debug mode ###"
|
||||
echo "### starting debugging shell on console $TTY ###"
|
||||
echo "### ...... switch with ctrl-alt-f$TTY ...... ###"
|
||||
echo "#############################################"
|
||||
exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
|
||||
)&
|
||||
|
@ -1,8 +0,0 @@
|
||||
# start a debugging shell
|
||||
#
|
||||
# runlevels: text, debug
|
||||
|
||||
progress "starting debug shell"
|
||||
|
||||
echo "*** type exit to exit ***"
|
||||
exec /bin/sh </dev/tty1 >/dev/tty1 2>&1
|
@ -1,9 +0,0 @@
|
||||
# shutdown the system
|
||||
#
|
||||
# runlevels: openelec, text, debug,
|
||||
|
||||
progress "syncing discs"
|
||||
sync
|
||||
|
||||
progress "shutdown the system"
|
||||
poweroff
|
@ -25,6 +25,8 @@ ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`"
|
||||
ln -sf /var/run/resolv.conf $INSTALL/etc/resolv.conf
|
||||
ln -sf /var/run/hosts $INSTALL/etc/hosts
|
||||
|
||||
echo $HOSTNAME > $INSTALL/etc/hostname
|
||||
|
||||
echo $GREATING0 > $INSTALL/etc/issue
|
||||
echo $GREATING1 >> $INSTALL/etc/issue
|
||||
echo $GREATING2 >> $INSTALL/etc/issue
|
||||
|
@ -4,11 +4,11 @@
|
||||
. /etc/sysconfig
|
||||
|
||||
# Starting Splash
|
||||
[ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" -a -f /usr/bin/ply-image -a \
|
||||
-f /usr/share/splash/Splash.png ] && \
|
||||
ply-image /usr/share/splash/Splash.png &
|
||||
|
||||
HOSTNAME="openelec"
|
||||
[ "$DEBUG" != "yes" \
|
||||
-a "$TEXTMODE" != "yes" \
|
||||
-a -f /usr/bin/ply-image \
|
||||
-a -f /usr/share/splash/Splash.png \
|
||||
] && ply-image /usr/share/splash/Splash.png &
|
||||
|
||||
# mounting needed filesystems
|
||||
progress "mounting needed filesystems"
|
||||
@ -16,21 +16,15 @@
|
||||
|
||||
# make variable directory structure
|
||||
progress "make variable directory structure"
|
||||
$IONICE mkdir -p /var/log /var/lock /var/media /var/run /var/tmp \
|
||||
/var/run/sepermit
|
||||
$IONICE mkdir -p /var/log \
|
||||
/var/lock \
|
||||
/var/media \
|
||||
/var/run \
|
||||
/var/tmp \
|
||||
/var/run/sepermit
|
||||
|
||||
$IONICE chmod 1777 /var/run /var/tmp
|
||||
|
||||
# bring lo up, whether we have network card or not
|
||||
progress "starting Loopback Network interface"
|
||||
ifconfig lo 127.0.0.1 up
|
||||
|
||||
# setup hostname
|
||||
progress "Setup hostname"
|
||||
echo $HOSTNAME > /proc/sys/kernel/hostname
|
||||
|
||||
# create /etc/hosts file, useful for gethostbyname(localhost)
|
||||
echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts
|
||||
|
||||
# copying config into storage
|
||||
progress "copying config into storage"
|
||||
mkdir -p $HOME/.config
|
||||
@ -39,12 +33,6 @@
|
||||
cp -PR /usr/config/$i $HOME/.config
|
||||
done
|
||||
|
||||
# loading NVidia driver
|
||||
if lspci -n | grep 0300 | grep -q 10de; then
|
||||
progress "loading NVidia driver"
|
||||
$IONICE modprobe nvidia
|
||||
fi
|
||||
|
||||
# caching xbmc
|
||||
[ "$XBMC_CACHING" = "yes" ] && cache_xbmc
|
||||
|
||||
@ -73,22 +61,6 @@
|
||||
$IONICE mkdir -p /var/run/dbus/hald-runner
|
||||
hald --verbose=no --daemon=yes --use-syslog
|
||||
|
||||
# starting Connman
|
||||
progress "Starting Connection Manager"
|
||||
$IONICE mkdir -p /var/run
|
||||
$IONICE touch /var/run/resolv.conf
|
||||
connmand
|
||||
|
||||
# starting debugging shell
|
||||
if test "$DEBUG" = yes; then
|
||||
echo "#############################################"
|
||||
echo "### it seems we are running in Debug mode ###"
|
||||
echo "### starting debugging shell on console 3 ###"
|
||||
echo "### ...... switch with ctrl-alt-f3 ...... ###"
|
||||
echo "#############################################"
|
||||
exec /bin/sh </dev/tty3 >/dev/tty3 2>&1 &
|
||||
fi
|
||||
|
||||
# getting runlevel
|
||||
RUNLEVEL="openelec"
|
||||
if test "$TEXTMODE" = yes; then
|
||||
@ -114,4 +86,4 @@
|
||||
echo "### it seems we have an problem ###"
|
||||
echo "### starting emergency shell... ###"
|
||||
echo "###################################"
|
||||
exec /bin/sh </dev/tty3 >/dev/tty3 2>&1
|
||||
exec /bin/sh </dev/tty1 >/dev/tty1 2>&1
|
||||
|
12
packages/sysutils/uxlaunch/build
Executable file
12
packages/sysutils/uxlaunch/build
Executable file
@ -0,0 +1,12 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build glib
|
||||
$SCRIPTS/build dbus
|
||||
$SCRIPTS/build ConsoleKit
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
make CC=$TARGET_CC
|
19
packages/sysutils/uxlaunch/init.d/60_uxlaunch
Normal file
19
packages/sysutils/uxlaunch/init.d/60_uxlaunch
Normal file
@ -0,0 +1,19 @@
|
||||
# starting uxlaunch
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
progress "starting uxlaunch"
|
||||
|
||||
UX_USER="root"
|
||||
UX_TTY="1"
|
||||
|
||||
if [ "$START_MRXVT" = yes ]; then
|
||||
UX_SESSION="/usr/bin/mrxvt-session"
|
||||
else
|
||||
UX_SESSION="/usr/bin/xbmc-session"
|
||||
fi
|
||||
|
||||
UX_ARG="-u $UX_USER -t $UX_TTY -s $UX_SESSION"
|
||||
[ "$DEBUG" = yes ] && UX_ARG="$UX_ARG -v"
|
||||
|
||||
uxlaunch $UX_ARG > /dev/null 2>&1
|
10
packages/sysutils/uxlaunch/install
Executable file
10
packages/sysutils/uxlaunch/install
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/install glib
|
||||
$SCRIPTS/install dbus
|
||||
$SCRIPTS/install ConsoleKit
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp -P $PKG_BUILD/uxlaunch $INSTALL/usr/sbin
|
1
packages/sysutils/uxlaunch/url
Normal file
1
packages/sysutils/uxlaunch/url
Normal file
@ -0,0 +1 @@
|
||||
http://sources.openelec.tv/svn/uxlaunch-0.44-git.tar.bz2
|
@ -5,5 +5,3 @@
|
||||
# packages needed for development (upcoming features)
|
||||
|
||||
$SCRIPTS/install dbus-python
|
||||
$SCRIPTS/install ratpoison
|
||||
$SCRIPTS/install mrxvt
|
||||
|
@ -5,8 +5,8 @@
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp -P $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
|
||||
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty
|
||||
cp $PKG_DIR/config/10-x11-evdev.fdi \
|
||||
$INSTALL/usr/share/hal/fdi/policy/20thirdparty
|
||||
cp -P $PKG_DIR/config/10-x11-evdev.fdi \
|
||||
$INSTALL/usr/share/hal/fdi/policy/20thirdparty
|
||||
|
@ -5,7 +5,7 @@
|
||||
$SCRIPTS/install libXi
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp -P $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
|
||||
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
cp $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
|
@ -3,10 +3,10 @@
|
||||
. config/options
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp -PR $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
cp -P $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input
|
||||
|
||||
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
cp -PR $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -PR $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin
|
||||
cp -P $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin
|
||||
|
@ -10,10 +10,10 @@ $SCRIPTS/install libpciaccess
|
||||
$SCRIPTS/install libdrm
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp -P $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp -P $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp -P $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp -P $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
cp -P $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia
|
||||
|
@ -3,4 +3,4 @@
|
||||
. config/options
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp -P $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
|
@ -9,21 +9,21 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp -P $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
|
||||
cp $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
|
||||
cp -P $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
|
||||
|
||||
mkdir -p $INSTALL/etc/X11
|
||||
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11
|
||||
cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1
|
||||
cp $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
|
||||
cp $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1
|
||||
cp -P $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1
|
||||
cp -P $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
|
||||
cp -P $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1
|
||||
|
||||
mkdir -p $INSTALL/lib/modules/$VER/nvidia
|
||||
cp $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
|
||||
cp -P $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
|
||||
|
||||
for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do
|
||||
$STRIP --strip-debug $MOD
|
||||
|
@ -1,9 +0,0 @@
|
||||
# start MRXVT terminal
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
if test "$START_MRXVT" = "yes"; then
|
||||
progress "Starting MRXVT terminal"
|
||||
|
||||
mrxvt
|
||||
fi
|
@ -4,6 +4,9 @@
|
||||
|
||||
$SCRIPTS/install libX11
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -PR $PKG_BUILD/src/$1 $INSTALL/usr/bin
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
|
||||
cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin
|
||||
|
||||
|
7
packages/x11/other/mrxvt/scripts/mrxvt-session
Executable file
7
packages/x11/other/mrxvt/scripts/mrxvt-session
Executable file
@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /etc/sysconfig
|
||||
|
||||
[ $START_WM="yes" ] && $WINDOWMANAGER &
|
||||
|
||||
mrxvt
|
8
packages/x11/other/ratpoison/conf.d/ratpoison
Normal file
8
packages/x11/other/ratpoison/conf.d/ratpoison
Normal file
@ -0,0 +1,8 @@
|
||||
################################################################################
|
||||
# Windowmanager environment variables.
|
||||
#
|
||||
# This file contains non-OpenELEC evironment variables as well as OpenELEC
|
||||
# evironment variables that are not user defined.
|
||||
################################################################################
|
||||
|
||||
WINDOWMANAGER="ratpoison"
|
@ -1,9 +0,0 @@
|
||||
# start Ratpoison Windowmanager
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
if test "$START_WM" = "yes"; then
|
||||
progress "Starting Ratpoison Windowmanager"
|
||||
|
||||
ratpoison &
|
||||
fi
|
27
packages/x11/xserver/xorg-server/init.d/12_configure-xorg
Normal file
27
packages/x11/xserver/xorg-server/init.d/12_configure-xorg
Normal file
@ -0,0 +1,27 @@
|
||||
# configure X.Org video settings
|
||||
#
|
||||
# runlevels: openelec, text, debug
|
||||
|
||||
if lspci -n | grep 0300 | grep -q 10de; then
|
||||
|
||||
progress "Found nVidia card, loading NVidia driver"
|
||||
$IONICE modprobe nvidia &
|
||||
|
||||
progress "Found nVidia card, enabling NVIDIA GLX as requested"
|
||||
$IONICE mkdir -p /var/lib
|
||||
$IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||
|
||||
else
|
||||
|
||||
progress "Not found nVidia card, enabling Mesa GLX as requested"
|
||||
$IONICE mkdir -p /var/lib
|
||||
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
||||
|
||||
fi
|
||||
|
||||
# Make some needed directorys
|
||||
$IONICE mkdir -p /var/cache/xkb
|
||||
$IONICE mkdir -m 1777 -p /tmp/.ICE-unix
|
||||
$IONICE chown root:root /tmp/.ICE-unix
|
@ -1,37 +0,0 @@
|
||||
# configure X.Org video settings
|
||||
#
|
||||
# runlevels: openelec
|
||||
|
||||
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
|
||||
XORG_ARGS="-s 0 -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# do not change anything below
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
[ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
|
||||
|
||||
if lspci -n | grep 0300 | grep -q 10de; then
|
||||
|
||||
[ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
|
||||
|
||||
progress "Found nVidia card, enabling NVIDIA GLX as requested"
|
||||
$IONICE mkdir -p /var/lib
|
||||
$IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||
|
||||
else
|
||||
|
||||
progress "Not found nVidia card, enabling Mesa GLX as requested"
|
||||
$IONICE mkdir -p /var/lib
|
||||
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
||||
fi
|
||||
|
||||
mkdir -p /var/cache/xkb
|
||||
|
||||
# Make ICE directory
|
||||
$IONICE mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
|
||||
$IONICE chown root:root /tmp/.ICE-unix
|
||||
|
||||
Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
|
@ -23,42 +23,42 @@ XORG_DST="$INSTALL/$XORG_PATH_MODULES"
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $XORG_SRC/Xorg $INSTALL/usr/bin
|
||||
cp -P $XORG_SRC/Xorg $INSTALL/usr/bin
|
||||
|
||||
mkdir -p $XORG_DST
|
||||
cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST
|
||||
cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
|
||||
cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST
|
||||
cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
|
||||
cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
|
||||
cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
|
||||
cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST
|
||||
cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
|
||||
cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST
|
||||
cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST
|
||||
cp -P $XORG_SRC/exa/.libs/libexa.so $XORG_DST
|
||||
cp -P $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
|
||||
cp -P $XORG_SRC/int10/.libs/libint10.so $XORG_DST
|
||||
cp -P $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
|
||||
cp -P $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
|
||||
cp -P $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
|
||||
cp -P $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST
|
||||
cp -P $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
|
||||
cp -P $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST
|
||||
cp -P $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST
|
||||
|
||||
mkdir -p $XORG_DST/extensions
|
||||
cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
|
||||
cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
|
||||
cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
|
||||
cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
|
||||
cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
|
||||
cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
|
||||
cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
|
||||
cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
|
||||
cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
|
||||
cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
|
||||
ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so
|
||||
|
||||
mkdir -p $XORG_DST/linux
|
||||
cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux
|
||||
cp -P $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux
|
||||
|
||||
mkdir -p $XORG_DST/multimedia
|
||||
cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
|
||||
cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/xorg
|
||||
cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg
|
||||
cp -P $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg
|
||||
|
||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||
cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
|
||||
cp -P $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
|
||||
|
||||
mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
|
||||
cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
|
||||
cp -P $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
|
||||
|
||||
#Fonts
|
||||
$SCRIPTS/install encodings
|
||||
@ -76,11 +76,12 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
|
||||
$SCRIPTS/install xf86-input-synaptics
|
||||
$SCRIPTS/install xf86-input-wacom
|
||||
|
||||
get_graphicdrivers
|
||||
|
||||
for drv in $XORG_DRIVERS; do
|
||||
$SCRIPTS/install xf86-video-$drv
|
||||
done
|
||||
|
||||
#Tools
|
||||
$SCRIPTS/install pciutils
|
||||
$SCRIPTS/install uxlaunch
|
||||
[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install ratpoison
|
||||
[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install mrxvt
|
||||
|
@ -5,6 +5,9 @@
|
||||
GREATING3="#######################################################"
|
||||
GREATING4=""
|
||||
|
||||
# Hostname for target system (openelec)
|
||||
HOSTNAME="openelec"
|
||||
|
||||
# Root password to integrate in the target system
|
||||
ROOT_PASSWORD="openelec"
|
||||
|
||||
|
@ -5,6 +5,9 @@
|
||||
GREATING3="#######################################################"
|
||||
GREATING4=""
|
||||
|
||||
# Hostname for target system (openelec)
|
||||
HOSTNAME="openelec"
|
||||
|
||||
# Root password to integrate in the target system
|
||||
ROOT_PASSWORD="openelec"
|
||||
|
||||
|
@ -5,6 +5,9 @@
|
||||
GREATING3="#######################################################"
|
||||
GREATING4=""
|
||||
|
||||
# Hostname for target system (openelec)
|
||||
HOSTNAME="openelec"
|
||||
|
||||
# Root password to integrate in the target system
|
||||
ROOT_PASSWORD="openelec"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user