remove unzip dependency, use delivered cpio. some code cleanup

8 files changed, 24 insertions, 31 deletions

diff --git a/README b/README
index 156d726e2..04b6b441e 100644
--- a/README
+++ b/README
@@ -18,7 +18,6 @@ Before you can start you need to install some tools:
 - bzip2
 - wget
 - file
-- unzip
 - libc headers
 - ncurses5 headers
 - zlib headers
diff --git a/mk/vars.mk b/mk/vars.mk
index fdd9f432c..6f38db944 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -102,7 +102,7 @@ EXTRACT_CMD=		mkdir -p ${WRKDIR}; \
 			cd ${WRKDIR} && \
 			for file in ${FULLDISTFILES}; do case $$file in \
 			*.cpio) \
-				cat $$file | cpio -i -d ;; \
+				cat $$file | $(STAGING_TOOLS)/bin/cpio -i -d ;; \
 			*.tar) \
 				tar -xf $$file ;; \
 			*.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
@@ -114,7 +114,7 @@ EXTRACT_CMD=		mkdir -p ${WRKDIR}; \
 			*.tar.bz2 | *.tbz | *.tbz2) \
 				bzip2 -dc $$file | tar -xf - ;; \
 			*.zip) \
-				unzip -qd ${WRKDIR} $$file ;; \
+				cat $$file | $(STAGING_TOOLS)/bin/cpio -ivd -H zip ;; \
 			*.arm) \
 				cp $$file ${WRKDIR} ;; \
 			*) \
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 8e5f96d27..a6025ce43 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -101,9 +101,9 @@ CONFIGURE_ARGS+=	--with-ogg=${STAGING_DIR}/usr \
 TLDFLAGS+=		-logg
 endif
 ifneq (${ADK_PACKAGE_ASTERISK_CURL},)
-CONFIGURE_ARGS+=	--with-curl=${STAGING_DIR}/usr
+CONFIGURE_ARGS+=	--with-libcurl=${STAGING_DIR}/usr
 else
-CONFIGURE_ARGS+=	--without-curl
+CONFIGURE_ARGS+=	--without-libcurl
 endif
 ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},)
 CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
diff --git a/package/cpufrequtils/patches/patch-utils_aperf_c b/package/cpufrequtils/patches/patch-utils_aperf_c
new file mode 100644
index 000000000..3e39dd625
--- /dev/null
+++ b/package/cpufrequtils/patches/patch-utils_aperf_c
@@ -0,0 +1,18 @@
+--- cpufrequtils-008.orig/utils/aperf.c	2010-07-05 17:43:17.000000000 +0200
++++ cpufrequtils-008/utils/aperf.c	2010-08-01 22:41:37.905732041 +0200
+@@ -68,11 +68,15 @@ struct avg_perf_cpu_info
+ 
+ static int cpu_has_effective_freq()
+ {
++#if defined(__i386__) || defined(__x86_64__)
+ 	/* largest base level */
+ 	if (cpuid_eax(0) < 6)
+ 		return 0;
+ 
+ 	return cpuid_ecx(6) & 0x1;
++#else
++	return 0;
++#endif
+ }
+ 
+ /*
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 7f09627a1..34c2cdab8 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -31,8 +31,7 @@ $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESC
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-tls \
-			--enable-dynamic-e2fsck
+			--disable-tls
 INSTALL_TARGET+=	install-libs
 
 pre-build:
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 0837c9613..5dd19a645 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -137,12 +137,6 @@ if ! which bzip2 >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which unzip >/dev/null 2>&1; then
-	echo You must install unzip to continue.
-	echo
-	out=1
-fi
-
 if ! which patch >/dev/null 2>&1; then
 	echo You must install patch to continue.
 	echo
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index bb5097351..627a691bc 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -95,7 +95,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_MAC80211
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !ADK_LINUX_CRIS_FOXBOARD && !ADK_LINUX_MIPS64_LEMOTE
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched
index 808b00e41..7cea06102 100644
--- a/target/linux/config/Config.in.sched
+++ b/target/linux/config/Config.in.sched
@@ -201,7 +201,6 @@ config ADK_KPACKAGE_KMOD_NET_CLS_BASIC
 	prompt "kmod-cls-basic.................... Elementary classification (BASIC)"
 	tristate
 	select ADK_KERNEL_NET_CLS
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here if you want to be able to classify packets using
@@ -272,22 +271,10 @@ config ADK_KERNEL_NET_CLS_ACT
 	select ADK_KERNEL_NET_ESTIMATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_NET_CLS_POLICE
-	prompt "kmod-act-police................... Traffic Policing"
-	tristate
-	select ADK_KERNEL_NET_CLS_ACT
-	depends on ADK_LINUX_2_4
-	default n
-	help
-	  Say Y here if you want to do traffic policing, i.e. strict
-	  bandwidth limiting. This action replaces the existing policing
-	  module.
-
 config ADK_KPACKAGE_KMOD_NET_ACT_POLICE
 	prompt "kmod-act-police................... Traffic Policing"
 	tristate
 	select ADK_KERNEL_NET_CLS_ACT
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here if you want to do traffic policing, i.e. strict
@@ -298,7 +285,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_GACT
 	prompt "kmod-act-gact..................... Generic actions"
 	tristate
 	select ADK_KERNEL_NET_CLS_ACT
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here to take generic actions such as dropping and
@@ -308,7 +294,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED
 	prompt "kmod-act-mirred................... Redirecting and Mirroring"
 	tristate
 	select ADK_KERNEL_NET_CLS_ACT
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here to allow packets to be mirrored or redirected to
@@ -319,7 +304,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_IPT
 	tristate
 	select ADK_KERNEL_NET_CLS_ACT
 	select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here to be able to invoke iptables targets after successful
@@ -329,7 +313,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_PEDIT
 	prompt "kmod-act-pedit.................... Packet Editing"
 	tristate
 	select ADK_KERNEL_NET_CLS_ACT
-	depends on ADK_LINUX_2_6
 	default n
 	help
 	  Say Y here if you want to mangle the content of packets.