summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-14 00:38:41 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-14 00:38:41 +0100
commita03e16ce46353740a2b778beda4dda03c0252e07 (patch)
treea13c0f4d285a03a2e5a3ddc42ac718b23bc30a80
parent42675af37cb5ce735452311734cc5b88a66d6d9d (diff)
parent58f2ba6405c8b0390995af535592c94eb38e013c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--TODO4
-rw-r--r--mk/build.mk4
-rw-r--r--mk/modules.mk8
-rw-r--r--mk/vars.mk2
-rw-r--r--package/Config.in14
-rw-r--r--package/aufs2-util/Makefile4
-rw-r--r--package/base-files/src/etc/init.d/boot2
-rwxr-xr-xpackage/base-files/src/etc/network/if-post-down.d/03-wireless21
-rwxr-xr-xpackage/base-files/src/etc/network/if-pre-up.d/04-wireless107
-rw-r--r--package/bzr/Makefile36
-rw-r--r--package/cvs/Makefile32
-rw-r--r--package/git/Makefile2
-rw-r--r--package/hostapd/files/hostapd.conf15
-rw-r--r--package/iw/Makefile6
-rw-r--r--package/p54-firmware/Makefile30
-rw-r--r--package/python2/Makefile54
-rw-r--r--package/python2/patches/patch-Makefile_pre_in149
-rw-r--r--package/python2/patches/patch-configure241
-rw-r--r--package/rt61-firmware/Makefile (renamed from package/wireless-firmware/Makefile)8
-rw-r--r--package/subversion/Makefile6
-rw-r--r--package/tcsh/Makefile27
-rw-r--r--package/tcsh/patches/patch-Makefile_in12
-rw-r--r--package/tcsh/patches/patch-config_linux10
-rw-r--r--package/wpa_supplicant/Makefile6
-rw-r--r--package/wpa_supplicant/files/config10
-rw-r--r--scripts/ipkg-build2
-rw-r--r--target/Config.in1
-rw-r--r--target/linux/config/Config.in.netdevice36
28 files changed, 786 insertions, 63 deletions
diff --git a/TODO b/TODO
index 301eb094d..da81b814a 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
-- implement update for MTD devices (rb532,ag241)
-- network scripts for wireless client and acess point
-- add tcsh and describe new package creation procedure in wiki
+- implement update for MTD devices (ag241)
- add toolchain only support for generic toolchains (mips/ppc/..)
- fix watchdog for alix1c (mfgpt timers problem)
- netbsd build
diff --git a/mk/build.mk b/mk/build.mk
index 5b011a2c5..2c9230397 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -272,7 +272,7 @@ ifneq (,$(filter CYGWIN%,${OStype}))
endif
@if [ ! -z "$(TARGET)" ];then \
grep "^config" target/Config.in \
- |grep -i "$(TARGET)" \
+ |grep -i "$(TARGET)"\$$ \
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/.defconfig; \
for symbol in ${DEFCONFIG}; do \
@@ -337,7 +337,7 @@ ifneq (,$(filter CYGWIN%,${OStype}))
endif
@if [ ! -z "$(TARGET)" ];then \
grep "^config" target/Config.in \
- |grep -i "$(TARGET)" \
+ |grep -i "$(TARGET)"\$$ \
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/all.config; \
for symbol in ${DEFCONFIG}; do \
diff --git a/mk/modules.mk b/mk/modules.mk
index 9d17ed46c..5ba6ab1e6 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -66,6 +66,14 @@ $(eval $(call KMOD_template,ATH5K,ath5k,\
$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \
,20, kmod-led-class))
+$(eval $(call KMOD_template,P54_COMMON,p54-common,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \
+,68))
+
+$(eval $(call KMOD_template,P54_USB,p54-usb,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \
+,70))
+
$(eval $(call KMOD_template,RT2X00,rt2x00,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
diff --git a/mk/vars.mk b/mk/vars.mk
index 3180ed949..3a6591925 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -112,6 +112,8 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \
bzip2 -dc $$file | tar -xf - ;; \
*.zip) \
unzip -qd ${WRKDIR} $$file ;; \
+ *.arm) \
+ cp $$file ${WRKDIR} ;; \
*) \
echo "Cannot extract '$$file'" >&2; \
false ;; \
diff --git a/package/Config.in b/package/Config.in
index a6229461e..54247a83a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -133,6 +133,7 @@ endmenu
menu "Shells"
source "package/bash/Config.in"
source "package/mksh/Config.in"
+source "package/tcsh/Config.in"
source "package/zsh/Config.in"
endmenu
@@ -445,7 +446,6 @@ menu "Networking Misc"
source "package/cups/Config.in"
source "package/fakeidentd/Config.in"
source "package/gkrellmd/Config.in"
-source "package/git/Config.in"
source "package/net-snmp/Config.in"
# intentionally inserted here, as it depends on the above
source "package/iptables-snmp/Config.in"
@@ -461,7 +461,6 @@ source "package/rrs/Config.in"
source "package/rsync/Config.in"
source "package/shat/Config.in"
source "package/socat/Config.in"
-source "package/subversion/Config.in"
source "package/udp-broadcast-relay/Config.in"
source "package/vgp/Config.in"
source "package/vnstat/Config.in"
@@ -534,6 +533,7 @@ source "package/microperl/Config.in"
source "package/perl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
+source "package/python2/Config.in"
source "package/ruby/Config.in"
source "package/tcl/Config.in"
endmenu
@@ -560,6 +560,13 @@ source "package/tinc/Config.in"
source "package/vpnc/Config.in"
endmenu
+menu "SCM"
+#source "package/bzr/Config.in"
+source "package/cvs/Config.in"
+source "package/git/Config.in"
+source "package/subversion/Config.in"
+endmenu
+
menu "Wireless"
source "package/aircrack-ng/Config.in"
source "package/chillispot/Config.in"
@@ -567,8 +574,9 @@ source "package/hostapd/Config.in"
source "package/iw/Config.in"
#source "package/kismet/Config.in"
source "package/olsrd/Config.in"
+source "package/p54-firmware/Config.in"
+source "package/rt61-firmware/Config.in"
source "package/wifidog/Config.in"
-source "package/wireless-firmware/Config.in"
source "package/wpa_supplicant/Config.in"
endmenu
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 2534a47af..c414a1ca2 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -20,10 +20,6 @@ $(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
CONFIG_STYLE:= manual
MAKE_FLAGS+= KDIR=${LINUX_DIR}
-do-extract:
- mkdir -p ${WRKBUILD}
- ${CP} ./src/* ${WRKBUILD}/
-
post-install:
$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin
$(INSTALL_BIN) ${WRKINST}/sbin/{u,}mount.aufs \
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index f71e46240..2ef6538e0 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -24,4 +24,6 @@ for f in /etc/modules.d/*; do
[[ -e $f ]] && load_modules /etc/modules.d/*
break
done
+# settle down, after module load
+sleep 2
exit 0
diff --git a/package/base-files/src/etc/network/if-post-down.d/03-wireless b/package/base-files/src/etc/network/if-post-down.d/03-wireless
new file mode 100755
index 000000000..86e0c73e1
--- /dev/null
+++ b/package/base-files/src/etc/network/if-post-down.d/03-wireless
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
+
+case "$IF_WIRELESS_MODE" in
+ ap)
+ logger -t hostap "Killing hostapd"
+ pkill hostapd
+ ;;
+ sta)
+ [ "$IF_WIRELESS_SECURITY" != "none" ] && {
+ logger -t wireless "Killing wpa_supplicant"
+ pkill wpa_supplicant
+ }
+ ;;
+ *)
+ exit 0
+ ;;
+esac
+exit 0
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
new file mode 100755
index 000000000..bc498e163
--- /dev/null
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -0,0 +1,107 @@
+#!/bin/sh
+#set -x
+set -e
+
+[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
+
+[ "$IF_WIRELESS_SSID" ] || exit 1
+[ "$IF_WIRELESS_CHANNEL" ] || exit 1
+[ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g
+
+wpa=0
+wpa1=0
+wpa2=0
+
+case "$IF_WIRELESS_SECURITY" in
+ none)
+ sec=1
+ ;;
+ wep)
+ sec=2
+ ;;
+ wpa)
+ sec=1
+ wpa1=1
+ ;;
+ wpa2)
+ sec=1
+ wpa2=1
+ ;;
+ wpa+wpa2)
+ sec=1
+ wpa=1
+ ;;
+ *)
+ sec=1
+ ;;
+esac
+
+case "$IF_WIRELESS_MODE" in
+ ap)
+ [ -x /usr/sbin/hostapd ] || {
+ logger -t hostap "No hostapd program found"
+ exit 1
+ }
+ logger -t hostap "Creating hostapd configuration"
+ cat /etc/hostapd.conf > /tmp/hostapd.conf
+ chmod 600 /tmp/hostapd.conf
+ echo "interface=${IFACE}" >> /tmp/hostapd.conf
+ echo "ssid=$IF_WIRELESS_SSID" >> /tmp/hostapd.conf
+ echo "channel=$IF_WIRELESS_CHANNEL" >> /tmp/hostapd.conf
+ echo "hw_mode=$IF_WIRELESS_HWMODE" >> /tmp/hostapd.conf
+ echo "auth_algs=$sec" >> /tmp/hostapd.conf
+ [ $wpa1 -eq 1 ] && {
+ logger -t hostap "using WPA for security"
+ echo "wpa=1" >> /tmp/hostapd.conf
+ echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+ echo "wpa_pairwise=TKIP" >> /tmp/hostapd.conf
+ echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+ }
+ [ $wpa2 -eq 1 ] && {
+ logger -t hostap "using WPA2 for security"
+ echo "wpa=2" >> /tmp/hostapd.conf
+ echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+ echo "rsn_pairwise=CCMP" >> /tmp/hostapd.conf
+ echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+ }
+ [ $wpa -eq 1 ] && {
+ logger -t hostap "using WPA and WPA2 for security"
+ echo "wpa=3" >> /tmp/hostapd.conf
+ echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+ echo "wpa_pairwise=TKIP" >> /tmp/hostapd.conf
+ echo "rsn_pairwise=CCMP" >> /tmp/hostapd.conf
+ echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+ }
+ logger -t hostap "Starting hostapd"
+ hostapd -B /tmp/hostapd.conf
+ ;;
+ sta)
+ [ -x /usr/sbin/iw ] || {
+ logger -t wireless "No iw utility found"
+ exit 1
+ }
+ ip link set up dev ${IFACE}
+ iw dev ${IFACE} set channel $IF_WIRELESS_CHANNEL
+ iw dev ${IFACE} connect $IF_WIRELESS_SSID
+ [ $wpa2 -eq 1 ] && {
+ [ -x /usr/sbin/wpa_supplicant ] || {
+ logger -t wireless "No wpa_supplicant found"
+ exit 1
+ }
+ touch /tmp/wpa_supplicant.conf
+ chmod 600 /tmp/wpa_supplicant.conf
+ echo "network={" > /tmp/wpa_supplicant.conf
+ echo " ssid=\"$IF_WIRELESS_SSID\"" >> /tmp/wpa_supplicant.conf
+ echo " psk=\"$IF_WIRELESS_PASSPHRASE\"" >> /tmp/wpa_supplicant.conf
+ echo " priority=5" >> /tmp/wpa_supplicant.conf
+ echo "}" >> /tmp/wpa_supplicant.conf
+ wpa_supplicant -B -Dnl80211 -i${IFACE} -c/tmp/wpa_supplicant.conf
+ }
+ ;;
+ *)
+ echo "Unknown operation mode $IF_WIRELESS_MODE given!"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
new file mode 100644
index 000000000..d67497c22
--- /dev/null
+++ b/package/bzr/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= bzr
+PKG_VERSION:= 2.0.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 0b253f59601ebc9ee5975c612fc65f43
+PKG_DESCR:= bazaar
+PKG_SECTION:= scm
+PKG_DEPENDS:= python2
+PKG_BUILDDEP+= python2
+PKG_URL:= http://bazaar.canonical.com/en/
+PKG_SITES:= http://launchpad.net/bzr/2.0/${PKG_VERSION}/+download/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,BZR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+PYTHON_VERSION=2.6
+PYTHON_DIR:=$(STAGING_DIR)/usr
+PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
+PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
+PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
+PYTHON:=python$(PYTHON_VERSION)
+PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
+
+CONFIG_STYLE:= manual
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_BZR)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/bzr \
+ $(IDIR_BZR)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cvs/Makefile b/package/cvs/Makefile
new file mode 100644
index 000000000..c35193271
--- /dev/null
+++ b/package/cvs/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= cvs
+PKG_VERSION:= 1.11.23
+PKG_RELEASE:= 1
+PKG_MD5SUM:= bf185eb51b5918330a04671c3f3cccde
+PKG_DESCR:= concurrent version system
+PKG_SECTION:= scm
+PKG_URL:= http://www.nongnu.org/cvs/
+PKG_SITES:= http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CVS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+#CONFIG_STYLE:= manual
+# use following to add ./configure options
+#CONFIGURE_ARGS+= --disable-foo
+# overwrite any configure variables
+#CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
+#BUILD_STYLE:= manual
+#INSTALL_STYLE:= manual
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_CVS)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/cvs \
+ $(IDIR_CVS)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/Makefile b/package/git/Makefile
index 3179be113..4d3b382e3 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 08af805fd59f68d9ad00a2f878cf820e
PKG_DESCR:= fast version control system
-PKG_SECTION:= misc
+PKG_SECTION:= scm
PKG_DEPENDS:= libopenssl libcurl libexpat
PKG_BUILDDEP+= openssl curl expat
PKG_URL:= http://git-scm.com
diff --git a/package/hostapd/files/hostapd.conf b/package/hostapd/files/hostapd.conf
index 8676e96a6..94bd1f2bc 100644
--- a/package/hostapd/files/hostapd.conf
+++ b/package/hostapd/files/hostapd.conf
@@ -1,6 +1,4 @@
##### hostapd configuration file #####
-interface=wlan0
-#bridge=br0
driver=nl80211
logger_syslog=-1
logger_syslog_level=0
@@ -8,16 +6,3 @@ logger_stdout=-1
logger_stdout_level=0
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
-# set ssid, channel and mode
-ssid=openadk
-hw_mode=g
-channel=1
-# enable WPA2 (WEP/WPA disabled)
-macaddr_acl=0
-auth_algs=1
-ignore_broadcast_ssid=0
-wpa=2
-wpa_passphrase=secret123
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP
-rsn_pairwise=CCMP
diff --git a/package/iw/Makefile b/package/iw/Makefile
index d2ea171a6..4d55ffd28 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= iw
-PKG_VERSION:= 0.9.18
+PKG_VERSION:= 0.9.19
PKG_RELEASE:= 1
-PKG_MD5SUM:= 9734080d8a5c4b768c5e0da665a48950
+PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42
PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211)
PKG_SECTION:= net
PKG_DEPENDS:= libnl
@@ -22,8 +22,6 @@ $(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DE
CONFIG_STYLE:= manual
-XAKE_FLAGS:= V=1
-
post-install:
${INSTALL_DIR} ${IDIR_IW}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/iw ${IDIR_IW}/usr/sbin
diff --git a/package/p54-firmware/Makefile b/package/p54-firmware/Makefile
new file mode 100644
index 000000000..b845174a6
--- /dev/null
+++ b/package/p54-firmware/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= p54-firmware
+PKG_VERSION:= 1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 8e8ab005a4f8f0123bcdc51bc25b47f6
+PKG_DESCR:= firmware for USB prism54 wireless cards (isl3887)
+PKG_SECTION:= sys
+PKG_SITES:= http://daemonizer.de/prism54/prism54-fw/fw-usb/
+
+DISTFILES:= 2.13.24.0.lm87.arm
+WRKDIST= ${WRKDIR}
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,P54_FIRMWARE,p54-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+do-install:
+ ${INSTALL_DIR} ${IDIR_P54_FIRMWARE}/lib/firmware
+ ${CP} ${WRKBUILD}/*.arm \
+ ${IDIR_P54_FIRMWARE}/lib/firmware/isl3887usb
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python2/Makefile b/package/python2/Makefile
new file mode 100644
index 000000000..56aaa9062
--- /dev/null
+++ b/package/python2/Makefile
@@ -0,0 +1,54 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= python2
+PKG_VERSION:= 2.6.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 17dcac33e4f3adb69a57c2607b6de246
+PKG_DESCR:= Python scripting language (Version 2)
+PKG_SECTION:= lang
+PKG_URL:= http://www.python.org
+PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/
+
+DISTFILES= Python-${PKG_VERSION}.tgz
+WRKDIST= ${WRKDIR}/Python-${PKG_VERSION}
+
+DISMOD:= readline _curses _curses_panel _tkinter nis
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \
+ HOSTPYTHON=./hostpython \
+ HOSTPGEN=./Parser/hostpgen \
+ PYTHON_DISABLE_MODULES="$(DISMOD)"
+CONFIGURE_ENV+= OPT="$(TARGET_CFLAGS)"
+CONFIGURE_ARGS:= --with-threads \
+ --with-system-ffi \
+ --without-cxx-main
+
+pre-configure:
+ (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
+ OPT="$(HOSTCFLAGS)" \
+ ./configure --without-cxx-main --without-threads \
+ --prefix=$(STAGING_TOOLS) \
+ );
+ $(MAKE) -C ${WRKBUILD} python Parser/pgen
+ ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen
+ ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython
+ ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen
+ ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython
+ $(MAKE) -C ${WRKBUILD} distclean
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib
+ ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.6
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/python ${IDIR_PYTHON2}/usr/bin
+ ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON2}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/python2.6/* ${IDIR_PYTHON2}/usr/lib/python2.6
+ -find ${IDIR_PYTHON2} -name \*.pyo -exec rm {} \;
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
new file mode 100644
index 000000000..871776980
--- /dev/null
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -0,0 +1,149 @@
+--- Python-2.6.4.orig/Makefile.pre.in 2009-09-24 21:22:45.000000000 +0200
++++ Python-2.6.4/Makefile.pre.in 2010-02-13 16:08:55.000000000 +0100
+@@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
+
+ PYTHON= python$(EXE)
+ BUILDPYTHON= python$(BUILDEXE)
++HOSTPYTHON?= $(BUILDPYTHON)
+
+ # The task to run while instrument when building the profile-opt target
+ PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
+@@ -205,6 +206,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
+ ##########################################################################
+ # Parser
+ PGEN= Parser/pgen$(EXE)
++HOSTPGEN?= $(PGEN)$(EXE)
+
+ POBJS= \
+ Parser/acceler.o \
+@@ -370,7 +372,7 @@ build_all_generate_profile:
+ $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
+
+ run_profile_task:
+- ./$(BUILDPYTHON) $(PROFILE_TASK)
++ $(HOSTPYTHON) $(PROFILE_TASK)
+
+ build_all_use_profile:
+ $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
+@@ -388,14 +390,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+
+ platform: $(BUILDPYTHON)
+- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
++ $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+
+
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ @case $$MAKEFLAGS in \
+- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
+ # Build static library
+@@ -517,7 +519,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
+
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+ -@$(INSTALL) -d Include
+- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+
+ $(PGEN): $(PGENOBJS)
+ $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -676,7 +678,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
+
+ TESTOPTS= -l $(EXTRATESTOPTS)
+ TESTPROG= $(srcdir)/Lib/test/regrtest.py
+-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt
++TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -E -tt
+ test: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
+@@ -699,7 +701,7 @@ testuniversal: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+ $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+- $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
++ $(RUNSHARED) /usr/libexec/oah/translate $(HOSTPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
+
+
+ # Like testall, but with a single pass only
+@@ -886,24 +888,24 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+ done; \
+ done
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
++ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+
+ # Create the PLATDIR source directory, if one wasn't distributed..
+ $(srcdir)/Lib/$(PLATDIR):
+@@ -1001,7 +1003,7 @@ libainstall: all
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall:
+- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --install-platlib=$(DESTSHARED) \
+@@ -1039,7 +1041,7 @@ frameworkinstallstructure: $(LDLIBRARY)
+ fi; \
+ done
+ $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
+- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
++ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
+ $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
+ $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
+ $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
+@@ -1081,7 +1083,7 @@ frameworkinstallextras:
+ # This installs a few of the useful scripts in Tools/scripts
+ scriptsinstall:
+ SRCDIR=$(srcdir) $(RUNSHARED) \
+- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --root=/$(DESTDIR)
+@@ -1103,7 +1105,7 @@ config.status: $(srcdir)/configure
+
+ # Run reindent on the library
+ reindent:
+- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
+
+ # Rerun configure with the same options as it was run last time,
+ # provided the config.status script exists
+@@ -1200,7 +1202,7 @@ funny:
+
+ # Perform some verification checks on any modified files.
+ patchcheck:
+- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
++ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+
+ # Dependencies
+
diff --git a/package/python2/patches/patch-configure b/package/python2/patches/patch-configure
new file mode 100644
index 000000000..81391cece
--- /dev/null
+++ b/package/python2/patches/patch-configure
@@ -0,0 +1,241 @@
+--- Python-2.6.4.orig/configure 2009-09-29 15:01:59.000000000 +0200
++++ Python-2.6.4/configure 2010-02-13 15:45:15.000000000 +0100
+@@ -17191,142 +17191,6 @@ fi
+ fi
+
+
+-# On Tru64, chflags seems to be present, but calling it will
+-# exit Python
+-{ echo "$as_me:$LINENO: checking for chflags" >&5
+-echo $ECHO_N "checking for chflags... $ECHO_C" >&6; }
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <sys/stat.h>
+-#include <unistd.h>
+-int main(int argc, char*argv[])
+-{
+- if(chflags(argv[0], 0) != 0)
+- return 1;
+- return 0;
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CHFLAGS 1
+-_ACEOF
+-
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-
+-{ echo "$as_me:$LINENO: checking for lchflags" >&5
+-echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; }
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <sys/stat.h>
+-#include <unistd.h>
+-int main(int argc, char*argv[])
+-{
+- if(lchflags(argv[0], 0) != 0)
+- return 1;
+- return 0;
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LCHFLAGS 1
+-_ACEOF
+-
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+
+
+ case $ac_sys_system/$ac_sys_release in
+@@ -24749,95 +24613,6 @@ else
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+-{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5
+-echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; }
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-#include <stddef.h>
+-#include <string.h>
+-
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-
+-#ifdef HAVE_SSIZE_T
+-typedef ssize_t Py_ssize_t;
+-#elif SIZEOF_VOID_P == SIZEOF_LONG
+-typedef long Py_ssize_t;
+-#else
+-typedef int Py_ssize_t;
+-#endif
+-
+-int main()
+-{
+- char buffer[256];
+-
+- if(sprintf(buffer, "%zd", (size_t)123) < 0)
+- return 1;
+-
+- if (strcmp(buffer, "123"))
+- return 1;
+-
+- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
+- return 1;
+-
+- if (strcmp(buffer, "-123"))
+- return 1;
+-
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define PY_FORMAT_SIZE_T "z"
+-_ACEOF
+-
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+
+
+ { echo "$as_me:$LINENO: checking for socklen_t" >&5
diff --git a/package/wireless-firmware/Makefile b/package/rt61-firmware/Makefile
index 25de67aff..650dd9f30 100644
--- a/package/wireless-firmware/Makefile
+++ b/package/rt61-firmware/Makefile
@@ -3,7 +3,7 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= wireless-firmware
+PKG_NAME:= rt61-firmware
PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= d4c690c93b470bc9a681297c2adc6281
@@ -16,15 +16,15 @@ WRKDIST= ${WRKDIR}/RT61_Firmware_V1.2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RT61_FIRMWARE,rt61-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
- ${INSTALL_DIR} ${IDIR_WIRELESS_FIRMWARE_RT61}/lib/firmware
+ ${INSTALL_DIR} ${IDIR_RT61_FIRMWARE}/lib/firmware
${CP} ${WRKBUILD}/rt2*.bin \
- ${IDIR_WIRELESS_FIRMWARE_RT61}/lib/firmware
+ ${IDIR_RT61_FIRMWARE}/lib/firmware
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 10e6b6d3e..fcae1474c 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -8,9 +8,9 @@ PKG_VERSION:= 1.6.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 0ab0f26f6eb056add1b9d3059a3f4247
PKG_DESCR:= revision control program
-PKG_SECTION:= net
-PKG_DEPENDS:= zlib apr apr-util libiconv libexpat
-PKG_BUILDDEP+= apr-util expat apr zlib libiconv
+PKG_SECTION:= scm
+PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite
+PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite
ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
PKG_DEPENDS+= neon
PKG_BUILDDEP+= neon
diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile
new file mode 100644
index 000000000..ac8424831
--- /dev/null
+++ b/package/tcsh/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= tcsh
+PKG_VERSION:= 6.17.00
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c47de903e3d52f6824c8dd0c91eeb477
+PKG_DESCR:= alternative csh
+PKG_SECTION:= shell
+PKG_DEPENDS:= libncurses
+PKG_BUILDDEP+= ncurses
+PKG_URL:= http://www.tcsh.org/Welcome
+PKG_SITES:= ftp://ftp.astron.com/pub/tcsh/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TCSH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_TCSH)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/tcsh $(IDIR_TCSH)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tcsh/patches/patch-Makefile_in b/package/tcsh/patches/patch-Makefile_in
new file mode 100644
index 000000000..aaeae79aa
--- /dev/null
+++ b/package/tcsh/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+use host compiler and flags
+--- tcsh-6.17.00.orig/Makefile.in 2009-06-25 00:09:05.000000000 +0200
++++ tcsh-6.17.00/Makefile.in 2010-02-13 21:01:33.000000000 +0100
+@@ -365,7 +365,7 @@ pure:$(P) ${OBJS}
+
+ gethost: gethost.c sh.err.h tc.const.h sh.h
+ rm -f gethost
+- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
++ ${HOSTCC} -o gethost ${HOSTLDFLAGS} ${HOSTCFLAGS} ${HOSTCPPFLAGS} $(srcdir)/gethost.c ${LIBES}
+
+ tc.defs.c: gethost host.defs
+ @rm -f $@.tmp
diff --git a/package/tcsh/patches/patch-config_linux b/package/tcsh/patches/patch-config_linux
new file mode 100644
index 000000000..bec2a22e4
--- /dev/null
+++ b/package/tcsh/patches/patch-config_linux
@@ -0,0 +1,10 @@
+--- tcsh-6.17.00.orig/config/linux 2006-01-12 20:55:39.000000000 +0100
++++ tcsh-6.17.00/config/linux 2010-01-06 18:45:10.937855487 +0100
+@@ -106,6 +106,6 @@
+ #endif
+ #define ECHO_STYLE BOTH_ECHO
+
+-#define NLS_CATALOGS
++#undef NLS_CATALOGS
+
+ #endif /* _h_config */
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 6d6b49f2a..a5b906c62 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= wpa_supplicant
-PKG_VERSION:= 0.6.9
+PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0efb8fcedf0a8acf6f423dfdb0658fdd
+PKG_MD5SUM:= 02c475f949e5c131856915bbb87fa55d
PKG_DESCR:= WPA Supplicant with support for WPA and WPA2
PKG_SECTION:= net
-PKG_DEPENDS:= libopenssl
ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
+PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
endif
PKG_SITES:= http://hostap.epitest.fi/releases/
diff --git a/package/wpa_supplicant/files/config b/package/wpa_supplicant/files/config
index b800b2fc5..c3f85d9c2 100644
--- a/package/wpa_supplicant/files/config
+++ b/package/wpa_supplicant/files/config
@@ -1,16 +1,8 @@
# rather important
-#CONFIG_DRIVER_MADWIFI=y
-CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NL80211=y
CONFIG_IEEE8021X_EAPOL=y
CONFIG_CTRL_IFACE=y
# default
CONFIG_EAP_PSK=y
CONFIG_EAP_MD5=y
-
-# optional
-CONFIG_MSCHAPV2=y
-CONFIG_EAP_TLS=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_TTLS=y
-
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index ec0e0cdef..a94593944 100644
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -98,7 +98,7 @@ You probably want to remove them: " >&2
[ "$?" -ne 0 ] && PKG_ERROR=1
if [ -z "$section" ]; then
echo "The Section field should have one of the following values:" >&2
- echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, text, web, x11" >&2
+ echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2
fi
priority=`required_field Priority`
diff --git a/target/Config.in b/target/Config.in
index 54024e752..059270e61 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -490,6 +490,7 @@ config ADK_LINUX_X86_ALIX2D
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_LEDS
+ select ADK_TARGET_WITH_WATCHDOG
help
Support for ALIX2D boards.
http://www.pcengines.ch/
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 81aecf53e..e0dd123fe 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -120,6 +120,10 @@ config ADK_KERNEL_WLAN_80211
boolean
default n
+config ADK_KPACKAGE_KMOD_RT2X00
+ tristate
+ default n
+
config ADK_KERNEL_RT2X00
boolean
select ADK_KPACKAGE_KMOD_RT2X00
@@ -139,6 +143,10 @@ config ADK_KERNEL_ATH_COMMON
tristate
default n
+config ADK_KPACKAGE_KMOD_P54_COMMON
+ tristate
+ default n
+
config ADK_MOD_KERNEL_MAC80211
tristate
select ADK_MOD_KERNEL_CFG80211
@@ -148,7 +156,6 @@ config ADK_MOD_KERNEL_MAC80211
select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
select ADK_KERNEL_CRC32
select ADK_KERNEL_WIRELESS
- select ADK_KERNEL_WIRELESS_EXT
select ADK_KERNEL_WLAN_80211
select ADK_KERNEL_MAC80211_LEDS
default n
@@ -157,7 +164,7 @@ menu "Wireless card support"
depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
config ADK_KPACKAGE_KMOD_MAC80211
- prompt "kmod-mac80211................... mac80211 softmac"
+ prompt "kmod-mac80211.................. mac80211 softmac"
tristate
select ADK_MOD_KERNEL_CFG80211
select ADK_MOD_KERNEL_LIB80211
@@ -165,13 +172,12 @@ config ADK_KPACKAGE_KMOD_MAC80211
select ADK_KPACKAGE_KMOD_CRYPTO_ECB
select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
select ADK_KERNEL_WIRELESS
- select ADK_KERNEL_WIRELESS_EXT
select ADK_KERNEL_WLAN_80211
select ADK_KERNEL_CRC32
default n
config ADK_KPACKAGE_KMOD_ATH5K
- prompt "kmod-mac80211-ath5k............ Atheros 5xxx wireless cards"
+ prompt "kmod-ath5k................... Atheros 5xxx wireless cards"
tristate
select ADK_KERNEL_MAC80211_LEDS
select ADK_KERNEL_ATH_COMMON
@@ -198,12 +204,20 @@ config ADK_KERNEL_ATH5K_DEBUG
parameter. For example:
insmod ath5k.ko debug=0x00000400
-config ADK_KPACKAGE_KMOD_RT2X00
+config ADK_KPACKAGE_KMOD_P54_USB
+ prompt "kmod-p54-usb................. Prism54 USB support"
tristate
+ depends on ADK_KPACKAGE_KMOD_MAC80211
+ depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ select ADK_KPACKAGE_KMOD_P54_COMMON
+ select ADK_KPACKAGE_KMOD_FW_LOADER
+ select ADK_PACKAGE_P54_FIRMWARE
default n
+ help
+ Driver for Prism54 USB adaptors.
config ADK_KPACKAGE_KMOD_RT2400PCI
- prompt "kmod-mac80211-rt2400........... Ralink rt2400"
+ prompt "kmod-rt2400pci............... Ralink rt2400"
tristate
default n
select ADK_KERNEL_RT2X00
@@ -214,7 +228,7 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
Supported chips: RT2460.
config ADK_KPACKAGE_KMOD_RT2500PCI
- prompt "kmod-mac80211-rt2500........... Ralink rt2500"
+ prompt "kmod-rt2500pci............... Ralink rt2500"
tristate
default n
select ADK_KERNEL_RT2X00
@@ -225,13 +239,13 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
Supported chips: RT2560.
config ADK_KPACKAGE_KMOD_RT61PCI
- prompt "kmod-mac80211-rt2501........... Ralink rt2501/rt61"
+ prompt "kmod-rt61pci................. Ralink rt2501/rt61"
tristate
default n
select ADK_KERNEL_RT2X00
select ADK_KERNEL_MAC80211_LEDS
select ADK_KPACKAGE_KMOD_CRC_ITU_T
- select ADK_PACKAGE_WIRELESS_FIRMWARE_RT61
+ select ADK_PACKAGE_RT61_FIRMWARE
depends on ADK_KPACKAGE_KMOD_MAC80211
help
This adds support for rt2501 wireless chipset family.
@@ -240,7 +254,8 @@ config ADK_KPACKAGE_KMOD_RT61PCI
config ADK_KERNEL_RT2X00_DEBUG
prompt "enable debugging info"
depends on ADK_KPACKAGE_KMOD_RT61PCI || \
- ADK_KPACKAGE_KMOD_RT2500PCI || ADK_KPACKAGE_KMOD_RT2400PCI
+ ADK_KPACKAGE_KMOD_RT2500PCI || \
+ ADK_KPACKAGE_KMOD_RT2400PCI
default n
boolean
help
@@ -253,5 +268,4 @@ source package/sangam-atm/Config.in
source package/sangam-atm/Config.in.fw
endmenu
-
endmenu