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

This commit is contained in:
Stephan Raue 2011-06-25 14:09:05 +02:00
commit a9d2c2aa3a
18 changed files with 40 additions and 36 deletions

View File

@ -27,12 +27,14 @@ CWD=`pwd`
setup_toolchain host setup_toolchain host
cd $PKG_BUILD/ncurses-host cd $PKG_BUILD/ncurses-host
./configure ./configure --prefix=$ROOT/$TOOLCHAIN \
--with-shared \
make -C include make -C include
make -C progs tic make -C progs tic
cp progs/tic $ROOT/$TOOLCHAIN/bin cp progs/tic $ROOT/$TOOLCHAIN/bin
cp lib/*.so* $ROOT/$TOOLCHAIN/lib
cd "$CWD" cd "$CWD"

View File

@ -40,10 +40,10 @@ LDFLAGS="$LDFLAGS -lexpat" \
--enable-unicode=ucs4 \ --enable-unicode=ucs4 \
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \ make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64"
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \ make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \ PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64" \
install install
# symlink python binary to python2 (needed for Mesa) # symlink python binary to python2 (needed for Mesa)

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="wlan-firmware" PKG_NAME="wlan-firmware"
PKG_VERSION="0.0.3" PKG_VERSION="0.0.4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="Free-to-use" PKG_LICENSE="Free-to-use"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="curl" PKG_NAME="curl"
PKG_VERSION="7.21.6" PKG_VERSION="7.21.7"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="MIT" PKG_LICENSE="MIT"

View File

@ -2244,8 +2244,9 @@ CONFIG_STAGING=y
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
# CONFIG_R8187SE is not set # CONFIG_R8187SE is not set

View File

@ -118,10 +118,9 @@
# additional drivers to install: # additional drivers to install:
# asix-ax887xx: Asix AX887xx USB LAN Driver # asix-ax887xx: Asix AX887xx USB LAN Driver
# bcm_sta: Broadcom STA WLAN Driver
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="bcm_sta" # e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" ADDITIONAL_DRIVERS="asix-ax887xx"
# build with network support (yes / no) # build with network support (yes / no)
NETWORK="yes" NETWORK="yes"

View File

@ -2429,8 +2429,9 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -118,10 +118,9 @@
# additional drivers to install: # additional drivers to install:
# asix-ax887xx: Asix AX887xx USB LAN Driver # asix-ax887xx: Asix AX887xx USB LAN Driver
# bcm_sta: Broadcom STA WLAN Driver
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="bcm_sta" # e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" ADDITIONAL_DRIVERS="asix-ax887xx"
# build with network support (yes / no) # build with network support (yes / no)
NETWORK="yes" NETWORK="yes"

View File

@ -2674,9 +2674,10 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -118,10 +118,9 @@
# additional drivers to install: # additional drivers to install:
# asix-ax887xx: Asix AX887xx USB LAN Driver # asix-ax887xx: Asix AX887xx USB LAN Driver
# bcm_sta: Broadcom STA WLAN Driver
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="bcm_sta" # e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" ADDITIONAL_DRIVERS="asix-ax887xx"
# build with network support (yes / no) # build with network support (yes / no)
NETWORK="yes" NETWORK="yes"

View File

@ -2519,9 +2519,10 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -2455,9 +2455,10 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -118,10 +118,9 @@
# additional drivers to install: # additional drivers to install:
# asix-ax887xx: Asix AX887xx USB LAN Driver # asix-ax887xx: Asix AX887xx USB LAN Driver
# bcm_sta: Broadcom STA WLAN Driver
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="bcm_sta" # e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" ADDITIONAL_DRIVERS="asix-ax887xx"
# build with network support (yes / no) # build with network support (yes / no)
NETWORK="yes" NETWORK="yes"

View File

@ -2566,9 +2566,10 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -2507,9 +2507,10 @@ CONFIG_DVB_CXD2099=m
# CONFIG_W35UND is not set # CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set # CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set # CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set # CONFIG_BRCMFMAC is not set
# CONFIG_BRCMDBG is not set
# CONFIG_COMEDI is not set # CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set # CONFIG_ASUS_OLED is not set
CONFIG_R8187SE=m CONFIG_R8187SE=m

View File

@ -118,10 +118,9 @@
# additional drivers to install: # additional drivers to install:
# asix-ax887xx: Asix AX887xx USB LAN Driver # asix-ax887xx: Asix AX887xx USB LAN Driver
# bcm_sta: Broadcom STA WLAN Driver
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="bcm_sta" # e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" ADDITIONAL_DRIVERS="asix-ax887xx"
# build with network support (yes / no) # build with network support (yes / no)
NETWORK="yes" NETWORK="yes"

View File

@ -35,8 +35,8 @@ case $1 in
build) build)
deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt" deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext" deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h" files="/usr/include/stdio.h /usr/include/ncurses.h"
files_pkg="glibc-static libc6-dev libncurses5-dev" files_pkg="libc6-dev libncurses5-dev"
;; ;;
qemu) qemu)
if [ ! `which qemu` ]; then if [ ! `which qemu` ]; then