mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-06 17:37:52 +00:00
merging trunk
This commit is contained in:
commit
a3b746d733
@ -162,6 +162,10 @@ setup_toolchain() {
|
|||||||
export CXXFLAGS="$TARGET_CXXFLAGS"
|
export CXXFLAGS="$TARGET_CXXFLAGS"
|
||||||
export LDFLAGS="$TARGET_LDFLAGS"
|
export LDFLAGS="$TARGET_LDFLAGS"
|
||||||
export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
|
||||||
|
|
||||||
|
# set CMAKE configfile for target
|
||||||
|
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
|
||||||
|
|
||||||
elif [ "$1" = host ]; then
|
elif [ "$1" = host ]; then
|
||||||
export AWK=$HOST_AWK
|
export AWK=$HOST_AWK
|
||||||
export CC=$HOST_CC
|
export CC=$HOST_CC
|
||||||
@ -178,6 +182,10 @@ setup_toolchain() {
|
|||||||
export CXXFLAGS="$HOST_CXXFLAGS"
|
export CXXFLAGS="$HOST_CXXFLAGS"
|
||||||
export LDFLAGS="$HOST_LDFLAGS"
|
export LDFLAGS="$HOST_LDFLAGS"
|
||||||
export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
|
||||||
|
|
||||||
|
# set CMAKE configfile for host
|
||||||
|
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
setup_toolchain target
|
setup_toolchain target
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
$SCRIPTS/build toolchain
|
$SCRIPTS/build toolchain
|
||||||
$SCRIPTS/build libiconv
|
$SCRIPTS/build libiconv
|
||||||
$SCRIPTS/build ncurses
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
./configure --host=$TARGET_NAME \
|
./configure --host=$TARGET_NAME \
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
. config/options
|
. config/options
|
||||||
|
|
||||||
$SCRIPTS/install libiconv
|
$SCRIPTS/install libiconv
|
||||||
$SCRIPTS/install ncurses
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
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
|
||||||
|
@ -5,14 +5,11 @@
|
|||||||
$SCRIPTS/build toolchain
|
$SCRIPTS/build toolchain
|
||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
|
./configure --prefix=/usr \
|
||||||
make CC=$TARGET_CC AR="$TARGET_AR rc" RANLIB=$TARGET_RANLIB libz.a
|
--libdir=/usr/lib \
|
||||||
cp -PR libz.a $SYSROOT_PREFIX/usr/lib
|
--includedir=/usr/include \
|
||||||
|
--shared
|
||||||
make clean
|
|
||||||
|
|
||||||
./configure --shared --prefix=/usr
|
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
$MAKE prefix=$SYSROOT_PREFIX/usr install
|
$MAKEINSTALL
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
. config/options
|
. config/options
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -PR $PKG_BUILD/*.so* $INSTALL/lib
|
cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib
|
||||||
|
@ -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"}
|
|
@ -1 +1 @@
|
|||||||
http://www.zlib.net/zlib-1.2.3.tar.bz2
|
http://www.zlib.net/zlib-1.2.4.tar.bz2
|
||||||
|
@ -22,7 +22,7 @@ cd objdir
|
|||||||
--disable-nls \
|
--disable-nls \
|
||||||
--disable-sim \
|
--disable-sim \
|
||||||
--without-x \
|
--without-x \
|
||||||
--enable-tui \
|
--disable-tui \
|
||||||
--disable-libada \
|
--disable-libada \
|
||||||
|
|
||||||
make
|
make
|
||||||
|
@ -7,5 +7,5 @@ $SCRIPTS/install expat
|
|||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/objdir/$1/$1 $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/gdbserver $INSTALL/usr/bin
|
||||||
# cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin
|
cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin
|
||||||
|
@ -20,6 +20,7 @@ cd .build-host
|
|||||||
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
|
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
|
--disable-man-pages \
|
||||||
|
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
@ -12,14 +12,17 @@ $SCRIPTS/install libxcb
|
|||||||
$SCRIPTS/install libX11
|
$SCRIPTS/install libX11
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
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 libGL.so.1 $INSTALL/usr/lib/libGL.so
|
||||||
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
|
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
|
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
|
||||||
|
|
||||||
# todo: only in devel build
|
if [ "$DEVTOOLS" = yes ]; then
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $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
|
@ -1 +1 @@
|
|||||||
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28584.tar.bz2
|
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28690.tar.bz2
|
||||||
|
@ -14,6 +14,7 @@ $SCRIPTS/build alsa-lib
|
|||||||
$SCRIPTS/build enca
|
$SCRIPTS/build enca
|
||||||
$SCRIPTS/build curl
|
$SCRIPTS/build curl
|
||||||
$SCRIPTS/build libmicrohttpd
|
$SCRIPTS/build libmicrohttpd
|
||||||
|
$SCRIPTS/build libssh
|
||||||
|
|
||||||
$SCRIPTS/build dbus
|
$SCRIPTS/build dbus
|
||||||
$SCRIPTS/build hal
|
$SCRIPTS/build hal
|
||||||
|
@ -12,6 +12,7 @@ $SCRIPTS/install alsa-lib
|
|||||||
$SCRIPTS/install enca
|
$SCRIPTS/install enca
|
||||||
$SCRIPTS/install curl
|
$SCRIPTS/install curl
|
||||||
$SCRIPTS/install libmicrohttpd
|
$SCRIPTS/install libmicrohttpd
|
||||||
|
$SCRIPTS/install libssh
|
||||||
|
|
||||||
$SCRIPTS/install dbus
|
$SCRIPTS/install dbus
|
||||||
$SCRIPTS/install hal
|
$SCRIPTS/install hal
|
||||||
|
@ -1 +1 @@
|
|||||||
http://sources.openelec.tv/svn/xbmc-28584.tar.bz2
|
http://sources.openelec.tv/svn/xbmc-28690.tar.bz2
|
||||||
|
28
packages/network/libssh/build
Executable file
28
packages/network/libssh/build
Executable file
@ -0,0 +1,28 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
. config/options
|
||||||
|
|
||||||
|
$SCRIPTS/build toolchain
|
||||||
|
$SCRIPTS/build zlib
|
||||||
|
$SCRIPTS/build openssl
|
||||||
|
|
||||||
|
cd $PKG_BUILD
|
||||||
|
mkdir -p build
|
||||||
|
cd build
|
||||||
|
|
||||||
|
if [ ! -f $CMAKE_CONF ]; then
|
||||||
|
echo " ######### ERROR: ##########"
|
||||||
|
echo " $CMAKE_CONF not found"
|
||||||
|
echo " please reinstall cmake with: PROJECT=... ./scripts/install cmake"
|
||||||
|
echo " or do an full rebuild !!!"
|
||||||
|
echo " "
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
..
|
||||||
|
|
||||||
|
make
|
||||||
|
|
||||||
|
$MAKEINSTALL
|
9
packages/network/libssh/install
Executable file
9
packages/network/libssh/install
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
. config/options
|
||||||
|
|
||||||
|
$SCRIPTS/install zlib
|
||||||
|
$SCRIPTS/install openssl
|
||||||
|
|
||||||
|
mkdir -p $INSTALL/usr/lib
|
||||||
|
cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib
|
1
packages/network/libssh/url
Normal file
1
packages/network/libssh/url
Normal file
@ -0,0 +1 @@
|
|||||||
|
http://www.libssh.org/files/libssh-0.4.2.tar.gz
|
@ -7,38 +7,38 @@ $SCRIPTS/install gettext
|
|||||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc
|
mkdir -p $INSTALL/etc
|
||||||
cp -PR $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
|
cp -P $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
|
||||||
# cp -PR $PKG_BUILD/data/pam.conf $INSTALL/etc
|
# cp -P $PKG_BUILD/data/pam.conf $INSTALL/etc
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc/pam.d
|
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
|
mkdir -p $INSTALL/etc/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
|
cp -P $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
|
cp -P $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
|
cp -P $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security
|
cp -P $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_time/time.conf $INSTALL/etc/security
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib/security
|
mkdir -p $INSTALL/lib/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
|
cp -P $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
|
||||||
# cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
|
# cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
|
||||||
cp -PR $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security
|
cp -P $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_unix/unix_chkpwd $INSTALL/lib/security
|
||||||
echo "chmod 4755 $INSTALL/lib/security/unix_chkpwd" >> $FAKEROOT_SCRIPT
|
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
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -PR $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
|
cp -P $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
|
||||||
cp -PR $PKG_BUILD/libpam_misc/.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
|
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
|
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
|
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
|
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
|
||||||
|
@ -18,41 +18,41 @@ $SCRIPTS/install expat
|
|||||||
$SCRIPTS/install Linux-PAM
|
$SCRIPTS/install Linux-PAM
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
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
|
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
|
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
|
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
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
|
cp -P $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin
|
cp -P $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/pkexec $INSTALL/usr/bin
|
||||||
echo "chmod 4755 $INSTALL/usr/bin/pkexec" >> $FAKEROOT_SCRIPT
|
echo "chmod 4755 $INSTALL/usr/bin/pkexec" >> $FAKEROOT_SCRIPT
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
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
|
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
|
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
|
mkdir -p $INSTALL/usr/lib/polkit-1/extensions
|
||||||
cp -PR $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
|
cp -P $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/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib/polkit-1
|
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
|
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
|
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
|
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
|
||||||
|
@ -10,46 +10,47 @@ $SCRIPTS/install polkit
|
|||||||
mkdir -p $INSTALL/etc/ConsoleKit/run-seat.d
|
mkdir -p $INSTALL/etc/ConsoleKit/run-seat.d
|
||||||
mkdir -p $INSTALL/etc/ConsoleKit/run-session.d
|
mkdir -p $INSTALL/etc/ConsoleKit/run-session.d
|
||||||
mkdir -p $INSTALL/etc/ConsoleKit/seats.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
|
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
|
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
|
mkdir -p $INSTALL/sbin
|
||||||
cp -PR $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin
|
cp -P $PKG_BUILD/tools/ck-log-system-restart $INSTALL/sbin
|
||||||
cp -PR $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin
|
cp -P $PKG_BUILD/tools/ck-log-system-start $INSTALL/sbin
|
||||||
cp -PR $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin
|
cp -P $PKG_BUILD/tools/ck-log-system-stop $INSTALL/sbin
|
||||||
cp -PR $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin
|
cp -P $PKG_BUILD/src/console-kit-daemon $INSTALL/sbin
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin
|
cp -P $PKG_BUILD/tools/.libs/ck-launch-session $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin
|
cp -P $PKG_BUILD/tools/ck-list-sessions $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/tools/ck-history $INSTALL/usr/bin
|
cp -P $PKG_BUILD/tools/ck-history $INSTALL/usr/bin
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
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
|
mkdir -p $INSTALL/usr/lib/ConsoleKit
|
||||||
cp -PR $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit
|
cp -P $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 -P $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-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
|
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
|
||||||
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
|
mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
|
||||||
mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
|
mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
|
||||||
cp -PR $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
|
cp -P $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-stop $INSTALL/usr/lib/ConsoleKit/scripts
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/dbus-1/interfaces
|
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 -P $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 -P $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.Session.xml $INSTALL/usr/share/dbus-1/interfaces
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/dbus-1/system-services
|
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
|
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
|
||||||
|
|
||||||
|
@ -8,4 +8,4 @@ progress "Starting D-BUS"
|
|||||||
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
|
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
|
||||||
|
|
||||||
dbus-daemon --system
|
dbus-daemon --system
|
||||||
dbus-uuidgen --ensure
|
dbus-uuidgen --ensure &
|
||||||
|
@ -9,4 +9,4 @@ progress "Starting Hardware Abstraction Layer"
|
|||||||
/var/run/dbus/hald-local \
|
/var/run/dbus/hald-local \
|
||||||
/var/run/dbus/hald-runner
|
/var/run/dbus/hald-runner
|
||||||
|
|
||||||
hald --verbose=no --daemon=yes --use-syslog
|
hald --verbose=no --daemon=yes --use-syslog &
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
$SCRIPTS/install udev
|
$SCRIPTS/install udev
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
|
cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
|
||||||
|
|
||||||
#DEVTOOLS
|
if [ "$DEVTOOLS" = yes ]; then
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/.libs/sktest $INSTALL/usr/bin
|
cp -P $PKG_BUILD/.libs/sktest $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/.libs/skdump $INSTALL/usr/bin
|
cp -P $PKG_BUILD/.libs/skdump $INSTALL/usr/bin
|
||||||
|
fi
|
11
packages/sysutils/udev/init.d/01_udevd
Executable file
11
packages/sysutils/udev/init.d/01_udevd
Executable 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
11
packages/sysutils/udev/init.d/02_udev-monitor
Executable 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
13
packages/sysutils/udev/init.d/03_udev-trigger
Executable 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=
|
||||||
|
)&
|
@ -1,18 +0,0 @@
|
|||||||
#
|
|
||||||
# starting Udev
|
|
||||||
#
|
|
||||||
# runlevels: openelec, text
|
|
||||||
|
|
||||||
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=
|
|
||||||
)&
|
|
@ -1,19 +0,0 @@
|
|||||||
# 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
|
|
@ -1 +0,0 @@
|
|||||||
http://sources.openelec.tv/svn/uxlaunch-0.44-git.tar.bz2
|
|
@ -2,9 +2,53 @@
|
|||||||
|
|
||||||
. config/options
|
. config/options
|
||||||
|
|
||||||
cp $PKG_BUILD/bin/cmake \
|
mkdir -p $ROOT/$TOOLCHAIN/bin
|
||||||
$PKG_BUILD/bin/cpack \
|
cp -P $PKG_BUILD/bin/cmake $ROOT/$TOOLCHAIN/bin
|
||||||
$PKG_BUILD/bin/ctest \
|
cp -P $PKG_BUILD/bin/cpack $ROOT/$TOOLCHAIN/bin
|
||||||
$ROOT/$TOOLCHAIN/bin
|
cp -P $PKG_BUILD/bin/ctest $ROOT/$TOOLCHAIN/bin
|
||||||
|
|
||||||
# $PKG_BUILD/bin/ccmake \
|
mkdir -p $ROOT/$TOOLCHAIN/etc
|
||||||
|
|
||||||
|
cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF
|
||||||
|
# this one is important
|
||||||
|
SET(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
#this one not so much
|
||||||
|
SET(CMAKE_SYSTEM_VERSION 1)
|
||||||
|
|
||||||
|
# specify the cross compiler
|
||||||
|
SET(CMAKE_C_COMPILER $TARGET_CC)
|
||||||
|
SET(CMAKE_CXX_COMPILER $TARGET_CXX)
|
||||||
|
|
||||||
|
# where is the target environment
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH $SYSROOT_PREFIX)
|
||||||
|
|
||||||
|
# search for programs in the build host directories
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
|
||||||
|
# for libraries and headers in the target directories
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat >$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf <<EOF
|
||||||
|
# this one is important
|
||||||
|
SET(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
#this one not so much
|
||||||
|
SET(CMAKE_SYSTEM_VERSION 1)
|
||||||
|
|
||||||
|
# specify the host compiler
|
||||||
|
SET(CMAKE_C_COMPILER $HOST_CC)
|
||||||
|
SET(CMAKE_CXX_COMPILER $HOST_CXX)
|
||||||
|
|
||||||
|
# where is the target environment
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH $ROOT/$TOOLCHAIN)
|
||||||
|
|
||||||
|
# search for programs in the build host directories
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
|
||||||
|
|
||||||
|
# for libraries and headers in the target directories
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
|
||||||
|
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
|
||||||
|
|
||||||
|
EOF
|
||||||
|
2
packages/x11/driver/xf86-video-ati/arch
Normal file
2
packages/x11/driver/xf86-video-ati/arch
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
i386
|
||||||
|
x86_64
|
@ -5,7 +5,6 @@
|
|||||||
$SCRIPTS/build toolchain
|
$SCRIPTS/build toolchain
|
||||||
$SCRIPTS/build libXrandr
|
$SCRIPTS/build libXrandr
|
||||||
$SCRIPTS/build libXrender
|
$SCRIPTS/build libXrender
|
||||||
$SCRIPTS/build libXv
|
|
||||||
$SCRIPTS/build libXext
|
$SCRIPTS/build libXext
|
||||||
$SCRIPTS/build libpciaccess
|
$SCRIPTS/build libpciaccess
|
||||||
$SCRIPTS/build libdrm
|
$SCRIPTS/build libdrm
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
$SCRIPTS/install libXrandr
|
$SCRIPTS/install libXrandr
|
||||||
$SCRIPTS/install libXrender
|
$SCRIPTS/install libXrender
|
||||||
$SCRIPTS/install libXv
|
|
||||||
$SCRIPTS/install libXext
|
$SCRIPTS/install libXext
|
||||||
$SCRIPTS/install libpciaccess
|
$SCRIPTS/install libpciaccess
|
||||||
$SCRIPTS/install libdrm
|
$SCRIPTS/install libdrm
|
||||||
|
@ -1 +1 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.901.tar.bz2
|
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.902.tar.bz2
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
http://sources.openelec.tv/svn/NVIDIA-Linux-x86-195.36.08-pkg0.run
|
ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run
|
||||||
http://sources.openelec.tv/svn/NVIDIA-Linux-x86_64-195.36.08-pkg0.run
|
ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
ftp://download.nvidia.com/XFree86/Linux-x86/195.36.08/NVIDIA-Linux-x86-195.36.08-pkg0.run
|
|
||||||
ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.08/NVIDIA-Linux-x86_64-195.36.08-pkg0.run
|
|
@ -1,22 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. config/options
|
|
||||||
|
|
||||||
$SCRIPTS/build toolchain
|
|
||||||
$SCRIPTS/build videoproto
|
|
||||||
$SCRIPTS/build libX11
|
|
||||||
$SCRIPTS/build libXext
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
./configure --host=$TARGET_NAME \
|
|
||||||
--build=$HOST_NAME \
|
|
||||||
--prefix=/usr \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--localstatedir=/var \
|
|
||||||
--disable-static \
|
|
||||||
--enable-shared \
|
|
||||||
--enable-malloc0returnsnull
|
|
||||||
|
|
||||||
$MAKE
|
|
||||||
|
|
||||||
$MAKEINSTALL
|
|
@ -1,9 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. config/options
|
|
||||||
|
|
||||||
$SCRIPTS/install libX11
|
|
||||||
$SCRIPTS/install libXext
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
|
||||||
cp -PR $PKG_BUILD/src/.libs/libXv.so* $INSTALL/usr/lib
|
|
@ -1 +0,0 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/lib/libXv-1.0.5.tar.bz2
|
|
27
packages/x11/xserver/xorg-server/init.d/05_configure_xorg → packages/x11/other/uxlaunch/init.d/60_uxlaunch
Executable file → Normal file
27
packages/x11/xserver/xorg-server/init.d/05_configure_xorg → packages/x11/other/uxlaunch/init.d/60_uxlaunch
Executable file → Normal file
@ -1,7 +1,22 @@
|
|||||||
|
# starting uxlaunch
|
||||||
#
|
#
|
||||||
# configure xorg directories
|
# runlevels: openelec
|
||||||
#
|
|
||||||
# runlevels: openelec, text
|
progress "starting uxlaunch"
|
||||||
|
|
||||||
|
UX_USER="root"
|
||||||
|
UX_TTY="1"
|
||||||
|
XORG_CONF="/etc/X11/xorg.conf"
|
||||||
|
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
progress "creating directories needed for Xorg"
|
progress "creating directories needed for Xorg"
|
||||||
|
|
||||||
@ -13,7 +28,13 @@ progress "creating directories needed for Xorg"
|
|||||||
if lspci -n | grep 0300 | grep -q 10de; then
|
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/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||||
|
UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
|
||||||
else
|
else
|
||||||
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
$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
|
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
||||||
|
UX_ARG="$UX_ARG -c $XORG_CONF"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
progress "starting xsession"
|
||||||
|
|
||||||
|
uxlaunch $UX_ARG > /dev/null 2>&1
|
@ -0,0 +1,93 @@
|
|||||||
|
diff -Naur uxlaunch-0.46/options.c uxlaunch-0.46.patch/options.c
|
||||||
|
--- uxlaunch-0.46/options.c 2010-03-04 19:51:44.000000000 +0100
|
||||||
|
+++ uxlaunch-0.46.patch/options.c 2010-03-21 14:07:15.273504664 +0100
|
||||||
|
@@ -27,6 +27,7 @@
|
||||||
|
int tty = 2;
|
||||||
|
char session[256] = "/usr/bin/mutter --sm-disable";
|
||||||
|
char username[256] = "moblin";
|
||||||
|
+char xconfig[256] = "/etc/X11/xorg.conf";
|
||||||
|
|
||||||
|
int verbose = 0;
|
||||||
|
|
||||||
|
@@ -34,6 +35,7 @@
|
||||||
|
{ "user", 1, NULL, 'u' },
|
||||||
|
{ "tty", 1, NULL, 't' },
|
||||||
|
{ "session", 1, NULL, 's' },
|
||||||
|
+ { "xconfig", 1, NULL, 'c' },
|
||||||
|
{ "help", 0, NULL, 'h' },
|
||||||
|
{ "verbose", 0, NULL, 'v' },
|
||||||
|
{ 0, 0, NULL, 0}
|
||||||
|
@@ -46,6 +48,7 @@
|
||||||
|
printf(" -u, --user Start session as specific username\n");
|
||||||
|
printf(" -t, --tty Start session on alternative tty number\n");
|
||||||
|
printf(" -s, --session Start a non-default session\n");
|
||||||
|
+ printf(" -c, --xconfig Xorg config file\n");
|
||||||
|
printf(" -v, --verbose Display lots of output to the console\n");
|
||||||
|
printf(" -h, --help Display this help message\n");
|
||||||
|
}
|
||||||
|
@@ -126,13 +129,15 @@
|
||||||
|
tty = atoi(val);
|
||||||
|
if (!strcmp(key, "session"))
|
||||||
|
strncpy(session, val, 256);
|
||||||
|
+ if (!strcmp(key, "xconfig"))
|
||||||
|
+ strncpy(xconfig, val, 256);
|
||||||
|
}
|
||||||
|
fclose(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parse cmdline - overrides */
|
||||||
|
while (1) {
|
||||||
|
- c = getopt_long(argc, argv, "u:t:s:hv", opts, &i);
|
||||||
|
+ c = getopt_long(argc, argv, "u:t:s:c:hv", opts, &i);
|
||||||
|
if (c == -1)
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -146,6 +151,9 @@
|
||||||
|
case 's':
|
||||||
|
strncpy(session, optarg, 256);
|
||||||
|
break;
|
||||||
|
+ case 'c':
|
||||||
|
+ strncpy(xconfig, optarg, 256);
|
||||||
|
+ break;
|
||||||
|
case 'h':
|
||||||
|
usage(argv[0]);
|
||||||
|
exit (EXIT_SUCCESS);
|
||||||
|
@@ -171,7 +179,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
lprintf("uxlaunch v%s started.", VERSION);
|
||||||
|
- lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session);
|
||||||
|
+ lprintf("user \"%s\", tty #%d, session \"%s\", xconfig \"%s\"", username, tty, session, xconfig);
|
||||||
|
|
||||||
|
pass = getpwnam(username);
|
||||||
|
if (!pass)
|
||||||
|
diff -Naur uxlaunch-0.46/uxlaunch.h uxlaunch-0.46.patch/uxlaunch.h
|
||||||
|
--- uxlaunch-0.46/uxlaunch.h 2010-03-04 19:51:44.000000000 +0100
|
||||||
|
+++ uxlaunch-0.46.patch/uxlaunch.h 2010-03-21 14:09:01.116504932 +0100
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
extern int tty;
|
||||||
|
extern char session[];
|
||||||
|
extern char username[];
|
||||||
|
+extern char xconfig[];
|
||||||
|
|
||||||
|
extern int session_pid;
|
||||||
|
extern int xpid;
|
||||||
|
diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
|
||||||
|
--- uxlaunch-0.46/xserver.c 2010-03-04 19:51:44.000000000 +0100
|
||||||
|
+++ uxlaunch-0.46.patch/xserver.c 2010-03-21 14:07:43.871631141 +0100
|
||||||
|
@@ -231,13 +231,13 @@
|
||||||
|
execl(xserver, xserver, displayname,
|
||||||
|
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
||||||
|
"-auth", xauth_cookie_file,
|
||||||
|
- vt, NULL);
|
||||||
|
+ vt, "-config", xconfig, NULL);
|
||||||
|
} else {
|
||||||
|
execl(xserver, xserver, displayname,
|
||||||
|
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
||||||
|
"-auth", user_xauth_path,
|
||||||
|
"-logfile", xorg_log,
|
||||||
|
- vt, NULL);
|
||||||
|
+ vt, "-config", xconfig, NULL);
|
||||||
|
}
|
||||||
|
exit(0);
|
||||||
|
}
|
1
packages/x11/other/uxlaunch/url
Normal file
1
packages/x11/other/uxlaunch/url
Normal file
@ -0,0 +1 @@
|
|||||||
|
http://git.moblin.org/cgit.cgi/uxlaunch/snapshot/uxlaunch-0.46.tar.bz2
|
@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. config/options
|
|
||||||
|
|
||||||
$SCRIPTS/build toolchain
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
./configure --host=$TARGET_NAME \
|
|
||||||
--build=$HOST_NAME \
|
|
||||||
--prefix=/usr \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
$MAKEINSTALL
|
|
@ -1 +0,0 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
|
|
@ -8,27 +8,25 @@ get_graphicdrivers
|
|||||||
|
|
||||||
$SCRIPTS/build toolchain
|
$SCRIPTS/build toolchain
|
||||||
|
|
||||||
$SCRIPTS/build xf86driproto
|
$SCRIPTS/build fontsproto
|
||||||
$SCRIPTS/build randrproto
|
$SCRIPTS/build randrproto
|
||||||
$SCRIPTS/build renderproto
|
$SCRIPTS/build renderproto
|
||||||
$SCRIPTS/build scrnsaverproto
|
$SCRIPTS/build scrnsaverproto
|
||||||
$SCRIPTS/build videoproto
|
$SCRIPTS/build videoproto
|
||||||
$SCRIPTS/build inputproto
|
$SCRIPTS/build inputproto
|
||||||
$SCRIPTS/build xf86dgaproto
|
$SCRIPTS/build xf86dgaproto
|
||||||
|
$SCRIPTS/build xf86driproto
|
||||||
$SCRIPTS/build xf86miscproto
|
$SCRIPTS/build xf86miscproto
|
||||||
|
$SCRIPTS/build libfontenc
|
||||||
$SCRIPTS/build libpciaccess
|
$SCRIPTS/build libpciaccess
|
||||||
$SCRIPTS/build libX11
|
$SCRIPTS/build libX11
|
||||||
$SCRIPTS/build libXfont
|
$SCRIPTS/build libXfont
|
||||||
$SCRIPTS/build libxkbfile
|
$SCRIPTS/build libxkbfile
|
||||||
$SCRIPTS/build libXv
|
|
||||||
$SCRIPTS/build libdrm
|
$SCRIPTS/build libdrm
|
||||||
$SCRIPTS/build Mesa
|
$SCRIPTS/build Mesa
|
||||||
$SCRIPTS/build openssl
|
$SCRIPTS/build openssl
|
||||||
$SCRIPTS/build freetype
|
$SCRIPTS/build freetype
|
||||||
$SCRIPTS/build libfontenc
|
|
||||||
$SCRIPTS/build pixman
|
$SCRIPTS/build pixman
|
||||||
$SCRIPTS/build fontsproto
|
|
||||||
$SCRIPTS/build xf86bigfontproto
|
|
||||||
$SCRIPTS/build dbus
|
$SCRIPTS/build dbus
|
||||||
$SCRIPTS/build hal
|
$SCRIPTS/build hal
|
||||||
|
|
||||||
@ -49,7 +47,6 @@ autoconf
|
|||||||
--datarootdir=/usr/share \
|
--datarootdir=/usr/share \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-strict-compilation \
|
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
--disable-builddocs \
|
--disable-builddocs \
|
||||||
--enable-largefile \
|
--enable-largefile \
|
||||||
|
@ -9,7 +9,6 @@ $SCRIPTS/install freetype
|
|||||||
$SCRIPTS/install openssl
|
$SCRIPTS/install openssl
|
||||||
$SCRIPTS/install libX11
|
$SCRIPTS/install libX11
|
||||||
$SCRIPTS/install libXfont
|
$SCRIPTS/install libXfont
|
||||||
$SCRIPTS/install libXv
|
|
||||||
$SCRIPTS/install libdrm
|
$SCRIPTS/install libdrm
|
||||||
$SCRIPTS/install Mesa
|
$SCRIPTS/install Mesa
|
||||||
$SCRIPTS/install pixman
|
$SCRIPTS/install pixman
|
||||||
@ -83,5 +82,8 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
|
|||||||
#Tools
|
#Tools
|
||||||
$SCRIPTS/install pciutils
|
$SCRIPTS/install pciutils
|
||||||
$SCRIPTS/install uxlaunch
|
$SCRIPTS/install uxlaunch
|
||||||
[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install ratpoison
|
|
||||||
[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install mrxvt
|
if [ "$DEVTOOLS" = yes ]; then
|
||||||
|
$SCRIPTS/install ratpoison
|
||||||
|
$SCRIPTS/install mrxvt
|
||||||
|
fi
|
||||||
|
@ -1 +1 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.902.tar.bz2
|
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.6.tar.gz
|
||||||
|
Loading…
x
Reference in New Issue
Block a user