Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 38 insertions, 22 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index 73ecb707c..c429f114e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -62,6 +62,9 @@ $(eval $(call KMOD_template,R8169,r8169,\
 # 
 # Wireless network devices
 #
+$(eval $(call KMOD_template,RFKILL,rfkill,\
+	$(MODULES_DIR)/kernel/net/rfkill/rfkill \
+,10))
 
 $(eval $(call KMOD_template,MAC80211,mac80211,\
 	$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index edeec98db..33ba719ca 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -227,7 +227,6 @@ config BUSYBOX_RPM
 
 config BUSYBOX_TAR
 	bool "tar"
-	depends on !ADK_PACKAGE_TAR
 	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to
diff --git a/package/ccid/patches/patch-configure b/package/ccid/patches/patch-configure
new file mode 100644
index 000000000..7235e9ef8
--- /dev/null
+++ b/package/ccid/patches/patch-configure
@@ -0,0 +1,21 @@
+--- ccid-1.4.4.orig/configure	2011-05-13 11:19:09.000000000 +0200
++++ ccid-1.4.4/configure	2011-07-28 10:54:49.000000000 +0200
+@@ -12207,17 +12207,8 @@ done
+ # Select OS specific versions of source files.
+ 
+ 
+-BUNDLE_HOST=`uname | sed -e s,/,_,`
++BUNDLE_HOST=Linux
+ DYN_LIB_EXT="so"
+-case "$BUNDLE_HOST" in
+-Darwin)
+-	BUNDLE_HOST=MacOS
+-	DYN_LIB_EXT="dylib"
+-	;;
+-SunOS)
+-	BUNDLE_HOST=Solaris
+-	;;
+-	esac
+ 
+ # --disable-libusb
+ # Check whether --enable-libusb was given.
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index a0d6e9eaa..51a2e0047 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		4.0
+PKG_VERSION:=		5.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3468a2c463b4fc2788ba621e4b511c30
+PKG_MD5SUM:=		6d1f43e402cec84459a3d7f950bd5192
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff
@@ -23,12 +23,15 @@ PKG_ARCH_DEPENDS:=	x86 x86_64 mips64 mips64el native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
-WRKDIST=		${WRKDIR}/mozilla-2.0
+WRKDIST=		${WRKDIR}/mozilla-release
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 CONFIGURE_ARGS+=	--disable-ipc
 else ifeq (${ADK_TARGET_LIB_UCLIBC},y)
@@ -84,7 +87,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-svg \
 			--disable-mathml \
 			--disable-jemalloc \
-			--disable-crashreporter
+			--disable-crashreporter \
+			--disable-elf-hack
 
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
diff --git a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
deleted file mode 100644
index 9a49b3cd6..000000000
--- a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-03-19 00:33:34.000000000 +0100
-+++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-06-15 20:26:00.226952311 +0200
-@@ -159,7 +159,7 @@ DoubleIsFinite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 
diff --git a/target/Makefile b/target/Makefile
index bffcabfe0..7ca524c89 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -65,7 +65,7 @@ ifneq ($(ADK_TARGET_CMDLINE),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
-ifneq ($(ADK_PACKAGE_CMDLINE),)
+ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index b910eeec5..a351fa59b 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -1,6 +1,3 @@
-config ADK_KERNEL_RFKILL
- 	boolean
-
 config ADK_KERNEL_I2C
  	boolean
  
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 34b2ec652..14820b810 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -249,6 +249,9 @@ config ADK_KERNEL_WIRELESS
 config ADK_KERNEL_WIRELESS_EXT
 	boolean
 
+config ADK_KPACKAGE_KMOD_RFKILL
+	tristate
+	
 config ADK_KERNEL_MAC80211_LEDS
 	boolean
 	select ADK_KPACKAGE_KMOD_LEDS_CLASS
@@ -294,7 +297,6 @@ config ADK_KERNEL_MAC80211_DEBUGFS
 
 config ADK_KPACKAGE_KMOD_MAC80211
 	tristate
-	select ADK_KERNEL_RFKILL
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_MOD_CFG80211
@@ -302,6 +304,7 @@ config ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_AES
 	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
+	select ADK_KPACKAGE_KMOD_RFKILL
 
 config ADK_DEBUG_MAC80211
 	boolean
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 6d1108953..2bc8d73db 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -200,7 +200,7 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS
 config ADK_KPACKAGE_KMOD_USB_HSO
 	prompt "kmod-usb-hso...................... Support for USB HSO devices"
 	tristate
-	select ADK_KERNEL_RFKILL
+	select ADK_KPACKAGE_KMOD_RFKILL
 	select ADK_KPACKAGE_KMOD_USB_STORAGE
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER