diff --git a/config/path b/config/path index 594d46a366..11f70592ee 100644 --- a/config/path +++ b/config/path @@ -162,6 +162,10 @@ setup_toolchain() { export CXXFLAGS="$TARGET_CXXFLAGS" export LDFLAGS="$TARGET_LDFLAGS" 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 export AWK=$HOST_AWK export CC=$HOST_CC @@ -178,6 +182,10 @@ setup_toolchain() { export CXXFLAGS="$HOST_CXXFLAGS" export LDFLAGS="$HOST_LDFLAGS" export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" + +# set CMAKE configfile for host + export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf + fi } setup_toolchain target diff --git a/packages/audio/libcdio/build b/packages/audio/libcdio/build index 313fef7906..4fb56d65b8 100755 --- a/packages/audio/libcdio/build +++ b/packages/audio/libcdio/build @@ -4,7 +4,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build libiconv -$SCRIPTS/build ncurses cd $PKG_BUILD ./configure --host=$TARGET_NAME \ diff --git a/packages/audio/libcdio/install b/packages/audio/libcdio/install index 79b127170d..845eeba9f5 100755 --- a/packages/audio/libcdio/install +++ b/packages/audio/libcdio/install @@ -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 diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index 30707e293a..ba821d844a 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -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 diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index 9d079d1749..378acda7bf 100755 --- a/packages/compress/zlib/install +++ b/packages/compress/zlib/install @@ -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 diff --git a/packages/compress/zlib/patches/10_crosscompile.diff b/packages/compress/zlib/patches/10_crosscompile.diff deleted file mode 100644 index 180d0fad70..0000000000 --- a/packages/compress/zlib/patches/10_crosscompile.diff +++ /dev/null @@ -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"} diff --git a/packages/compress/zlib/url b/packages/compress/zlib/url index 100019aaa2..7ef9d2fc51 100644 --- a/packages/compress/zlib/url +++ b/packages/compress/zlib/url @@ -1 +1 @@ -http://www.zlib.net/zlib-1.2.3.tar.bz2 +http://www.zlib.net/zlib-1.2.4.tar.bz2 diff --git a/packages/debug/gdb/build b/packages/debug/gdb/build index 73ad50db13..b66eff3862 100755 --- a/packages/debug/gdb/build +++ b/packages/debug/gdb/build @@ -22,7 +22,7 @@ cd objdir --disable-nls \ --disable-sim \ --without-x \ - --enable-tui \ + --disable-tui \ --disable-libada \ -make \ No newline at end of file +make diff --git a/packages/debug/gdb/install b/packages/debug/gdb/install index ea9e238829..be171c982b 100755 --- a/packages/debug/gdb/install +++ b/packages/debug/gdb/install @@ -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 diff --git a/packages/devel/eggdbus-host/build b/packages/devel/eggdbus-host/build index f6c8bb3f60..9f2dcf52fe 100755 --- a/packages/devel/eggdbus-host/build +++ b/packages/devel/eggdbus-host/build @@ -20,6 +20,7 @@ cd .build-host --sysconfdir=$ROOT/$TOOLCHAIN/etc \ --disable-static \ --enable-shared \ + --disable-man-pages \ make make install diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 1ff187384d..d8bd307281 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -12,14 +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 -# todo: only in devel build -mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,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 \ No newline at end of file diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 450de66da9..0066bc213d 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-28584.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-28690.tar.bz2 diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 337ae9b0ff..b1cde99c34 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -14,6 +14,7 @@ $SCRIPTS/build alsa-lib $SCRIPTS/build enca $SCRIPTS/build curl $SCRIPTS/build libmicrohttpd +$SCRIPTS/build libssh $SCRIPTS/build dbus $SCRIPTS/build hal diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index c57d1064cd..6a1e4c105a 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -12,6 +12,7 @@ $SCRIPTS/install alsa-lib $SCRIPTS/install enca $SCRIPTS/install curl $SCRIPTS/install libmicrohttpd +$SCRIPTS/install libssh $SCRIPTS/install dbus $SCRIPTS/install hal diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 734d3e3701..aa8d60462b 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-28584.tar.bz2 +http://sources.openelec.tv/svn/xbmc-28690.tar.bz2 diff --git a/packages/network/libssh/build b/packages/network/libssh/build new file mode 100755 index 0000000000..1ac6b19930 --- /dev/null +++ b/packages/network/libssh/build @@ -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 diff --git a/packages/network/libssh/install b/packages/network/libssh/install new file mode 100755 index 0000000000..86ed31d8f8 --- /dev/null +++ b/packages/network/libssh/install @@ -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 diff --git a/packages/network/libssh/url b/packages/network/libssh/url new file mode 100644 index 0000000000..cf97e70192 --- /dev/null +++ b/packages/network/libssh/url @@ -0,0 +1 @@ +http://www.libssh.org/files/libssh-0.4.2.tar.gz \ No newline at end of file diff --git a/packages/security/Linux-PAM/install b/packages/security/Linux-PAM/install index 49a9bc5c42..2ce7d104d7 100755 --- a/packages/security/Linux-PAM/install +++ b/packages/security/Linux-PAM/install @@ -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 diff --git a/packages/security/polkit/install b/packages/security/polkit/install index 2b63309e09..9cf4d05d27 100755 --- a/packages/security/polkit/install +++ b/packages/security/polkit/install @@ -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 diff --git a/packages/sysutils/ConsoleKit/install b/packages/sysutils/ConsoleKit/install index 22cad875cc..8102aec26e 100755 --- a/packages/sysutils/ConsoleKit/install +++ b/packages/sysutils/ConsoleKit/install @@ -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 + diff --git a/packages/sysutils/busybox/init.d/21_debugshell b/packages/sysutils/busybox/init.d/00_debugshell similarity index 100% rename from packages/sysutils/busybox/init.d/21_debugshell rename to packages/sysutils/busybox/init.d/00_debugshell diff --git a/packages/sysutils/busybox/init.d/01_mount_filesystem b/packages/sysutils/busybox/init.d/05_mount_filesystem similarity index 100% rename from packages/sysutils/busybox/init.d/01_mount_filesystem rename to packages/sysutils/busybox/init.d/05_mount_filesystem diff --git a/packages/sysutils/busybox/init.d/02_make_directorys b/packages/sysutils/busybox/init.d/06_make_directorys similarity index 100% rename from packages/sysutils/busybox/init.d/02_make_directorys rename to packages/sysutils/busybox/init.d/06_make_directorys diff --git a/packages/sysutils/busybox/init.d/03_userconfig b/packages/sysutils/busybox/init.d/07_userconfig similarity index 100% rename from packages/sysutils/busybox/init.d/03_userconfig rename to packages/sysutils/busybox/init.d/07_userconfig diff --git a/packages/sysutils/busybox/init.d/04_network b/packages/sysutils/busybox/init.d/08_network similarity index 100% rename from packages/sysutils/busybox/init.d/04_network rename to packages/sysutils/busybox/init.d/08_network diff --git a/packages/sysutils/dbus/init.d/12_dbus b/packages/sysutils/dbus/init.d/12_dbus index 302d6ae3f4..4c959aaa9a 100755 --- a/packages/sysutils/dbus/init.d/12_dbus +++ b/packages/sysutils/dbus/init.d/12_dbus @@ -8,4 +8,4 @@ progress "Starting D-BUS" $IONICE mkdir -p /var/lib/dbus /var/run/dbus dbus-daemon --system - dbus-uuidgen --ensure + dbus-uuidgen --ensure & diff --git a/packages/sysutils/hal/init.d/13_hal b/packages/sysutils/hal/init.d/13_hal index b3dbffe0be..0b8f925a22 100755 --- a/packages/sysutils/hal/init.d/13_hal +++ b/packages/sysutils/hal/init.d/13_hal @@ -9,4 +9,4 @@ progress "Starting Hardware Abstraction Layer" /var/run/dbus/hald-local \ /var/run/dbus/hald-runner - hald --verbose=no --daemon=yes --use-syslog + hald --verbose=no --daemon=yes --use-syslog & diff --git a/packages/sysutils/libatasmart/install b/packages/sysutils/libatasmart/install index b47a9e0002..a6b87b2485 100755 --- a/packages/sysutils/libatasmart/install +++ b/packages/sysutils/libatasmart/install @@ -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 \ No newline at end of file diff --git a/packages/sysutils/udev/init.d/01_udevd b/packages/sysutils/udev/init.d/01_udevd new file mode 100755 index 0000000000..c9cfd479f1 --- /dev/null +++ b/packages/sysutils/udev/init.d/01_udevd @@ -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 & diff --git a/packages/sysutils/udev/init.d/02_udev-monitor b/packages/sysutils/udev/init.d/02_udev-monitor new file mode 100755 index 0000000000..d08f73e1a1 --- /dev/null +++ b/packages/sysutils/udev/init.d/02_udev-monitor @@ -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 & diff --git a/packages/sysutils/udev/init.d/03_udev-trigger b/packages/sysutils/udev/init.d/03_udev-trigger new file mode 100755 index 0000000000..5334be7550 --- /dev/null +++ b/packages/sysutils/udev/init.d/03_udev-trigger @@ -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= + )& diff --git a/packages/sysutils/udev/init.d/11_udev b/packages/sysutils/udev/init.d/11_udev deleted file mode 100755 index c3fe754da2..0000000000 --- a/packages/sysutils/udev/init.d/11_udev +++ /dev/null @@ -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= - )& diff --git a/packages/sysutils/uxlaunch/init.d/60_uxlaunch b/packages/sysutils/uxlaunch/init.d/60_uxlaunch deleted file mode 100644 index a31dfe9b0e..0000000000 --- a/packages/sysutils/uxlaunch/init.d/60_uxlaunch +++ /dev/null @@ -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 \ No newline at end of file diff --git a/packages/sysutils/uxlaunch/url b/packages/sysutils/uxlaunch/url deleted file mode 100644 index d23bb6709c..0000000000 --- a/packages/sysutils/uxlaunch/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/uxlaunch-0.44-git.tar.bz2 diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install index 25e8e0187a..7c91165e18 100755 --- a/packages/toolchain/devel/cmake/install +++ b/packages/toolchain/devel/cmake/install @@ -2,9 +2,53 @@ . config/options -cp $PKG_BUILD/bin/cmake \ - $PKG_BUILD/bin/cpack \ - $PKG_BUILD/bin/ctest \ - $ROOT/$TOOLCHAIN/bin +mkdir -p $ROOT/$TOOLCHAIN/bin + cp -P $PKG_BUILD/bin/cmake $ROOT/$TOOLCHAIN/bin + cp -P $PKG_BUILD/bin/cpack $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 <$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf < /dev/null 2>&1 \ No newline at end of file diff --git a/packages/sysutils/uxlaunch/install b/packages/x11/other/uxlaunch/install similarity index 100% rename from packages/sysutils/uxlaunch/install rename to packages/x11/other/uxlaunch/install diff --git a/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff b/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff new file mode 100644 index 0000000000..66a8425e46 --- /dev/null +++ b/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff @@ -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); + } diff --git a/packages/x11/other/uxlaunch/url b/packages/x11/other/uxlaunch/url new file mode 100644 index 0000000000..6876470c93 --- /dev/null +++ b/packages/x11/other/uxlaunch/url @@ -0,0 +1 @@ +http://git.moblin.org/cgit.cgi/uxlaunch/snapshot/uxlaunch-0.46.tar.bz2 \ No newline at end of file diff --git a/packages/x11/proto/xf86bigfontproto/build b/packages/x11/proto/xf86bigfontproto/build deleted file mode 100755 index 61467203fa..0000000000 --- a/packages/x11/proto/xf86bigfontproto/build +++ /dev/null @@ -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 diff --git a/packages/x11/proto/xf86bigfontproto/url b/packages/x11/proto/xf86bigfontproto/url deleted file mode 100644 index 62905892af..0000000000 --- a/packages/x11/proto/xf86bigfontproto/url +++ /dev/null @@ -1 +0,0 @@ -http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2 \ No newline at end of file diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 6a9635034d..d247aaaccd 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -8,27 +8,25 @@ get_graphicdrivers $SCRIPTS/build toolchain -$SCRIPTS/build xf86driproto +$SCRIPTS/build fontsproto $SCRIPTS/build randrproto $SCRIPTS/build renderproto $SCRIPTS/build scrnsaverproto $SCRIPTS/build videoproto $SCRIPTS/build inputproto $SCRIPTS/build xf86dgaproto +$SCRIPTS/build xf86driproto $SCRIPTS/build xf86miscproto +$SCRIPTS/build libfontenc $SCRIPTS/build libpciaccess $SCRIPTS/build libX11 $SCRIPTS/build libXfont $SCRIPTS/build libxkbfile -$SCRIPTS/build libXv $SCRIPTS/build libdrm $SCRIPTS/build Mesa $SCRIPTS/build openssl $SCRIPTS/build freetype -$SCRIPTS/build libfontenc $SCRIPTS/build pixman -$SCRIPTS/build fontsproto -$SCRIPTS/build xf86bigfontproto $SCRIPTS/build dbus $SCRIPTS/build hal @@ -49,7 +47,6 @@ autoconf --datarootdir=/usr/share \ --disable-static \ --enable-shared \ - --disable-strict-compilation \ --disable-debug \ --disable-builddocs \ --enable-largefile \ diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 42c02b95a3..44135b4166 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -9,7 +9,6 @@ $SCRIPTS/install freetype $SCRIPTS/install openssl $SCRIPTS/install libX11 $SCRIPTS/install libXfont -$SCRIPTS/install libXv $SCRIPTS/install libdrm $SCRIPTS/install Mesa $SCRIPTS/install pixman @@ -83,5 +82,8 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Tools $SCRIPTS/install pciutils $SCRIPTS/install uxlaunch -[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install ratpoison -[ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install mrxvt + + if [ "$DEVTOOLS" = yes ]; then + $SCRIPTS/install ratpoison + $SCRIPTS/install mrxvt + fi diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 35be222190..e5feeb612f 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.902.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.6.tar.gz