From b2fb6913ec773d1188473f8b6fe665c417d8d7fc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 24 Jun 2011 09:20:12 +0200 Subject: [PATCH 1/5] ncurses: build with shared host libs Signed-off-by: Stephan Raue --- packages/devel/ncurses/build | 4 +++- scripts/checkdeps | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build index f7e11e11f5..d1b1c7f2a5 100755 --- a/packages/devel/ncurses/build +++ b/packages/devel/ncurses/build @@ -27,12 +27,14 @@ CWD=`pwd` setup_toolchain host cd $PKG_BUILD/ncurses-host -./configure +./configure --prefix=$ROOT/$TOOLCHAIN \ + --with-shared \ make -C include make -C progs tic cp progs/tic $ROOT/$TOOLCHAIN/bin +cp lib/*.so* $ROOT/$TOOLCHAIN/lib cd "$CWD" diff --git a/scripts/checkdeps b/scripts/checkdeps index 26fa0245f2..8f08015c9a 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -35,8 +35,8 @@ case $1 in 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_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_pkg="glibc-static libc6-dev libncurses5-dev" + files="/usr/include/stdio.h /usr/include/ncurses.h" + files_pkg="libc6-dev libncurses5-dev" ;; qemu) if [ ! `which qemu` ]; then From 8c6f1486e917a5b81092f3c4122f6ac451cb48bb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 24 Jun 2011 09:28:16 +0200 Subject: [PATCH 2/5] Python: search 64bit host libdir for libraries too Signed-off-by: Stephan Raue --- packages/lang/Python/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index bd93bba952..8262b4f9e4 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -40,10 +40,10 @@ LDFLAGS="$LDFLAGS -lexpat" \ --enable-unicode=ucs4 \ 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" \ - PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \ + PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64" \ install # symlink python binary to python2 (needed for Mesa) From f8d7a78bb139a53d1663533b6b8177e122e7c254 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Jun 2011 06:14:50 +0200 Subject: [PATCH 3/5] projects/*/linux: add brcmsmac wlan driver which replaces bcm_sta wlan driver Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 5 +++-- projects/ATV/options | 5 ++--- projects/Fusion/linux/linux.i386.conf | 5 +++-- projects/Fusion/options | 5 ++--- projects/Generic/linux/linux.i386.conf | 5 +++-- projects/Generic/options | 5 ++--- projects/ION/linux/linux.i386.conf | 5 +++-- projects/ION/linux/linux.x86_64.conf | 5 +++-- projects/ION/options | 5 ++--- projects/Intel/linux/linux.i386.conf | 5 +++-- projects/Intel/linux/linux.x86_64.conf | 5 +++-- projects/Intel/options | 5 ++--- 12 files changed, 31 insertions(+), 29 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index a88d00ce61..bc873d465a 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -2240,8 +2240,9 @@ CONFIG_STAGING=y # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set # CONFIG_R8187SE is not set diff --git a/projects/ATV/options b/projects/ATV/options index 14db1d873d..5149a071ad 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -118,10 +118,9 @@ # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver -# bcm_sta: Broadcom STA WLAN Driver # Space separated list is supported, -# e.g. ADDITIONAL_DRIVERS="bcm_sta" - ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" +# e.g. ADDITIONAL_DRIVERS="asix-ax887xx" + ADDITIONAL_DRIVERS="asix-ax887xx" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index f09f64f67c..9c1de32dab 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -2429,8 +2429,9 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/Fusion/options b/projects/Fusion/options index ea719b6809..8f44ded899 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -118,10 +118,9 @@ # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver -# bcm_sta: Broadcom STA WLAN Driver # Space separated list is supported, -# e.g. ADDITIONAL_DRIVERS="bcm_sta" - ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" +# e.g. ADDITIONAL_DRIVERS="asix-ax887xx" + ADDITIONAL_DRIVERS="asix-ax887xx" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index c374106a47..e0b84a14e8 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -2670,9 +2670,10 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/Generic/options b/projects/Generic/options index c961983dc0..5e5282e2e0 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -118,10 +118,9 @@ # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver -# bcm_sta: Broadcom STA WLAN Driver # Space separated list is supported, -# e.g. ADDITIONAL_DRIVERS="bcm_sta" - ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" +# e.g. ADDITIONAL_DRIVERS="asix-ax887xx" + ADDITIONAL_DRIVERS="asix-ax887xx" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index d92ea24e55..7ee7228cb3 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -2515,9 +2515,10 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index e68ad9da27..d80aed23f1 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2451,9 +2451,10 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/ION/options b/projects/ION/options index 236973f6ed..7531b2cff0 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -118,10 +118,9 @@ # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver -# bcm_sta: Broadcom STA WLAN Driver # Space separated list is supported, -# e.g. ADDITIONAL_DRIVERS="bcm_sta" - ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" +# e.g. ADDITIONAL_DRIVERS="asix-ax887xx" + ADDITIONAL_DRIVERS="asix-ax887xx" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index af958c346a..e07fd8e669 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -2562,9 +2562,10 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 6dd8466743..8a024e8bbe 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2503,9 +2503,10 @@ CONFIG_DVB_CXD2099=m # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set -# CONFIG_BRCMSMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set CONFIG_R8187SE=m diff --git a/projects/Intel/options b/projects/Intel/options index 63219ad8c7..6308bbd19a 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -118,10 +118,9 @@ # additional drivers to install: # asix-ax887xx: Asix AX887xx USB LAN Driver -# bcm_sta: Broadcom STA WLAN Driver # Space separated list is supported, -# e.g. ADDITIONAL_DRIVERS="bcm_sta" - ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" +# e.g. ADDITIONAL_DRIVERS="asix-ax887xx" + ADDITIONAL_DRIVERS="asix-ax887xx" # build with network support (yes / no) NETWORK="yes" From db8016ebb03b95618a4ac060e0353e515b0a05f4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Jun 2011 06:33:20 +0200 Subject: [PATCH 4/5] wlan-firmware: update to wlan-firmware-0.0.4 Signed-off-by: Stephan Raue --- packages/linux-firmware/wlan-firmware/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta index 07fd705750..2d624d1725 100644 --- a/packages/linux-firmware/wlan-firmware/meta +++ b/packages/linux-firmware/wlan-firmware/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="wlan-firmware" -PKG_VERSION="0.0.3" +PKG_VERSION="0.0.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" From 64abe6980428c01d6faa2f298232a6516303fa39 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Jun 2011 13:56:43 +0200 Subject: [PATCH 5/5] curl: update to curl-7.21.7 Signed-off-by: Stephan Raue --- packages/web/curl/meta | 2 +- ...ns_multi.patch => curl-7.21.7-0108-threaded_dns_multi.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/web/curl/patches/{curl-7.21.6-0108-threaded_dns_multi.patch => curl-7.21.7-0108-threaded_dns_multi.patch} (100%) diff --git a/packages/web/curl/meta b/packages/web/curl/meta index f5b1061246..ffc7676ca4 100644 --- a/packages/web/curl/meta +++ b/packages/web/curl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="curl" -PKG_VERSION="7.21.6" +PKG_VERSION="7.21.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/web/curl/patches/curl-7.21.6-0108-threaded_dns_multi.patch b/packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch similarity index 100% rename from packages/web/curl/patches/curl-7.21.6-0108-threaded_dns_multi.patch rename to packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch