Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

2025-07-24 11:16:51 +00:00 · 2013-05-09 15:01:03 +02:00 · 2013-05-09 15:01:03 +02:00 · 1d6f6b6058
commit 1d6f6b6058
parent c19f728228 23b9dc03e1
3 changed files with 6 additions and 2 deletions
--- a/packages/security/nettle/build
+++ b/packages/security/nettle/build
@ -22,6 +22,9 @@

 . config/options $1

+# dont build parallel
+  MAKEFLAGS=-j1
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@ -798,7 +798,7 @@ CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
-# CONFIG_FEATURE_IP_TUNNEL is not set
+CONFIG_FEATURE_IP_TUNNEL=y
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
 # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
--- a/packages/sysutils/dvb-fe-tool/build
+++ b/packages/sysutils/dvb-fe-tool/build
@ -34,10 +34,11 @@ cd $PKG_BUILD
            --disable-libv4l \
            --disable-v4l-utils \
            --disable-qv4l2 \
+            --without-jpeg \
            --without-libiconv-prefix \
            --without-libintl-prefix \

-cd $CWD/$PKG_BUILD/lib
+cd $CWD/$PKG_BUILD/lib/libdvbv5
  make CFLAGS="$TARGET_CFLAGS"

 cd $CWD/$PKG_BUILD/utils/dvb