Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf

Makefile

@@ -1,24 +1,12 @@
 BUILD_DIRS="build.*"
 
-all: squashfs
+all: system
 
 system:
 	./scripts/image
 
 release:
-	./scripts/image_release
+	./scripts/image release
-
-squashfs:
-	./scripts/image_squashfs
-
-qemu:
-	./scripts/image_qemu
-
-vmware:
-	./scripts/image_vmware
-
-addons:
-	./scripts/image_addons
 
 clean:
 	rm -rf $(BUILD_DIRS)

config/functions

@@ -114,19 +114,6 @@ add_group() {
   fi
 }
 
-get_version() {
-
-  BUILD_DATE=`date +%Y%m%d`
-
-  if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
-    GIT_BUILD=`git log --pretty=format:'' | wc -l`
-    GIT_HASH=`git log -n1 --format=%H`
-    OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD
-  fi
-
-  TARGET_VERSION="$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION"
-}
-
 do_autoreconf() {
   if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf ] &&
      [ -e $ROOT/$TOOLCHAIN/bin/autoconf ] &&

config/path

@@ -114,7 +114,6 @@ if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
-
 . config/functions
 
 setup_toolchain target

config/sources

@@ -1,5 +1,2 @@
-# OpenELEC Download site
-  OPENELEC_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
 # Sourceforge download site
   SOURCEFORGE_SRC="http://prdownloads.sourceforge.net"

packages/3rdparty/download/CouchPotato/meta

@@ -25,7 +25,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/RuudBurger/CouchPotato"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="Python SABnzbd"
 PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"

packages/3rdparty/download/SickBeard/meta

@@ -25,7 +25,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/midgetspy/Sick-Beard"
-PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS="Python SABnzbd Cheetah"
 PKG_BUILD_DEPENDS="toolchain Python Cheetah"
 PKG_PRIORITY="optional"

packages/addons/debugging/tools/evtest/addon

@@ -29,4 +29,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/zlib-[0-9]*/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.service

@@ -160,7 +160,7 @@ python $ADDON_DIR/bin/ini_tool --action=write \
     SABNZBD_IP="0.0.0.0"
   fi
 
-  if [ ! -f "$ADDON_HOME/sabnzbd.ini" ]; then
+  if [ ! -f "SABNZBD_SETTINGS" ]; then
     SABNZBD_FIRSTRUN="yes"
   fi
 
@@ -213,7 +213,7 @@ python $ADDON_DIR/bin/ini_tool --action=write \
 ################################################################################
 # start sabnzbd
 ################################################################################
-  python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $ADDON_HOME/sabnzbd.ini -l 0
+  python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $SABNZBD_SETTINGS -l 0
 
 ################################################################################
 # read sabnzbd settings
@@ -227,7 +227,7 @@ python $ADDON_DIR/bin/ini_tool --action=write \
     SICKBEARD_IP="0.0.0.0"
   fi
 
-  if [ ! -f "$ADDON_HOME/config.ini" ]; then
+  if [ ! -f "$SICKBEARD_SETTINGS" ]; then
     SICKBEARD_FIRSTRUN="yes"
   fi
 
@@ -268,7 +268,7 @@ python $ADDON_DIR/bin/ini_tool --action=write \
     COUCHPOTATO_IP="0.0.0.0"
   fi
 
-  if [ ! -f "$ADDON_HOME/couchpotato.ini" ]; then
+  if [ ! -f "$COUCHPOTATO_SETTINGS" ]; then
     COUCHPOTATO_FIRSTRUN="yes"
   fi
 
@@ -296,4 +296,4 @@ python $ADDON_DIR/bin/ini_tool --action=write \
 ################################################################################
 # start couchpotato
 ################################################################################
-  python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $ADDON_HOME/couchpotato.ini
+  python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $COUCHPOTATO_SETTINGS

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 # PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS="libiconv avahi openssl"
 PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
 PKG_PRIORITY="optional"

packages/addons/service/softcam/oscam/meta

@@ -25,7 +25,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
-PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="openssl"
 PKG_BUILD_DEPENDS="toolchain openssl"
 PKG_PRIORITY="optional"

packages/debug/tvdump/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/~currojerez/tvdump/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python libpciaccess"
 PKG_BUILD_DEPENDS="toolchain libpciaccess"
 PKG_PRIORITY="optional"

packages/devel/pcre/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.12"
+PKG_VERSION="8.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.pcre.org/"
-PKG_URL="$SOURCEFORGE_SRC/pcre/pcre/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/graphics/jasper/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.4
+# Busybox version: 1.19.0
-# Tue May 17 21:21:08 2011
+# Sun Aug 14 01:35:52 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_LONG_OPTS is not set
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 # CONFIG_FEATURE_SUID is not set
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install-initramfs"
 #
 # Busybox Library Tuning
 #
+CONFIG_FEATURE_SYSTEMD=y
+# CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=1
 CONFIG_FEATURE_FAST_TOP=y
@@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
@@ -106,6 +109,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_NON_POSIX_CP is not set
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 # CONFIG_MONOTONIC_SYSCALL is not set
 # CONFIG_IOCTL_HEX2STR_ERROR is not set
 # CONFIG_FEATURE_HWIB is not set
@@ -169,12 +173,17 @@ CONFIG_CAT=y
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
 # CONFIG_FEATURE_DATE_COMPAT is not set
+# CONFIG_ID is not set
+# CONFIG_GROUPS is not set
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
+# CONFIG_TOUCH is not set
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
 # CONFIG_CAL is not set
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
@@ -212,10 +221,8 @@ CONFIG_FEATURE_FANCY_ECHO=y
 # CONFIG_HEAD is not set
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
-# CONFIG_ID is not set
 # CONFIG_INSTALL is not set
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
 # CONFIG_LN is not set
 # CONFIG_LOGNAME is not set
 CONFIG_LS=y
@@ -267,7 +274,6 @@ CONFIG_SYNC=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-# CONFIG_TOUCH is not set
 # CONFIG_TRUE is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
@@ -279,7 +285,6 @@ CONFIG_USLEEP=y
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHO is not set
 # CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 
@@ -346,20 +351,13 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 # Editors
 #
 # CONFIG_PATCH is not set
-# CONFIG_AWK is not set
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -368,6 +366,14 @@ CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+# CONFIG_SED is not set
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -426,6 +432,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
 #
 # Login/Password Management Utilities
@@ -511,6 +518,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 CONFIG_BLKID=y
+CONFIG_FEATURE_BLKID_TYPE=y
 # CONFIG_DMESG is not set
 # CONFIG_FEATURE_DMESG_PRETTY is not set
 # CONFIG_FBSET is not set
@@ -519,7 +527,7 @@ CONFIG_BLKID=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -614,10 +622,25 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+# CONFIG_LESS is not set
+CONFIG_FEATURE_LESS_MAXLINES=0
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -658,15 +681,6 @@ CONFIG_IONICE=y
 # CONFIG_LAST is not set
 # CONFIG_FEATURE_LAST_SMALL is not set
 # CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_LESS is not set
-CONFIG_FEATURE_LESS_MAXLINES=0
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -700,11 +714,17 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NBDCLIENT=y
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
 # CONFIG_NC_110_COMPAT is not set
+# CONFIG_PING is not set
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING is not set
+# CONFIG_WHOIS is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
@@ -777,17 +797,12 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
 # CONFIG_NSLOOKUP is not set
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PING is not set
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING is not set
 # CONFIG_PSCAN is not set
 # CONFIG_ROUTE is not set
 # CONFIG_SLATTACH is not set
@@ -816,12 +831,14 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -857,15 +874,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # CONFIG_IOSTAT is not set
 # CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+# CONFIG_UPTIME is not set
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_FREE is not set
 # CONFIG_FUSER is not set
 # CONFIG_KILL is not set
 # CONFIG_KILLALL is not set
 # CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
 # CONFIG_PGREP is not set
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
@@ -886,7 +907,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 # CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_UPTIME is not set
 # CONFIG_WATCH is not set
 
 #
@@ -924,6 +944,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 CONFIG_ASH=y
 CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 # CONFIG_ASH_JOB_CONTROL is not set
 # CONFIG_ASH_ALIAS is not set
 # CONFIG_ASH_GETOPTS is not set
@@ -964,6 +985,7 @@ CONFIG_SH_MATH_SUPPORT=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 CONFIG_FEATURE_SH_STANDALONE=y
 # CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #
 # System Logging Utilities
@@ -972,6 +994,7 @@ CONFIG_FEATURE_SH_STANDALONE=y
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0

packages/initramfs/sysutils/plymouth-lite/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.meego.com"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="gcc-initramfs libpng-initramfs"
 PKG_BUILD_DEPENDS="toolchain libpng"
 PKG_PRIORITY="optional"

packages/lang/Python/build

@@ -114,9 +114,6 @@ make  -j1 CC="$TARGET_CC" \
       PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
       install
 
-cp -R ../Lib ./
-  $ROOT/$TOOLCHAIN/bin/python -Wi -t ./Lib/compileall.py -f -x test ./Lib
-
 # replace python-config to make sure python uses $SYSROOT_PREFIX
   mkdir -p $ROOT/$TOOLCHAIN/bin
   rm -rf $ROOT/$TOOLCHAIN/bin/python*-config

packages/lang/Python/install

@@ -35,40 +35,37 @@ mkdir -p $INSTALL/usr/lib
 mkdir -p $PYTHON_LIB_DIR/lib-dynload
   cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload
 
-  cp $PKG_BUILD/.objdir-target/Lib/*.pyc $PYTHON_LIB_DIR
+  cp $PKG_BUILD/Lib/*.py $PYTHON_LIB_DIR
-  cp $PKG_BUILD/.objdir-target/Lib/site.py $PYTHON_LIB_DIR
-  cp $PKG_BUILD/.objdir-target/Lib/doctest.py $PYTHON_LIB_DIR
-  cp $PKG_BUILD/.objdir-target/Lib/unittest.py $PYTHON_LIB_DIR
 
 mkdir -p $PYTHON_LIB_DIR/plat-linux2
-  cp $PKG_BUILD/.objdir-target/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2
+  cp $PKG_BUILD/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2
 
 mkdir -p $PYTHON_LIB_DIR/json
-  cp $PKG_BUILD/.objdir-target/Lib/json/*.pyc $PYTHON_LIB_DIR/json
+  cp $PKG_BUILD/Lib/json/*.py $PYTHON_LIB_DIR/json
 
 mkdir -p $PYTHON_LIB_DIR/xml
-  cp $PKG_BUILD/.objdir-target/Lib/xml/*.pyc $PYTHON_LIB_DIR/xml
+  cp $PKG_BUILD/Lib/xml/*.py $PYTHON_LIB_DIR/xml
 
 mkdir -p $PYTHON_LIB_DIR/xml/dom
-  cp $PKG_BUILD/.objdir-target/Lib/xml/dom/*.pyc $PYTHON_LIB_DIR/xml/dom
+  cp $PKG_BUILD/Lib/xml/dom/*.py $PYTHON_LIB_DIR/xml/dom
 
 mkdir -p $PYTHON_LIB_DIR/xml/parsers
-  cp $PKG_BUILD/.objdir-target/Lib/xml/parsers/*.pyc $PYTHON_LIB_DIR/xml/parsers
+  cp $PKG_BUILD/Lib/xml/parsers/*.py $PYTHON_LIB_DIR/xml/parsers
 
 mkdir -p $PYTHON_LIB_DIR/xml/sax
-  cp $PKG_BUILD/.objdir-target/Lib/xml/sax/*.pyc $PYTHON_LIB_DIR/xml/sax
+  cp $PKG_BUILD/Lib/xml/sax/*.py $PYTHON_LIB_DIR/xml/sax
 
 mkdir -p $PYTHON_LIB_DIR/encodings
-  cp $PKG_BUILD/.objdir-target/Lib/encodings/*.pyc $PYTHON_LIB_DIR/encodings
+  cp $PKG_BUILD/Lib/encodings/*.py $PYTHON_LIB_DIR/encodings
 
 mkdir -p $PYTHON_LIB_DIR/logging
-  cp $PKG_BUILD/.objdir-target/Lib/logging/*.pyc $PYTHON_LIB_DIR/logging
+  cp $PKG_BUILD/Lib/logging/*.py $PYTHON_LIB_DIR/logging
 
 mkdir -p $PYTHON_LIB_DIR/distutils
-  cp $PKG_BUILD/.objdir-target/Lib/distutils/*.pyc $PYTHON_LIB_DIR/distutils
+  cp $PKG_BUILD/Lib/distutils/*.py $PYTHON_LIB_DIR/distutils
 
 mkdir -p $PYTHON_LIB_DIR/distutils/command
-  cp $PKG_BUILD/.objdir-target/Lib/distutils/command/*.pyc $PYTHON_LIB_DIR/distutils/command
+  cp $PKG_BUILD/Lib/distutils/command/*.py $PYTHON_LIB_DIR/distutils/command
 
 # For future 3rd-parties Python modules
 mkdir -p $PYTHON_LIB_DIR/site-packages
@@ -76,47 +73,47 @@ mkdir -p $PYTHON_LIB_DIR/site-packages
 ### for test ###
 
 #mkdir -p $PYTHON_LIB_DIR/bsddb
-#  cp $PKG_BUILD/.objdir-target/Lib/bsddb/*.pyc $PYTHON_LIB_DIR/bsddb
+#  cp $PKG_BUILD/Lib/bsddb/*.py $PYTHON_LIB_DIR/bsddb
 
 mkdir -p $PYTHON_LIB_DIR/compiler
-  cp $PKG_BUILD/.objdir-target/Lib/compiler/*.pyc $PYTHON_LIB_DIR/compiler
+  cp $PKG_BUILD/Lib/compiler/*.py $PYTHON_LIB_DIR/compiler
 
 mkdir -p $PYTHON_LIB_DIR/ctypes
-  cp $PKG_BUILD/.objdir-target/Lib/ctypes/*.pyc $PYTHON_LIB_DIR/ctypes
+  cp $PKG_BUILD/Lib/ctypes/*.py $PYTHON_LIB_DIR/ctypes
 
 mkdir -p $PYTHON_LIB_DIR/ctypes/macholib
-  cp $PKG_BUILD/.objdir-target/Lib/ctypes/macholib/*.pyc $PYTHON_LIB_DIR/ctypes/macholib
+  cp $PKG_BUILD/Lib/ctypes/macholib/*.py $PYTHON_LIB_DIR/ctypes/macholib
 
 #mkdir -p $PYTHON_LIB_DIR/curses
-#  cp $PKG_BUILD/.objdir-target/Lib/curses/*.pyc $PYTHON_LIB_DIR/curses
+#  cp $PKG_BUILD/Lib/curses/*.py $PYTHON_LIB_DIR/curses
 
 mkdir -p $PYTHON_LIB_DIR/email
-  cp $PKG_BUILD/.objdir-target/Lib/email/*.pyc $PYTHON_LIB_DIR/email
+  cp $PKG_BUILD/Lib/email/*.py $PYTHON_LIB_DIR/email
 
 mkdir -p $PYTHON_LIB_DIR/email/mime
-  cp $PKG_BUILD/.objdir-target/Lib/email/mime/*.pyc $PYTHON_LIB_DIR/email/mime
+  cp $PKG_BUILD/Lib/email/mime/*.py $PYTHON_LIB_DIR/email/mime
 
 mkdir -p $PYTHON_LIB_DIR/hotshot
-  cp $PKG_BUILD/.objdir-target/Lib/hotshot/*.pyc $PYTHON_LIB_DIR/hotshot
+  cp $PKG_BUILD/Lib/hotshot/*.py $PYTHON_LIB_DIR/hotshot
 
 mkdir -p $PYTHON_LIB_DIR/idlelib
-  cp $PKG_BUILD/.objdir-target/Lib/idlelib/*.pyc $PYTHON_LIB_DIR/idlelib
+  cp $PKG_BUILD/Lib/idlelib/*.py $PYTHON_LIB_DIR/idlelib
 
 #mkdir -p $PYTHON_LIB_DIR/lib-tk
-#  cp $PKG_BUILD/.objdir-target/Lib/lib-tk/*.pyc $PYTHON_LIB_DIR/lib-tk
+#  cp $PKG_BUILD/Lib/lib-tk/*.py $PYTHON_LIB_DIR/lib-tk
 
 #mkdir -p $PYTHON_LIB_DIR/msilib
-#  cp $PKG_BUILD/.objdir-target/Lib/msilib/*.pyc $PYTHON_LIB_DIR/msilib
+#  cp $PKG_BUILD/Lib/msilib/*.py $PYTHON_LIB_DIR/msilib
 
 mkdir -p $PYTHON_LIB_DIR/multiprocessing
-  cp $PKG_BUILD/.objdir-target/Lib/multiprocessing/*.pyc $PYTHON_LIB_DIR/multiprocessing
+  cp $PKG_BUILD/Lib/multiprocessing/*.py $PYTHON_LIB_DIR/multiprocessing
 
 # not needed, we have pysqlite2
 mkdir -p $PYTHON_LIB_DIR/sqlite3
-  cp $PKG_BUILD/.objdir-target/Lib/sqlite3/*.pyc $PYTHON_LIB_DIR/sqlite3
+  cp $PKG_BUILD/Lib/sqlite3/*.py $PYTHON_LIB_DIR/sqlite3
 
 #mkdir -p $PYTHON_LIB_DIR/wsgiref
-#  cp $PKG_BUILD/.objdir-target/Lib/wsgiref/*.pyc $PYTHON_LIB_DIR/wsgiref
+#  cp $PKG_BUILD/Lib/wsgiref/*.py $PYTHON_LIB_DIR/wsgiref
 
 mkdir -p $PYTHON_LIB_DIR/xml/etree
-  cp $PKG_BUILD/.objdir-target/Lib/xml/etree/*.pyc $PYTHON_LIB_DIR/xml/etree
+  cp $PKG_BUILD/Lib/xml/etree/*.py $PYTHON_LIB_DIR/xml/etree

packages/linux-drivers/asix-ax887xx/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.asix.com.tw"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
 PKG_PRIORITY="optional"

packages/linux-drivers/bcm_sta/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux  busybox-hosttools"
 PKG_PRIORITY="optional"

packages/linux-firmware/dvb-firmware/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/OpenELEC/dvb-firmware"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/linux-firmware/misc-firmware/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/OpenELEC/misc-firmware"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/linux-firmware/wlan-firmware/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/linux/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.0.1"
+PKG_VERSION="3.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="busybox linux-drivers linux-firmware"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio"
 PKG_PRIORITY="optional"
@@ -42,7 +42,7 @@ fi
 
 if [ "$LINUX" = "ti-omap4" ]; then
   PKG_VERSION="2.6.38-ti-omap4"
-  PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+  PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
 
 if [ "$BOOTLOADER" = "atv-bootloader" ]; then

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch

@@ -0,0 +1,53 @@
+From f46d7a99bc2f3bc70f274422ec8d16257e2a97aa Mon Sep 17 00:00:00 2001
+From: FernetMenta <fernetmenta@online.de>
+Date: Sat, 13 Aug 2011 16:07:08 +0200
+Subject: [PATCH] ati: limit glxSwapBuffers going to far ahead
+
+---
+ xbmc/WinSystemX11GL.cpp |   23 +++++++++++++++++++++--
+ 1 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/WinSystemX11GL.cpp b/xbmc/WinSystemX11GL.cpp
+index 94f369e..870999e 100644
+--- a/xbmc/WinSystemX11GL.cpp
++++ b/xbmc/WinSystemX11GL.cpp
+@@ -43,7 +43,27 @@ CWinSystemX11GL::~CWinSystemX11GL()
+ 
+ bool CWinSystemX11GL::PresentRenderImpl(const CDirtyRegionList& dirty)
+ {
+-  if(m_iVSyncMode == 3)
++  if(m_iVSyncMode == 2)
++  {
++    static unsigned int last = 0;
++    unsigned int now;
++    if(m_glXGetVideoSyncSGI(&now) != 0)
++      CLog::Log(LOGERROR, "%s - glXGetVideoSyncSGI - Failed to get current retrace count", __FUNCTION__);
++
++    if (now == last)
++    {
++      if (m_glXWaitVideoSyncSGI(2, (last + 1) % 2, &now) != 0)
++        CLog::Log(LOGERROR, "%s - glXWaitVideoSyncSGI - Returned error", __FUNCTION__);
++      if(m_glXGetVideoSyncSGI(&now) != 0)
++        CLog::Log(LOGERROR, "%s - glXGetVideoSyncSGI - Failed to get current retrace count", __FUNCTION__);
++      last = now + 1;
++    }
++    else
++      last = now;
++
++    glXSwapBuffers(m_dpy, m_glWindow);
++  }
++  else if(m_iVSyncMode == 3)
+   {
+     glFinish();
+     unsigned int before = 0, after = 0;
+@@ -236,7 +256,6 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
+   else
+     m_glXSwapIntervalMESA = NULL;
+ 
+-
+   return true;
+ }
+ 
+-- 
+1.7.5.4
+

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch

@@ -0,0 +1,27 @@
+From dff7d824c82f957e19ad56247134912d70862188 Mon Sep 17 00:00:00 2001
+From: FernetMenta <fernetmenta@online.de>
+Date: Sun, 14 Aug 2011 11:21:32 +0200
+Subject: [PATCH] vaapi: increase number of video surface allocated
+
+---
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+index bcc3fe1..326c390 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+@@ -358,7 +358,9 @@ bool CDecoder::EnsureContext(AVCodecContext *avctx)
+     else
+       m_refs = 2;
+   }
+-  return EnsureSurfaces(avctx, m_refs + 3);
++  // number of reference + 3 renderbuffers + Holder
++  // an extra one should not harm
++  return EnsureSurfaces(avctx, m_refs + 5);
+ }
+ 
+ bool CDecoder::EnsureSurfaces(AVCodecContext *avctx, unsigned n_surfaces_count)
+-- 
+1.7.5.4
+

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch

@@ -0,0 +1,16 @@
+diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp
+--- xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp	2011-03-08 02:49:15.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp	2011-08-16 04:04:59.808482717 +0200
+@@ -381,10 +381,8 @@
+       CLog::Log(LOGDEBUG, "Python wrapper library linked with internal Python library");
+ #endif /* _LINUX */
+ #else
+-      /* PYTHONOPTIMIZE is set off intentionally when using external Python.
+-         Reason for this is because we cannot be sure what version of Python
+-         was used to compile the various Python object files (i.e. .pyo,
+-         .pyc, etc.). */
++      // Required for python to find optimized code (pyo) files
++      setenv("PYTHONOPTIMIZE", "1", 1);
+       setenv("PYTHONCASEOK", "1", 1); //This line should really be removed
+       CLog::Log(LOGDEBUG, "Python wrapper library linked with system Python library");
+ #endif /* USE_EXTERNAL_PYTHON */

packages/multimedia/crystalhd/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/crystalhd-for-osx/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="linux"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools linux"
 PKG_PRIORITY="optional"

packages/multimedia/libbluray/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/libbluray.html"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/multimedia/rtmpdump/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://rtmpdump.mplayerhq.hu/"
 #PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib openssl"
 PKG_BUILD_DEPENDS="toolchain zlib openssl"
 PKG_PRIORITY="optional"

packages/network/connman/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
 PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
 PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
 PKG_PRIORITY="optional"

packages/network/netstatus/meta

@@ -25,7 +25,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wiki.meego.com/D-Bus/Overview#D-Bus_GLib"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="dbus glib dbus-glib"
 PKG_BUILD_DEPENDS="toolchain dbus glib dbus-glib"
 PKG_PRIORITY="optional"

packages/python/web/TwistedConch/build

@@ -28,12 +28,9 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD
 
 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
+python setup.py install -O0 --no-compile --prefix /usr --root .install
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
 
-find .install -name "*.py" -exec rm -rf "{}" ";"
+rm -rf .install/usr/lib/python*/site-packages/twisted/conch/test
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/lib/python*/site-packages/twisted/names/test

packages/python/web/TwistedCore/build

@@ -28,12 +28,9 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD
 
 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
+python setup.py install -O0 --no-compile --prefix /usr --root .install
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
 
 rm -rf .install/usr/bin

packages/python/web/TwistedNames/build

@@ -28,12 +28,9 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD
 
 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
+python setup.py install -O0 --no-compile --prefix /usr --root .install
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
 
 rm -rf .install/usr/lib/python*/site-packages/twisted/names/test

packages/python/web/TwistedWeb/build

@@ -28,13 +28,9 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD
 
 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
+python setup.py install -O0 --no-compile --prefix /usr --root .install
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
 
 rm -rf .install/usr/lib/python*/site-packages/twisted/web/test
-

packages/python/web/TwistedWords/build

@@ -28,12 +28,9 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 cd $PKG_BUILD
 
 python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
+python setup.py install -O0 --no-compile --prefix /usr --root .install
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
 
 rm -rf .install/usr/lib/python*/site-packages/twisted/words/test

packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.0
+# Busybox version: 1.19.0
-# Tue Nov 23 18:28:14 2010
+# Sun Aug 14 01:31:07 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_LONG_OPTS is not set
 # CONFIG_FEATURE_DEVPTS is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 # CONFIG_FEATURE_SUID is not set
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install-hosttools"
 #
 # Busybox Library Tuning
 #
+# CONFIG_FEATURE_SYSTEMD is not set
+# CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=1
 CONFIG_FEATURE_FAST_TOP=y
@@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
@@ -106,6 +109,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_NON_POSIX_CP is not set
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
 CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_IOCTL_HEX2STR_ERROR is not set
 # CONFIG_FEATURE_HWIB is not set
@@ -169,12 +173,17 @@ CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
 # CONFIG_FEATURE_DATE_COMPAT is not set
+# CONFIG_ID is not set
+# CONFIG_GROUPS is not set
 # CONFIG_TEST is not set
 # CONFIG_FEATURE_TEST_64 is not set
+# CONFIG_TOUCH is not set
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
 # CONFIG_FEATURE_TR_EQUIV is not set
 # CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
 # CONFIG_CAL is not set
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
@@ -212,10 +221,8 @@ CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_HEAD is not set
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
-# CONFIG_ID is not set
 # CONFIG_INSTALL is not set
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
 # CONFIG_LN is not set
 # CONFIG_LOGNAME is not set
 # CONFIG_LS is not set
@@ -267,7 +274,6 @@ CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-# CONFIG_TOUCH is not set
 # CONFIG_TRUE is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
@@ -279,7 +285,6 @@ CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHO is not set
 # CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
@@ -330,20 +335,13 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 # Editors
 #
 # CONFIG_PATCH is not set
-# CONFIG_AWK is not set
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-# CONFIG_SED is not set
 # CONFIG_VI is not set
 CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
 # CONFIG_FEATURE_VI_YANKMARK is not set
 # CONFIG_FEATURE_VI_SEARCH is not set
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 # CONFIG_FEATURE_VI_USE_SIGNALS is not set
 # CONFIG_FEATURE_VI_DOT_CMD is not set
 # CONFIG_FEATURE_VI_READONLY is not set
@@ -352,6 +350,14 @@ CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_WIN_RESIZE is not set
 # CONFIG_FEATURE_VI_ASK_TERMINAL is not set
 # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+# CONFIG_SED is not set
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -410,6 +416,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
 #
 # Login/Password Management Utilities
@@ -495,6 +502,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
 # CONFIG_DMESG is not set
 # CONFIG_FEATURE_DMESG_PRETTY is not set
 # CONFIG_FBSET is not set
@@ -503,7 +511,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -590,10 +598,25 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+# CONFIG_LESS is not set
+CONFIG_FEATURE_LESS_MAXLINES=0
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -634,15 +657,6 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_LAST is not set
 # CONFIG_FEATURE_LAST_SMALL is not set
 # CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_LESS is not set
-CONFIG_FEATURE_LESS_MAXLINES=0
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -676,11 +690,17 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NBDCLIENT is not set
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
 # CONFIG_NC_110_COMPAT is not set
+# CONFIG_PING is not set
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING is not set
+# CONFIG_WHOIS is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
@@ -753,17 +773,12 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
 # CONFIG_NSLOOKUP is not set
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PING is not set
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING is not set
 # CONFIG_PSCAN is not set
 # CONFIG_ROUTE is not set
 # CONFIG_SLATTACH is not set
@@ -792,12 +807,14 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -833,15 +850,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # CONFIG_IOSTAT is not set
 # CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+# CONFIG_UPTIME is not set
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_FREE is not set
 # CONFIG_FUSER is not set
 # CONFIG_KILL is not set
 # CONFIG_KILLALL is not set
 # CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
 # CONFIG_PGREP is not set
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
@@ -862,7 +883,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 # CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_UPTIME is not set
 # CONFIG_WATCH is not set
 
 #
@@ -900,6 +920,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 # CONFIG_ASH is not set
 # CONFIG_ASH_BASH_COMPAT is not set
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 # CONFIG_ASH_JOB_CONTROL is not set
 # CONFIG_ASH_ALIAS is not set
 # CONFIG_ASH_GETOPTS is not set
@@ -940,6 +961,7 @@ CONFIG_FEATURE_BASH_IS_NONE=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #
 # System Logging Utilities
@@ -948,6 +970,7 @@ CONFIG_FEATURE_BASH_IS_NONE=y
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0

packages/sysutils/busybox/config/busybox.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.5
+# Busybox version: 1.19.0
-# Sun Aug  7 23:33:27 2011
+# Sun Aug 14 01:33:34 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install-system"
 #
 # Busybox Library Tuning
 #
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=1
 CONFIG_FEATURE_FAST_TOP=y
@@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -106,6 +109,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_MONOTONIC_SYSCALL=y
 # CONFIG_IOCTL_HEX2STR_ERROR is not set
 # CONFIG_FEATURE_HWIB is not set
@@ -169,12 +173,17 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+CONFIG_GROUPS=y
 CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
 # CONFIG_CAL is not set
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
@@ -212,10 +221,8 @@ CONFIG_FEATURE_ENV_LONG_OPTIONS=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
-CONFIG_ID=y
 CONFIG_INSTALL=y
 CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-# CONFIG_LENGTH is not set
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
 CONFIG_LS=y
@@ -267,7 +274,6 @@ CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TOUCH=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
@@ -279,7 +285,6 @@ CONFIG_USLEEP=y
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
 CONFIG_WHOAMI=y
 # CONFIG_YES is not set
 
@@ -346,20 +351,13 @@ CONFIG_WHICH=y
 # Editors
 #
 # CONFIG_PATCH is not set
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -368,6 +366,14 @@ CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -426,6 +432,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
 #
 # Login/Password Management Utilities
@@ -511,6 +518,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
 CONFIG_FBSET=y
@@ -519,7 +527,7 @@ CONFIG_FEATURE_FBSET_READMODE=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -614,10 +622,25 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -658,15 +681,6 @@ CONFIG_IONICE=y
 # CONFIG_LAST is not set
 # CONFIG_FEATURE_LAST_SMALL is not set
 # CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -700,11 +714,17 @@ CONFIG_TTYSIZE=y
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NBDCLIENT=y
 CONFIG_NC=y
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
 CONFIG_NC_110_COMPAT=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WHOIS=y
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -777,17 +797,12 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NETSTAT=y
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 CONFIG_FEATURE_NETSTAT_PRG=y
 # CONFIG_NSLOOKUP is not set
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
@@ -816,12 +831,14 @@ CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -857,15 +874,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 CONFIG_IOSTAT=y
 CONFIG_MPSTAT=y
+# CONFIG_NMETER is not set
 CONFIG_PMAP=y
 CONFIG_POWERTOP=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
 CONFIG_SMEMCAP=y
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
 # CONFIG_PGREP is not set
 CONFIG_PIDOF=y
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
@@ -886,7 +907,6 @@ CONFIG_FEATURE_TOP_DECIMALS=y
 CONFIG_FEATURE_TOP_SMP_PROCESS=y
 CONFIG_FEATURE_TOPMEM=y
 CONFIG_FEATURE_SHOW_THREADS=y
-CONFIG_UPTIME=y
 # CONFIG_WATCH is not set
 
 #
@@ -924,6 +944,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 CONFIG_ASH=y
 CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_GETOPTS=y
@@ -964,6 +985,7 @@ CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #
 # System Logging Utilities
@@ -972,6 +994,7 @@ CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=32

packages/sysutils/busybox/config/syslog.conf

@@ -0,0 +1,30 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# /etc/syslog.conf
+
+# all messages of kern and user facilities
+kern,user.*          /var/log/messages
+
+# all messages of kern facility with priorities lower than err (warn, notice ...)
+kern.!err            /var/log/critical
+
+# all messages with auth and authpriv facilities
+auth,authpriv.*      /var/log/auth

packages/sysutils/busybox/install

@@ -44,6 +44,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
 
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/profile $INSTALL/etc
+    cp $PKG_DIR/config/syslog.conf $INSTALL/etc
     cp $PKG_DIR/config/httpd.conf $INSTALL/etc
     echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT
 

packages/sysutils/busybox/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="busybox"
-PKG_VERSION="1.18.5"
+PKG_VERSION="1.19.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/busybox/profile.d/shell.conf

@@ -26,5 +26,5 @@
 PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]'
 export PS1
 
-TERM="xterm"
+TERM="linux"
 export TERM

packages/sysutils/remote/atvclient/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://github.com/Evinyatar/atvclient/wiki"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libusb-compat"
 PKG_BUILD_DEPENDS="toolchain libusb-compat"
 PKG_PRIORITY="optional"

packages/sysutils/remote/eventlircd/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/eventlircd"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="udev"
 PKG_BUILD_DEPENDS="toolchain udev"
 PKG_PRIORITY="optional"

packages/sysutils/remote/irserver/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Freeware"
 PKG_SITE="http://http://www.irtrans.de"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/sysutils/remote/xwiimote/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/dvdhrm/xwiimote"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="dbus-glib udev bluez"
 PKG_BUILD_DEPENDS="toolchain dbus-glib udev bluez"
 PKG_PRIORITY="optional"

packages/sysutils/sg3_utils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sg3_utils"
-PKG_VERSION="1.30"
+PKG_VERSION="1.32"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/timezone-data/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
 PKG_SITE="ftp://elsie.nci.nih.gov/pub/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/textproc/expat/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://expat.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/toolchain/devel/cmake/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="2.8.4"
+PKG_VERSION="2.8.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/toolchain/devel/eglibc/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.eglibc.org/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="timezone-data"
 PKG_BUILD_DEPENDS="ccache autotools linux-headers gcc-core"
 PKG_PRIORITY="optional"

packages/toolchain/devel/jam/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.perforce.com/jam/jam.html"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache"
 PKG_PRIORITY="optional"

packages/toolchain/sysutils/squashfs/meta

@@ -25,9 +25,9 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://squashfs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz"
-#PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+#PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache xz"
+PKG_BUILD_DEPENDS="ccache zlib-host xz"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/sysutils"
 PKG_SHORTDESC="squashfs-tools: A compressed read-only filesystem for Linux"

packages/tools/flashrom/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.flashrom.org"
 PKG_URL="http://download.flashrom.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="zlib pciutils"
 PKG_BUILD_DEPENDS="toolchain zlib pciutils"
 PKG_PRIORITY="optional"

packages/x11/driver/xf86-video-nouveau/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa"
 PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess udev Mesa xorg-server"
 PKG_PRIORITY="optional"

packages/x11/driver/xf86-video-omapfb/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="OSS"
 PKG_SITE="http://cgit.pingu.fi/xf86-video-omapfb"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXrender libXext libX11"
 PKG_BUILD_DEPENDS="toolchain libXrender libXext xorg-server"
 PKG_PRIORITY="optional"

projects/ATV/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

projects/Fusion/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

projects/Generic/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

projects/ION/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

projects/Intel/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

projects/Ultra/options

@@ -244,6 +244,9 @@
 # Coreboot support (yes / no)
   COREBOOT="no"
 
+# Distribution Specific source location
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
 # Addon Server Url
   ADDON_SERVER_URL="http://addons.openelec.tv"
 

scripts/image

@@ -24,19 +24,33 @@
 
 $SCRIPTS/checkdeps build
 $SCRIPTS/build toolchain
+$SCRIPTS/build squashfs
+$SCRIPTS/build fakeroot
 
 export INSTALL=$BUILD/image/system
 
-get_version
+BUILD_DATE=`date +%Y%m%d%H%M%S`
 
-rm -rf $INSTALL
+if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
-rm -rf $STAMPS_INSTALL
+  GIT_BUILD=`git log --pretty=format:'' | wc -l`
+  GIT_HASH=`git log -n1 --format=%H`
+  OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD
+fi
 
-mkdir -p $INSTALL
+TARGET_VERSION="$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION"
+IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 
 # setup fakeroot
+  rm -rf $FAKEROOT_SCRIPT   # remove $FAKEROOT_SCRIPT if it exist
+  touch $FAKEROOT_SCRIPT    # create an empty $FAKEROOT_SCRIPT
+  chmod +x $FAKEROOT_SCRIPT # make $FAKEROOT_SCRIPT executable
   echo "chown -R 0:0 $INSTALL" >> $FAKEROOT_SCRIPT
 
+# clean old install dirs
+  rm -rf $INSTALL
+  rm -rf $STAMPS_INSTALL
+  mkdir -p $INSTALL
+
 # create baselayout
   mkdir -p $INSTALL/bin
   mkdir -p $INSTALL/etc
@@ -50,7 +64,6 @@ mkdir -p $INSTALL
   mkdir -p $INSTALL/var
   mkdir -p $INSTALL/flash
   mkdir -p $INSTALL/storage
-
   ln -sf /var $INSTALL/usr/var
   ln -sf /var/tmp $INSTALL/tmp
   ln -sf /var/media $INSTALL/media
@@ -140,3 +153,89 @@ mkdir -p $INSTALL
   for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do
     $STRIP --strip-debug $MOD
   done
+
+# make target dir
+  mkdir -p $TARGET_IMG
+    rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
+    rm -rf $TARGET_IMG/$IMAGE_NAME.mach_kernel
+
+# copy kernel to target dir
+  if [ "$BOOTLOADER" = "u-boot" ]; then
+    KERNEL_IMAGE="uImage"
+  else
+    KERNEL_IMAGE="bzImage"
+  fi
+
+  if [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
+    KERNEL_ARCH="x86"
+  elif [ "$TARGET_ARCH" = arm ]; then
+    KERNEL_ARCH="arm"
+  fi
+
+  cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel
+
+  if [ "$BOOTLOADER" = "atv-bootloader" ]; then
+    cp -PR $BUILD/atv-bootloader-*/mach_kernel $TARGET_IMG/$IMAGE_NAME.mach_kernel
+    chmod 0644 $TARGET_IMG/$IMAGE_NAME.mach_kernel
+  fi
+
+# create squashfs file
+  echo "rm -rf $TARGET_IMG/$IMAGE_NAME.system" >> $FAKEROOT_SCRIPT
+#  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend -comp xz" >> $FAKEROOT_SCRIPT
+  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend" >> $FAKEROOT_SCRIPT
+
+# run fakeroot
+  $ROOT/$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
+  rm -rf $FAKEROOT_SCRIPT
+
+# set permissions
+  chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
+  chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
+
+  if [ "$1" = "release" ]; then
+
+    RELEASE_DIR="target/$IMAGE_NAME"
+
+    # cleanup
+      rm -rf $RELEASE_DIR
+
+    # create release dir
+      mkdir -p $RELEASE_DIR
+        cp $ROOT/README $RELEASE_DIR
+        cp $ROOT/CHANGELOG $RELEASE_DIR
+#      cp -R $CONFIG/image/* $RELEASE_DIR
+        cp -R $CONFIG/release/* $RELEASE_DIR
+        echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
+
+      mkdir -p $RELEASE_DIR/licenses
+        cp $ROOT/licenses/* $RELEASE_DIR/licenses
+
+      mkdir -p $RELEASE_DIR/target
+        cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
+        cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
+
+        if [ -f $TARGET_IMG/$IMAGE_NAME.mach_kernel ]; then
+          cp $TARGET_IMG/$IMAGE_NAME.mach_kernel $RELEASE_DIR/target/MACH_KERNEL
+        fi
+
+    # create md5sum's
+      ( cd $RELEASE_DIR;
+        md5sum -t target/SYSTEM > target/SYSTEM.md5;
+        md5sum -t target/KERNEL > target/KERNEL.md5;
+        if [ -f target/MACH_KERNEL ]; then
+          md5sum -t target/MACH_KERNEL > target/MACH_KERNEL.md5;
+        fi
+      )
+
+    # create target directory
+      mkdir -p $TARGET_IMG
+
+    # remove an previous created release tarball
+      rm -rf $TARGET_IMG/$IMAGE_NAME.tar.bz2
+
+    # create release tarball
+      tar cjf $TARGET_IMG/$IMAGE_NAME.tar.bz2 -C target $IMAGE_NAME
+
+    # cleanup release dir
+      rm -rf $RELEASE_DIR
+  fi

scripts/image_release

@@ -1,72 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/image_squashfs
-
-get_version
-
-RELEASE_DIR="target/$DISTRONAME-$TARGET_VERSION"
-
-# cleanup
-  rm -rf $RELEASE_DIR
-
-# create release dir
-  mkdir -p $RELEASE_DIR
-    cp $ROOT/README $RELEASE_DIR
-    cp $ROOT/CHANGELOG $RELEASE_DIR
-  #  cp -R $CONFIG/image/* $RELEASE_DIR
-    cp -R $CONFIG/release/* $RELEASE_DIR
-    echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
-
-  mkdir -p $RELEASE_DIR/licenses
-    cp $ROOT/licenses/* $RELEASE_DIR/licenses
-
-  mkdir -p $RELEASE_DIR/target
-    cp $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system $RELEASE_DIR/target/SYSTEM
-    cp $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel $RELEASE_DIR/target/KERNEL
-
-    if [ -f $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel ]; then
-      cp $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel $RELEASE_DIR/target/MACH_KERNEL
-    fi
-
-# create md5sum's
-  ( cd $RELEASE_DIR;
-    md5sum -t target/SYSTEM > target/SYSTEM.md5;
-    md5sum -t target/KERNEL > target/KERNEL.md5;
-    if [ -f target/MACH_KERNEL ]; then
-      md5sum -t target/MACH_KERNEL > target/MACH_KERNEL.md5;
-    fi
-  )
-
-# create target directory
-  mkdir -p $TARGET_IMG
-
-# remove an previous created release tarball
-  rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.tar.bz2
-
-# create release tarball
-  tar cjf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.tar.bz2 -C target $DISTRONAME-$TARGET_VERSION
-
-# cleanup release dir
-  rm -rf $RELEASE_DIR

scripts/image_squashfs

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-rm -rf $FAKEROOT_SCRIPT   # remove $FAKEROOT_SCRIPT if it exist
-touch $FAKEROOT_SCRIPT    # create an empty $FAKEROOT_SCRIPT
-chmod +x $FAKEROOT_SCRIPT # make $FAKEROOT_SCRIPT executable
-
-$SCRIPTS/image
-$SCRIPTS/build squashfs
-$SCRIPTS/build fakeroot
-
-get_version
-
-mkdir -p $TARGET_IMG
-  rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
-  rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel
-
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    KERNEL_IMAGE="uImage"
-  else
-    KERNEL_IMAGE="bzImage"
-  fi
-
-  if [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
-    KERNEL_ARCH="x86"
-  elif [ "$TARGET_ARCH" = arm ]; then
-    KERNEL_ARCH="arm"
-  fi
-
-  cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
-
-  if [ "$BOOTLOADER" = "atv-bootloader" ]; then
-    cp -PR $BUILD/atv-bootloader-*/mach_kernel $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel
-    chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel
-  fi
-
-  echo "rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system" >> $FAKEROOT_SCRIPT
-#  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system -noappend -comp xz" >> $FAKEROOT_SCRIPT
-  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system -noappend" >> $FAKEROOT_SCRIPT
-  $ROOT/$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
-  chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system
-  chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
-  rm -rf $FAKEROOT_SCRIPT