jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

merging trunk

Browse Source
This commit is contained in:
Stephan Raue 2010-03-19 01:18:58 +01:00
commit beee1e2299
87 changed files with 986 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/audio/libcdio/build
View File

@ -4,7 +4,6 @@
$SCRIPTS/build toolchain
$SCRIPTS/build libiconv
$SCRIPTS/build ncurses
cd $PKG_BUILD
./configure --host=$TARGET_NAME \

3
packages/audio/libcdio/install
View File

@ -3,7 +3,6 @@
. config/options
$SCRIPTS/install libiconv
$SCRIPTS/install ncurses
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib

13
packages/compress/zlib/build
View File

@ -5,14 +5,11 @@
$SCRIPTS/build toolchain
cd $PKG_BUILD
make CC=$TARGET_CC AR="$TARGET_AR rc" RANLIB=$TARGET_RANLIB libz.a
cp -PR libz.a $SYSROOT_PREFIX/usr/lib
make clean
./configure --shared --prefix=/usr
./configure --prefix=/usr \
--libdir=/usr/lib \
--includedir=/usr/include \
--shared
make
$MAKE prefix=$SYSROOT_PREFIX/usr install
$MAKEINSTALL

4
packages/compress/zlib/install
View File

@ -2,5 +2,5 @@
. config/options
mkdir -p $INSTALL/lib
cp -PR $PKG_BUILD/*.so* $INSTALL/lib
mkdir -p $INSTALL/usr/lib
cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib

20
packages/compress/zlib/patches/10_crosscompile.diff
View File

@ -1,20 +0,0 @@
--- zlib-1.2.2.orig/configure Wed Nov 17 15:56:53 2004
+++ zlib-1.2.2/configure Wed Nov 17 15:57:37 2004
@@ -75,7 +75,7 @@
CC="$cc"
SFLAGS=${CFLAGS-"-fPIC -O3"}
CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
+ case `echo Linux` in
Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
CYGWIN* | Cygwin* | cygwin* | OS/2* )
EXE='.exe';;
@@ -95,7 +95,7 @@
else
# find system name and corresponding cc options
CC=${CC-cc}
- case `(uname -sr || echo unknown) 2>/dev/null` in
+ case `echo Linux` in
HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
CFLAGS=${CFLAGS-"-O"}
# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}

2
packages/compress/zlib/url
View File

@ -1 +1 @@
http://www.zlib.net/zlib-1.2.3.tar.bz2
http://www.zlib.net/zlib-1.2.4.tar.bz2

4
packages/debug/gdb/build
View File

@ -22,7 +22,7 @@ cd objdir
--disable-nls \
--disable-sim \
--without-x \
--enable-tui \
--disable-tui \
--disable-libada \
make
make

4
packages/debug/gdb/install
View File

@ -7,5 +7,5 @@ $SCRIPTS/install expat
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/$1 $INSTALL/usr/bin
# cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin
# cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin

16
packages/graphics/Mesa/install
View File

@ -12,15 +12,17 @@ $SCRIPTS/install libxcb
$SCRIPTS/install libX11
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
cp -P $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 || true
cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin
cp -PR $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin
cp -PR $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin
if [ "$DEVTOOLS" = yes ]; then
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin
fi

2
packages/linux/url
View File

@ -1 +1 @@
http://eu.kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.tar.bz2
http://eu.kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.1.tar.bz2

2
packages/mediacenter/xbmc-theme-Confluence/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28425.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28622.tar.bz2

12
packages/mediacenter/xbmc/init.d/09_cache_xbmc Executable file
View File

@ -0,0 +1,12 @@
#
# caching xbmc
#
# runlevels: openelec, text
if [ "$XBMC_CACHING" = "yes" ]; then
progress "caching XBMC"
cache_xbmc
fi

26
packages/mediacenter/xbmc/init.d/67_xbmc
View File

@ -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

2
packages/mediacenter/xbmc/install
View File

@ -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

34
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 13:48:42.000000000 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:45:45.758328458 +0100
@@ -1153,7 +1153,9 @@
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-14 21:06:24.000000000 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:50:53.680149619 +0100
@@ -1154,7 +1154,9 @@
cp pyconfig.h Include
else
./configure \
@ -12,7 +12,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1218,6 +1220,7 @@
@@ -1219,6 +1221,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -20,7 +20,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1234,6 +1237,7 @@
@@ -1235,6 +1238,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -28,7 +28,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1253,6 +1257,8 @@
@@ -1254,6 +1258,8 @@
--disable-win
else
./configure \
@ -37,7 +37,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1270,6 +1276,8 @@
@@ -1271,6 +1277,8 @@
--with-pic
else
./configure \
@ -46,7 +46,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-doc \
--enable-static \
--with-pic
@@ -1288,6 +1296,8 @@
@@ -1289,6 +1297,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else
./configure2 \
@ -55,7 +55,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \
@@ -1313,6 +1323,8 @@
@@ -1314,6 +1324,8 @@
--cc="$CC"
else
./configure2 \
@ -64,7 +64,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1345,6 +1357,8 @@
@@ -1346,6 +1358,8 @@
--disable-al-audio
else
./configure \
@ -73,7 +73,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1380,7 +1394,9 @@
@@ -1381,7 +1395,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
@ -84,7 +84,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1394,6 +1410,8 @@
@@ -1395,6 +1411,8 @@
--with-pic
else
./configure \
@ -93,7 +93,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1420,6 +1438,8 @@
@@ -1421,6 +1439,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
@ -102,7 +102,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1450,6 +1470,8 @@
@@ -1451,6 +1471,8 @@
--disable-skyrocket
else
./configure \
@ -111,7 +111,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1469,9 +1491,11 @@
@@ -1470,9 +1492,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
@ -125,7 +125,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
fi
], [0])
@@ -1480,7 +1504,9 @@
@@ -1481,7 +1505,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else

26
packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
View File

@ -1,6 +1,6 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 15:46:30.970324985 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:46:44.355431403 +0100
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:51:45.481151345 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:52:15.206151488 +0100
@@ -33,6 +33,8 @@
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
goom_enabled="== GOOM enabled. =="
@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1433,7 +1457,7 @@
@@ -1434,7 +1458,7 @@
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 13:48:42.000000000 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:46:44.356451434 +0100
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-14 21:06:24.000000000 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:55:14.471274664 +0100
@@ -104,8 +104,10 @@
VIS_DIRS=\
@ -82,16 +82,16 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
+ifneq (@BUILD_XBMCPROJECTM@,1)
+VIS_DIRS+=xbmc/visualizations/XBMCProjectM
+endif
ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
ifeq ($(findstring osx,$(ARCH)), osx)
VIS_DIRS+=xbmc/visualizations/iTunes
endif
@@ -291,7 +293,9 @@
@@ -294,7 +296,9 @@
visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm
+ifneq (@BUILD_XBMCPROJECTM@,1)
$(MAKE) -C xbmc/visualizations/XBMCProjectM
+endif
ifneq (@BUILD_GOOM@,1)
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
$(MAKE) -C xbmc/visualizations/Goom
ifeq ($(findstring osx,$(ARCH)), osx)
$(MAKE) -C xbmc/visualizations/iTunes
endif

16
packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
View File

@ -1,6 +1,6 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 15:47:49.217295596 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:48:00.615295765 +0100
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:58:21.345276911 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:58:38.170152082 +0100
@@ -35,6 +35,8 @@
goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1511,7 +1535,7 @@
@@ -1512,7 +1536,7 @@
--disable-lattice \
--disable-skyrocket
fi
@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 15:47:49.218295582 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:48:45.399294520 +0100
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 00:58:21.346276544 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:58:38.176152470 +0100
@@ -99,8 +99,10 @@
lib/xbmc-dll-symbols \
lib/jsoncpp/jsoncpp/src/lib_json
@ -85,7 +85,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@@ -302,7 +304,9 @@
@@ -308,7 +310,9 @@
endif
endif
screensavers: exports

14
packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 15:49:58.203323655 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:53:21.236294350 +0100
@@ -480,7 +480,7 @@
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 01:06:53.490151727 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 01:06:07.685150760 +0100
@@ -486,7 +486,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
@ -10,7 +10,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -488,55 +488,55 @@
@@ -494,55 +494,55 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
@ -47,8 +47,8 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
- @echo "Copying system files to $(prefix)/share/xbmc"
+ @echo "Copying system files to $(DESTDIR)/$(prefix)/share/xbmc"
@# Arch independent files
- @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
@# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"

18
packages/mediacenter/xbmc/scripts/xbmc
View File

@ -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
View 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 &
$IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && sync && poweroff
[ "$RET" == 64 ] && sync && poweroff
[ "$RET" == 66 ] && sync && reboot
done

2
packages/mediacenter/xbmc/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-28425.tar.bz2
http://sources.openelec.tv/svn/xbmc-28622.tar.bz2

2
packages/network/avahi/init.d/21_avahi → packages/network/avahi/init.d/24_avahi
View File

@ -1,6 +1,6 @@
# start Avahi Daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting Avahi Daemon"

9
packages/network/connman/init.d/40_connman Executable file
View File

@ -0,0 +1,9 @@
# start connman network manager
#
# runlevels: openelec, text
progress "Starting Connection Manager"
$IONICE mkdir -p /var/run
$IONICE touch /var/run/resolv.conf
connmand

12
packages/network/dropbear/init.d/22_sshd → packages/network/dropbear/init.d/41_sshd
View File

@ -1,6 +1,6 @@
# start telnet daemon
# start ssh server
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
# Check for the Dropbear RSA key
@ -8,7 +8,7 @@
progress "SSH: generating rsa key"
$IONICE mkdir -p /etc/dropbear
/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
fi
# Check for the Dropbear DSS key
@ -16,14 +16,14 @@
progress "SSH: generating dsa key"
$IONICE mkdir -p /etc/dropbear
/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
fi
progress "Starting SSH Server"
$IONICE mkdir -p /var/log
$IONICE touch /var/log/lastlog
$IONICE touch /var/log/wtmp
$IONICE touch /var/log/lastlog
$IONICE touch /var/log/wtmp
dropbear -b /etc/issue -P /var/run/dropbear.pid

2
packages/network/samba/init.d/23_samba → packages/network/samba/init.d/42_samba
View File

@ -1,6 +1,6 @@
# start Samba Server
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting Samba server"

2
packages/plugins/SABnzbd/url
View File

@ -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

38
packages/security/Linux-PAM/install
View File

@ -7,38 +7,38 @@ $SCRIPTS/install gettext
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/etc
cp -PR $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
# cp -PR $PKG_BUILD/data/pam.conf $INSTALL/etc
cp -P $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
# cp -P $PKG_BUILD/data/pam.conf $INSTALL/etc
mkdir -p $INSTALL/etc/pam.d
cp -PR $PKG_DIR/config/* $INSTALL/etc/pam.d
cp -P $PKG_DIR/config/* $INSTALL/etc/pam.d
mkdir -p $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security
mkdir -p $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
# cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
# cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security
echo "chmod 4755 $INSTALL/lib/security/unix_chkpwd" >> $FAKEROOT_SCRIPT
cp -PR $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpam_misc.so*T
cp -PR $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/security
cp -PR $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security
cp -P $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security
mkdir -p $INSTALL/usr/lib/security/pam_filter
cp -PR $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter
cp -P $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter
mkdir -p $INSTALL/sbin
cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin
cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin

32
packages/security/polkit/install
View File

@ -18,41 +18,41 @@ $SCRIPTS/install expat
$SCRIPTS/install Linux-PAM
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/etc/pam.d
cp -PR $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d
cp -P $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d
mkdir -p $INSTALL/etc/polkit-1/localauthority.conf.d
cp -PR $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d
cp -P $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d
mkdir -p $INSTALL/etc/polkit-1/nullbackend.conf.d
cp -PR $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d
cp -P $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin
echo "chmod 4755 $INSTALL/usr/bin/pkexec" >> $FAKEROOT_SCRIPT
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpolkit-agent-1.so*T
cp -PR $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpolkit-backend-1.so*T
cp -PR $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/polkit-1/extensions
cp -PR $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -PR $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -P $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -P $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
mkdir -p $INSTALL/usr/lib/polkit-1
cp -PR $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1
cp -P $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1
echo "chmod 4755 $INSTALL/usr/lib/polkit-1/polkit-agent-helper-1" >> $FAKEROOT_SCRIPT
cp -PR $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1
cp -P $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services
cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services
mkdir -p $INSTALL/usr/share/polkit-1/actions
cp -PR $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions
cp -P $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions

6
packages/sysutils/ConsoleKit/init.d/11_ConsoleKit → packages/sysutils/ConsoleKit/init.d/25_ConsoleKit
View File

@ -1,6 +1,6 @@
# start D-BUS daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Setup ConsoleKit"
@ -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
)&

43
packages/sysutils/ConsoleKit/install
View File

@ -10,46 +10,47 @@ $SCRIPTS/install polkit
mkdir -p $INSTALL/etc/ConsoleKit/run-seat.d
mkdir -p $INSTALL/etc/ConsoleKit/run-session.d
mkdir -p $INSTALL/etc/ConsoleKit/seats.d
cp -PR $PKG_BUILD/data/00-primary.seat $INSTALL/etc/ConsoleKit/seats.d
cp -P $PKG_BUILD/data/00-primary.seat $INSTALL/etc/ConsoleKit/seats.d
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -PR $PKG_BUILD/data/ConsoleKit.conf $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/data/ConsoleKit.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/lib/security
cp -PR $PKG_BUILD/pam-ck-connector/.libs/*.so $INSTALL/lib/security
cp -P $PKG_BUILD/pam-ck-connector/.libs/*.so $INSTALL/lib/security
mkdir -p $INSTALL/sbin
cp -PR $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin
cp -PR $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin
cp -PR $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin
cp -PR $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin
cp -P $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin
cp -P $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin
cp -P $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin
cp -P $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin
cp -PR $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin
cp -PR $PKG_BUILD/tools/ck-history $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/ck-history $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libck-connector/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libck-connector/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/ConsoleKit
cp -PR $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit
cp -PR $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit
cp -PR $PKG_BUILD/tools/ck-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit
cp -P $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit
cp -P $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit
cp -P $PKG_BUILD/tools/ck-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
cp -PR $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
cp -PR $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
cp -P $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
cp -P $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
mkdir -p $INSTALL/usr/share/dbus-1/interfaces
cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces
cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Seat.xml $INSTALL/usr/share/dbus-1/interfaces
cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Session.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Seat.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Session.xml $INSTALL/usr/share/dbus-1/interfaces
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp -PR $PKG_BUILD/data/org.freedesktop.ConsoleKit.service $INSTALL/usr/share/dbus-1/system-services
cp -P $PKG_BUILD/data/org.freedesktop.ConsoleKit.service $INSTALL/usr/share/dbus-1/system-services
mkdir -p $INSTALL/usr/share/polkit-1/actions
cp -PR $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions
cp -P $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions

18
packages/sysutils/busybox/init.d/00_debugshell Executable file
View File

@ -0,0 +1,18 @@
# start debug shell
#
# runlevels: openelec, text
TTY="3"
if [ "$DEBUG" = "yes" ]; then
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 &
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY &
fi

11
packages/sysutils/busybox/init.d/01_syslogd
View File

@ -1,11 +0,0 @@
#
# start cron daemon
#
# runlevels: openelec, text, debug
(
progress "Starting Syslog daemon"
mkdir -p /var/log
syslogd
)&

9
packages/sysutils/busybox/init.d/02_date
View File

@ -1,9 +0,0 @@
# store boot time
#
# runlevels: openelec, text, debug
(
progress "saving Bootdate"
/bin/date > /tmp/bootdate
)&

8
packages/sysutils/busybox/init.d/05_mount_filesystem Executable file
View File

@ -0,0 +1,8 @@
#
# mounting needed filesystems
#
# runlevels: openelec, text
progress "mounting needed filesystems"
$IONICE mount -n -t ramfs none /var

21
packages/sysutils/busybox/init.d/06_make_directorys Executable file
View File

@ -0,0 +1,21 @@
#
# make variable directory structure
#
# runlevels: openelec, text
progress "make variable directory structure"
$IONICE mkdir -p /var/log \
/var/lock \
/var/media \
/var/run \
/var/tmp \
/var/run/sepermit
$IONICE chmod 1777 /var/run /var/tmp
$IONICE touch /var/run/utmp
$IONICE chmod 1777 /var/run/utmp
$IONICE touch /var/log/wtmp
$IONICE chmod 1777 /var/log/wtmp

13
packages/sysutils/busybox/init.d/07_userconfig Executable file
View File

@ -0,0 +1,13 @@
#
# copying config into storage
#
# runlevels: openelec, text
progress "copying config into storage"
$IONICE mkdir -p $HOME/.config
for i in `ls /usr/config`; do
[ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config
done

19
packages/sysutils/busybox/init.d/08_network Executable file
View File

@ -0,0 +1,19 @@
#
# start syslog daemon
#
# runlevels: openelec, text
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

10
packages/sysutils/busybox/init.d/10_syslogd Executable file
View File

@ -0,0 +1,10 @@
#
# start syslog daemon
#
# runlevels: openelec, text
(
progress "Starting Syslog daemon"
syslogd
)&

2
packages/sysutils/busybox/init.d/14_acpid → packages/sysutils/busybox/init.d/23_acpid
View File

@ -1,6 +1,6 @@
# start the ACPI daemon subsystem
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting ACPI daemon"

8
packages/sysutils/busybox/init.d/80_debug
View File

@ -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

16
packages/sysutils/busybox/init.d/99_shell Executable file
View File

@ -0,0 +1,16 @@
# start text mode shell
#
# runlevels: text
TTY="1"
echo "###########################################"
echo "## it seems we are running in Text mode. ##"
echo "## .... starting shell on console $TTY .... ##"
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
echo "###########################################"
while true; do
# exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY
done

9
packages/sysutils/busybox/init.d/99_shutdown
View File

@ -1,9 +0,0 @@
# shutdown the system
#
# runlevels: openelec, text, debug,
progress "syncing discs"
sync
progress "shutdown the system"
poweroff

6
packages/sysutils/busybox/install
View File

@ -8,10 +8,14 @@ $SCRIPTS/install Linux-PAM
PKG_DIR=`find $PACKAGES -type d -name $1`
ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`"
USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh"
add_group root 0
add_user $USER_NAME "$USER_PWD" 1000 1000 "User" "/storage" "/bin/sh"
add_group $USER_GROUP 1000
cp -PR $BUILD/busybox*/_install-system/* $INSTALL
echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
@ -25,6 +29,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

95
packages/sysutils/busybox/scripts/init
View File

@ -3,98 +3,10 @@
# read config
. /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"
# mounting needed filesystems
progress "mounting needed filesystems"
$IONICE mount -n -t ramfs none /var
# 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 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
for i in `ls /usr/config`; do
[ ! -f "$HOME/.config/$i" ] && \
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
# starting Udev
progress "starting Udev"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$NICE_20 udevd --daemon
$NICE_20 udevadm monitor 2>&1 >/var/log/udev.log &
$NICE_20 udevadm control --env STARTUP=1
(
$NICE_20 udevadm trigger
$NICE_20 udevadm settle --timeout=5
$NICE_20 udevadm control --env STARTUP=
)&
# starting dbus
progress "Starting D-BUS"
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
dbus-daemon --system
dbus-uuidgen --ensure
# starting HAL
progress "Starting Hardware Abstraction Layer"
$IONICE mkdir -p /var/cache/hald
$IONICE mkdir -p /var/run/dbus/hald-local
$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
RUNLEVEL="text"
elif test "$CONFIGURE" = yes; then
RUNLEVEL="configure"
fi
# starting init scripts for wanted runlevel
@ -108,10 +20,3 @@
test $S_RET -ge $RET && RET=$S_RET
fi
done
# if we have an problem we must look where is this problem
echo "###################################"
echo "### it seems we have an problem ###"
echo "### starting emergency shell... ###"
echo "###################################"
exec /bin/sh </dev/tty3 >/dev/tty3 2>&1

11
packages/sysutils/dbus/init.d/12_dbus Executable file
View File

@ -0,0 +1,11 @@
#
# starting dbus
#
# runlevels: openelec, text
progress "Starting D-BUS"
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
dbus-daemon --system
dbus-uuidgen --ensure &

12
packages/sysutils/hal/init.d/13_hal Executable file
View File

@ -0,0 +1,12 @@
#
# starting HAL
#
# runlevels: openelec, text
progress "Starting Hardware Abstraction Layer"
$IONICE mkdir -p /var/cache/hald \
/var/run/dbus/hald-local \
/var/run/dbus/hald-runner
hald --verbose=no --daemon=yes --use-syslog &

12
packages/sysutils/libatasmart/install
View File

@ -5,10 +5,10 @@
$SCRIPTS/install udev
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
#DEVTOOLS
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/.libs/sktest $INSTALL/usr/bin
cp -PR $PKG_BUILD/.libs/skdump $INSTALL/usr/bin
if [ "$DEVTOOLS" = yes ]; then
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/.libs/sktest $INSTALL/usr/bin
cp -P $PKG_BUILD/.libs/skdump $INSTALL/usr/bin
fi

2
packages/sysutils/lirc/init.d/41_lirc → packages/sysutils/lirc/init.d/32_lirc
View File

@ -1,6 +1,6 @@
# start the LIRC daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting LIRC daemon"

11
packages/sysutils/plymouth-lite/init.d/00_plymouth Executable file
View File

@ -0,0 +1,11 @@
#
# starting splash
#
# runlevels: openelec, text
(
[ "$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
)&

11
packages/sysutils/udev/init.d/01_udevd Executable file
View File

@ -0,0 +1,11 @@
#
# starting Udev daemon
#
# runlevels: openelec, text
progress "starting udev daemon"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$NICE_20 udevd --daemon
$NICE_20 udevadm monitor 2>&1 >/dev/udev.log &

11
packages/sysutils/udev/init.d/02_udev-monitor Executable file
View File

@ -0,0 +1,11 @@
#
# monitoring udev events
#
# runlevels: openelec, text
UDEV_LOGFILE="/dev/.udev.log"
progress "monitoring udev events"
# udevadm monitor 2>&1 >$UDEV_LOGFILE &
udevadm monitor -e >$UDEV_LOGFILE &

13
packages/sysutils/udev/init.d/03_udev-trigger Executable file
View File

@ -0,0 +1,13 @@
#
# request events from the kernel
#
# runlevels: openelec, text
progress "request udev events from the kernel"
(
# $NICE_20 udevadm control --env STARTUP=1
$NICE_20 udevadm trigger
$NICE_20 udevadm settle --timeout=5
# $NICE_20 udevadm control --env STARTUP=
)&

2
packages/testing/install
View File

@ -5,5 +5,3 @@
# packages needed for development (upcoming features)
$SCRIPTS/install dbus-python
$SCRIPTS/install ratpoison
$SCRIPTS/install mrxvt

5
packages/x11/driver/xf86-input-evdev/install
View File

@ -5,7 +5,8 @@
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
cp -PR $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/etc/X11/xorg.conf.d
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d

3
packages/x11/driver/xf86-input-synaptics/install
View File

@ -7,7 +7,8 @@ $SCRIPTS/install libXi
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
cp -PR $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/etc/X11/xorg.conf.d
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d

8
packages/x11/driver/xf86-input-wacom/install
View File

@ -5,13 +5,13 @@
PKG_DIR=`find $PACKAGES -type d -name $1`
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/etc/X11/xorg.conf.d
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
mkdir -p $INSTALL/lib/udev/rules.d
cp -PR $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
cp -P $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin

2
packages/x11/driver/xf86-video-ati/arch Normal file
View File

@ -0,0 +1,2 @@
i386
x86_64

10
packages/x11/driver/xf86-video-ati/install
View File

@ -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

2
packages/x11/driver/xf86-video-ati/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.12.191.tar.bz2
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.12.192.tar.bz2

2
packages/x11/driver/xf86-video-intel/install
View File

@ -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

2
packages/x11/driver/xf86-video-intel/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xf86-video-intel-20100309.tar.bz2
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.902.tar.bz2

14
packages/x11/driver/xf86-video-nvidia/install
View File

@ -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

2
packages/x11/lib/libXt/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.7.tar.bz2
http://xorg.freedesktop.org/archive/individual/lib/libXt-1.0.8.tar.bz2

9
packages/x11/other/mrxvt/init.d/63_mrxvt
View File

@ -1,9 +0,0 @@
# start MRXVT terminal
#
# runlevels: openelec, text, debug
if test "$START_MRXVT" = "yes"; then
progress "Starting MRXVT terminal"
mrxvt
fi

7
packages/x11/other/mrxvt/install
View File

@ -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
View File

@ -0,0 +1,7 @@
#!/bin/sh
. /etc/sysconfig
[ $START_WM="yes" ] && $WINDOWMANAGER &
mrxvt

9
packages/x11/xserver/xorg-server/conf.d/xorg → packages/x11/other/ratpoison/conf.d/ratpoison
View File

@ -1,13 +1,8 @@
################################################################################
# X.org environment variables.
# Windowmanager environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
#-------------------------------------------------------------------------------
# X environment variables.
#-------------------------------------------------------------------------------
DISPLAY=':0.0'
export DISPLAY
WINDOWMANAGER="ratpoison"

9
packages/x11/other/ratpoison/init.d/62_ratpoison
View File

@ -1,9 +0,0 @@
# start Ratpoison Windowmanager
#
# runlevels: openelec, text, debug
if test "$START_WM" = "yes"; then
progress "Starting Ratpoison Windowmanager"
ratpoison &
fi

12
packages/x11/other/uxlaunch/build Executable file
View 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/x11/other/uxlaunch/init.d/60_uxlaunch Normal file
View 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/x11/other/uxlaunch/install Executable file
View 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/x11/other/uxlaunch/url Normal file
View File

@ -0,0 +1 @@
http://git.moblin.org/cgit.cgi/uxlaunch/snapshot/uxlaunch-0.46.tar.bz2

19
packages/x11/xserver/xorg-server/init.d/09_configure_xorg Executable file
View File

@ -0,0 +1,19 @@
#
# configure xorg directories
#
# runlevels: openelec, text
progress "creating directories needed for Xorg"
$IONICE mkdir -p /var/cache/xkb
$IONICE mkdir -p /var/lib
$IONICE mkdir -m 1777 -p /tmp/.ICE-unix
$IONICE chown root:root /tmp/.ICE-unix
if lspci -n | grep 0300 | grep -q 10de; then
$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
$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

38
packages/x11/xserver/xorg-server/init.d/60_xorg
View File

@ -1,38 +0,0 @@
# configure X.Org video settings
#
# runlevels: openelec
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_ARGS="-s 0 -nr -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
XORG_ARGS="$XORG_ARGS -ignoreABI"
[ -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 &

48
packages/x11/xserver/xorg-server/install
View File

@ -22,39 +22,39 @@ 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/X11/xorg.conf.d
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
#Fonts
$SCRIPTS/install encodings
@ -70,7 +70,7 @@ mkdir -p $INSTALL/etc/X11/xorg.conf.d
#Drivers
$SCRIPTS/install xf86-input-evdev
$SCRIPTS/install xf86-input-synaptics
$SCRIPTS/install xf86-input-wacom
# $SCRIPTS/install xf86-input-wacom
for drv in $XORG_DRIVERS; do
$SCRIPTS/install xf86-video-$drv
@ -78,3 +78,9 @@ mkdir -p $INSTALL/etc/X11/xorg.conf.d
# Tools
$SCRIPTS/install pciutils
$SCRIPTS/install uxlaunch
if [ "$DEVTOOLS" = yes ]; then
$SCRIPTS/install ratpoison
$SCRIPTS/install mrxvt
fi

0
packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff → packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff
View File

233
packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff Normal file
View File

@ -0,0 +1,233 @@
From 3ef4be8129f78afd5566a9e5d0fb901449dcb771 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 29 Sep 2009 16:43:43 -0700
Subject: [PATCH] GLX: Enable GLX 1.4 on DRI2
this squashes 4 commits
(cherry picked from commit ad5c0d9efa47476ed5cf75c82265c73919e468b4)
(cherry picked from commit cb54cf1b3e8c4109541cfb698542c00f2473e731)
(cherry picked from commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5)
(cherry picked from commit 9bf2ff4faf730913de3073f346646a8727be41d4)
---
glx/glxcmds.c | 12 ++++++++----
glx/glxdri2.c | 12 ++++++++++++
glx/glxext.c | 8 +++++++-
glx/glxscreens.c | 15 ++++++++++++---
glx/glxscreens.h | 11 +++++++++++
glx/glxserver.h | 3 +++
glx/indirect_texture_compression.c | 4 ++--
include/protocol-versions.h | 2 +-
8 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index b1061a8..ba4c123 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -50,7 +50,6 @@
#include "indirect_dispatch.h"
#include "indirect_table.h"
#include "indirect_util.h"
-#include "protocol-versions.h"
static int
validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc)
** client if it wants to work with older clients; however, in this
** implementation the server just returns its version number.
*/
- reply.majorVersion = SERVER_GLX_MAJOR_VERSION;
- reply.minorVersion = SERVER_GLX_MINOR_VERSION;
+ reply.majorVersion = glxMajorVersion;
+ reply.minorVersion = glxMinorVersion;
reply.length = 0;
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
char *buf;
__GLXscreen *pGlxScreen;
int err;
+ char ver_str[16];
if (!validGlxScreen(client, req->screen, &pGlxScreen, &err))
return err;
@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
ptr = pGlxScreen->GLXvendor;
break;
case GLX_VERSION:
- ptr = pGlxScreen->GLXversion;
+ /* Return to the server version rather than the screen version
+ * to prevent confusion when they do not match.
+ */
+ snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion);
+ ptr = ver_str;
break;
case GLX_EXTENSIONS:
ptr = pGlxScreen->GLXextensions;
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index ed7fb4c..ed7dc80 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.GLXextensions);
}
+ /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled
+ * drivers support the required extensions for GLX 1.4. The extensions
+ * we're assuming are:
+ *
+ * - GLX_SGI_make_current_read (1.3)
+ * - GLX_SGIX_fbconfig (1.3)
+ * - GLX_SGIX_pbuffer (1.3)
+ * - GLX_ARB_multisample (1.4)
+ */
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
+
screen->enterVT = pScrn->EnterVT;
pScrn->EnterVT = glxDRIEnterVT;
screen->leaveVT = pScrn->LeaveVT;
diff --git a/glx/glxext.c b/glx/glxext.c
index 19d70d4..9f9c0ed 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -360,12 +360,18 @@ void GlxExtensionInit(void)
pScreen = screenInfo.screens[i];
for (p = __glXProviderStack; p != NULL; p = p->next) {
- if (p->screenProbe(pScreen) != NULL) {
+ __GLXscreen *glxScreen;
+
+ glxScreen = p->screenProbe(pScreen);
+ if (glxScreen != NULL) {
+ if (glxScreen->GLXminor < glxMinorVersion)
+ glxMinorVersion = glxScreen->GLXminor;
LogMessage(X_INFO,
"GLX: Initialized %s GL provider for screen %d\n",
p->name, i);
break;
}
+
}
if (!p)
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 7d29d31..674e2c6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -42,6 +42,7 @@
#include "glxserver.h"
#include "glxutil.h"
#include "glxext.h"
+#include "protocol-versions.h"
static int glxScreenPrivateKeyIndex;
static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex;
@@ -162,7 +163,8 @@ static const char GLServerExtensions[] =
** supported across all screens in a multi-screen system.
*/
static char GLXServerVendorName[] = "SGI";
-static char GLXServerVersion[] = "1.2";
+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
static char GLXServerExtensions[] =
"GLX_ARB_multisample "
"GLX_EXT_visual_info "
@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
pGlxScreen->pScreen = pScreen;
pGlxScreen->GLextensions = xstrdup(GLServerExtensions);
pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName);
- pGlxScreen->GLXversion = xstrdup(GLXServerVersion);
pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
+ /* All GLX providers must support all of the functionality required for at
+ * least GLX 1.2. If the provider supports a higher version, the GLXminor
+ * version can be changed in the provider's screen-probe routine. For
+ * most providers, the screen-probe routine is the caller of this
+ * function.
+ */
+ pGlxScreen->GLXmajor = 1;
+ pGlxScreen->GLXminor = 2;
+
pGlxScreen->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = glxCloseScreen;
pGlxScreen->DestroyWindow = pScreen->DestroyWindow;
@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
void __glXScreenDestroy(__GLXscreen *screen)
{
xfree(screen->GLXvendor);
- xfree(screen->GLXversion);
xfree(screen->GLXextensions);
xfree(screen->GLextensions);
}
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 3c1bdd4..bff4363 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -161,6 +161,17 @@ struct __GLXscreen {
char *GLXversion;
char *GLXextensions;
+ /**
+ * \name GLX version supported by this screen.
+ *
+ * Since the GLX version advertised by the server is for the whole server,
+ * the GLX protocol code uses the minimum version supported on all screens.
+ */
+ /*@{*/
+ unsigned GLXmajor;
+ unsigned GLXminor;
+ /*@}*/
+
Bool (*CloseScreen)(int index, ScreenPtr pScreen);
Bool (*DestroyWindow)(WindowPtr pWindow);
};
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 4aa8c2e..80f1b28 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type,
GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows,
GLint alignment);
+extern unsigned glxMajorVersion;
+extern unsigned glxMinorVersion;
+
#endif /* !__GLX_server_h__ */
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 25c6eb3..5f44d7b 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p
const GLenum target = *(GLenum *)(pc + 0);
const GLint level = *(GLint *)(pc + 4);
GLint compsize = 0;
- char *answer, answerBuffer[200];
+ char *answer = NULL, answerBuffer[200];
CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt
const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) );
const GLint level = (GLint ) bswap_32( *(int *)(pc + 4) );
GLint compsize = 0;
- char *answer, answerBuffer[200];
+ char *answer = NULL, answerBuffer[200];
CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index da9770c..d688c66 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -61,7 +61,7 @@
/* GLX */
#define SERVER_GLX_MAJOR_VERSION 1
-#define SERVER_GLX_MINOR_VERSION 2
+#define SERVER_GLX_MINOR_VERSION 4
/* Xinerama */
#define SERVER_PANORAMIX_MAJOR_VERSION 1
--
1.6.5.rc2

26
packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff Normal file
View File

@ -0,0 +1,26 @@
From 25a0107768c9f25e8edc5e423ca8b1d0813f2d04 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 24 Nov 2009 13:38:46 -0500
Subject: [PATCH] Enable GLX 1.4 for swrast
---
glx/glxdriswrast.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 44f658f..20f9f90 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
__glXScreenInit(&screen->base, pScreen);
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
+
LogMessage(X_INFO,
"AIGLX: Loaded and initialized %s\n", filename);
--
1.6.5.2

25
packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff Normal file
View File

@ -0,0 +1,25 @@
Bug#564203
From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 6 Jan 2010 14:40:34 +0100
Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c:
- only call gamma_set if its non NULL
---
hw/xfree86/modes/xf86Crtc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index d015c6a..573fe96 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
}
/* Only upload when needed, to avoid unneeded delays. */
- if (!crtc->active)
+ if (!crtc->active && crtc->funcs->gamma_set)
crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
crtc->gamma_blue, crtc->gamma_size);

22
packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff Normal file
View File

@ -0,0 +1,22 @@
[PATCH] Do not trap access to timer and keyboard
Some VESA BIOSes need to access to them.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
hw/xfree86/os-support/hurd/hurd_video.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 4a99db3..e049ceb 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -124,8 +124,6 @@ xf86EnableIO()
FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
return FALSE;
}
- ioperm(0x40,4,0); /* trap access to the timer chip */
- ioperm(0x60,4,0); /* trap access to the keyboard controller */
return TRUE;
}

34
packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff Normal file
View File

@ -0,0 +1,34 @@
From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 6 Oct 2009 17:44:33 +0200
Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a
timer.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
---
dix/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Index: xorg-server/dix/main.c
===================================================================
--- xorg-server.orig/dix/main.c
+++ xorg-server/dix/main.c
@@ -168,7 +168,6 @@
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
- config_init();
if(serverGeneration == 1)
{
CreateWellKnownSockets();
@@ -256,6 +255,7 @@
InitCoreDevices();
InitInput(argc, argv);
InitAndStartDevices();
+ config_init();
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);

53
packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff Normal file
View File

@ -0,0 +1,53 @@
From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 8 Feb 2010 02:04:33 +0100
Subject: [PATCH] xfree86: fix build with xv disabled
---
hw/xfree86/modes/xf86Crtc.c | 2 ++
hw/xfree86/modes/xf86Crtc.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 30b49af..62f8737 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3009,6 +3009,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
+#ifdef XV
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@@ -3097,6 +3098,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
return ret;
}
+#endif
xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 9baa956..2fb32c1 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -908,6 +908,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
+#ifdef XV
/*
* For overlay video, compute the relevant CRTC and
* clip video to that.
@@ -926,6 +927,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
RegionPtr reg,
INT32 width,
INT32 height);
+#endif
extern _X_EXPORT xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
--
1.6.6.1

30
packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff
View File

@ -1,6 +1,6 @@
From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Wed, 20 Jan 2010 14:46:12 +1300
From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <airlied@redhat.com>
Date: Tue, 4 Aug 2009 14:45:58 +1000
Subject: [PATCH] Add nr for background=none root
---
@ -25,7 +25,7 @@ index c24a94f..907a5e8 100644
int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c
index caff1cb..be1d1c4 100644
index 32e26d9..0bf1d52 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
@ -59,7 +59,7 @@ index caff1cb..be1d1c4 100644
MapWindow(pWin, serverClient);
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 6707448..776b898 100644
index e84da4e..2a0f47a 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -77,6 +77,7 @@
@ -70,7 +70,7 @@ index 6707448..776b898 100644
#include "xf86VGAarbiter.h"
#include "globals.h"
@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin)
@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin)
int ret = TRUE;
int err = Success;
ScreenPtr pScreen = pWin->drawable.pScreen;
@ -78,7 +78,7 @@ index 6707448..776b898 100644
RootWinPropPtr pProp;
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin)
@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin)
}
}
@ -95,10 +95,10 @@ index 6707448..776b898 100644
return (ret);
}
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index de1f1b6..5c3aa00 100644
index 5c3ee44..e3c7841 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -503,7 +503,7 @@ typedef struct _confdrirec {
@@ -516,7 +516,7 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr;
/* These values should be adjusted when new fields are added to ScrnInfoRec */
@ -107,8 +107,8 @@ index de1f1b6..5c3aa00 100644
#define NUM_RESERVED_POINTERS 14
#define NUM_RESERVED_FUNCS 11
@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec {
ClockRangePtr clockRanges;
@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec {
ClockRangesPtr clockRanges;
int adjustFlags;
+ /* -nr support */
@ -130,10 +130,10 @@ index b3c7c70..fcc8c95 100644
extern _X_EXPORT Bool CoreDump;
diff --git a/os/utils.c b/os/utils.c
index d7c8388..40583d0 100644
index 00abd63..7bfdf8b 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -513,6 +513,7 @@ void UseMsg(void)
@@ -514,6 +514,7 @@ void UseMsg(void)
#endif
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
@ -141,7 +141,7 @@ index d7c8388..40583d0 100644
ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n");
@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[])
@@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[])
defaultBackingStore = WhenMapped;
else if ( strcmp( argv[i], "-wr") == 0)
whiteRoot = TRUE;
@ -151,5 +151,5 @@ index d7c8388..40583d0 100644
if(++i < argc) {
long reqSizeArg = atol(argv[i]);
--
1.6.6
1.6.0.6

38
packages/x11/xserver/xorg-server/patches/xserver-boottime.diff Normal file
View File

@ -0,0 +1,38 @@
diff --git a/os/log.c b/os/log.c
index 0860847..2c46f1a 100644
--- a/os/log.c
+++ b/os/log.c
@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
static char tmpBuffer[1024];
int len = 0;
+ struct timeval time;
+ time_t tv_sec;
+ suseconds_t tv_usec;
+ static Bool first = TRUE;
+ static time_t start_tv_sec;
+ static suseconds_t start_usec;
+ int diff_sec, diff_usec;
+
+ gettimeofday(&time, NULL);
+ tv_sec = time.tv_sec;
+ tv_usec = time.tv_usec;
+ if (first == TRUE) {
+ start_tv_sec = tv_sec;
+ start_usec = tv_usec;
+ first = FALSE;
+ }
+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
+ diff_usec = (tv_usec - start_usec);
+ if (diff_usec < 0) {
+ diff_sec--;
+ diff_usec += 1000000;
+ }
+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
+ len = strlen(tmpBuffer);
+ if (logFile)
+ fwrite(tmpBuffer, len, 1, logFile);
+
/*
* Since a va_list can only be processed once, write the string to a
* buffer, and then write the buffer out to the appropriate output

12
projects/ION/options
View File

@ -5,9 +5,21 @@
GREATING3="#######################################################"
GREATING4=""
# Hostname for target system (openelec)
HOSTNAME="openelec"
# Root password to integrate in the target system
ROOT_PASSWORD="openelec"
# User to integrate in the target system
USER_NAME="openelec"
# User group to integrate in the target system
USER_GROUP="openelec"
# User password to integrate in the target system
USER_PASSWORD="openelec"
# The TARGET_CPU variable controls which processor should be targeted for
# generated code.
case $TARGET_ARCH in

12
projects/generic/options
View File

@ -5,9 +5,21 @@
GREATING3="#######################################################"
GREATING4=""
# Hostname for target system (openelec)
HOSTNAME="openelec"
# Root password to integrate in the target system
ROOT_PASSWORD="openelec"
# User to integrate in the target system
USER_NAME="openelec"
# User group to integrate in the target system
USER_GROUP="openelec"
# User password to integrate in the target system
USER_PASSWORD="openelec"
# The TARGET_CPU variable controls which processor should be targeted for
# generated code.
case $TARGET_ARCH in

12
projects/intel/options
View File

@ -5,9 +5,21 @@
GREATING3="#######################################################"
GREATING4=""
# Hostname for target system (openelec)
HOSTNAME="openelec"
# Root password to integrate in the target system
ROOT_PASSWORD="openelec"
# User to integrate in the target system
USER_NAME="openelec"
# User group to integrate in the target system
USER_GROUP="openelec"
# User password to integrate in the target system
USER_PASSWORD="openelec"
# The TARGET_CPU variable controls which processor should be targeted for
# generated code.
case $TARGET_ARCH in