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

Conflicts: packages/mediacenter/xbmc-theme-Confluence/meta packages/mediacenter/xbmc/meta
2026-03-31 14:41:55 -07:00 · 2011-08-17 23:31:55 +02:00
parent 873df258ff 4e1f6fb62a
commit 405a997482
91 changed files with 500 additions and 374 deletions
--- a/16
+++ b/16
@@ -1,24 +1,12 @@
 BUILD_DIRS="build.*"

-all: squashfs
+all: system

 system:
 	./scripts/image

 release:
-	./scripts/image_release
-
-squashfs:
-	./scripts/image_squashfs
-
-qemu:
-	./scripts/image_qemu
-
-vmware:
-	./scripts/image_vmware
-
-addons:
-	./scripts/image_addons
+	./scripts/image release

 clean:
 	rm -rf $(BUILD_DIRS)
--- a/config/functions
+++ b/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 ] &&
--- a/config/path
+++ b/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
--- a/config/sources
+++ b/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"
--- a/packages/3rdparty/download/CouchPotato/meta
+++ b/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"
--- a/packages/3rdparty/download/SickBeard/meta
+++ b/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"
--- a/packages/addons/debugging/tools/evtest/addon
+++ b/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
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.service
+++ b/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
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/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"
--- a/packages/addons/service/softcam/oscam/meta
+++ b/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"
--- a/packages/debug/tvdump/meta
+++ b/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"
--- a/packages/devel/pcre/meta
+++ b/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"
--- a/packages/graphics/jasper/meta
+++ b/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"
--- a/packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf
+++ b/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
-# Tue May 17 21:21:08 2011
+# Busybox version: 1.19.0
+# 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
--- a/packages/initramfs/sysutils/plymouth-lite/meta
+++ b/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"
--- a/packages/lang/Python/build
+++ b/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
--- a/packages/lang/Python/install
+++ b/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/.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
+  cp $PKG_BUILD/Lib/*.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
--- a/packages/linux-drivers/asix-ax887xx/meta
+++ b/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"
--- a/packages/linux-drivers/bcm_sta/meta
+++ b/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"
--- a/packages/linux-firmware/dvb-firmware/meta
+++ b/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"
--- a/Show More
+++ b/Show More