fixes for make bulkallmod

10 files changed, 95 insertions, 12 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 15d0e3b16..ed1165050 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -16,11 +16,13 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
 			ADK_USE_CCACHE=n \
-			ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \
+			ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \
+			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_CRYPTINIT=n \
 			ADK_PACKAGE_PYTHON=n \
+			ADK_PACKAGE_PERL=n \
 			ADK_PKG_LAPTOP=n \
 			ADK_PKG_DEVELOPMENT=n \
 			ADK_TOOLCHAIN_GCC_JAVA=n \
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index d66da0ff3..bb7636cd4 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -14,6 +14,7 @@ PKG_BUILDEP:=		zlib
 PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 
+PKG_ARCH_DEPENDS:=	!cris
 PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libtheora/patches/patch-Makefile_in b/package/libtheora/patches/patch-Makefile_in
new file mode 100644
index 000000000..41162985c
--- /dev/null
+++ b/package/libtheora/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- libtheora-1.1.1.orig/Makefile.in	2009-10-01 20:04:07.000000000 +0200
++++ libtheora-1.1.1/Makefile.in	2011-09-18 18:38:53.551740404 +0200
+@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip 
+ @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
+ @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = 
+ 
+-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
++SUBDIRS = lib include m4 $(EXAMPLES_DIR)
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak
+ 	missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
+ 	theoradec-uninstalled.pc.in theoradec.pc.in \
+ 	theoraenc-uninstalled.pc.in theoraenc.pc.in
+-DIST_SUBDIRS = lib include doc tests m4 examples
++DIST_SUBDIRS = lib include m4 examples
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index ab3333164..ddc595272 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -25,9 +25,42 @@ CONFIG_STYLE:=		minimal
 ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 CONFIGURE_ARGS+=	--target=armv5te-linux-gcc
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
+CONFIGURE_ARGS+=	--target=armv5te-linux-gcc
+endif
 ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y)
 CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
 endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_WRAP),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX1C),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
 CONFIGURE_ARGS+=	--prefix=/usr \
 			--disable-install-docs \
 			--disable-install-bins \
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
index 1c9733e3e..6d37129e7 100644
--- a/package/lm_sensors/Makefile
+++ b/package/lm_sensors/Makefile
@@ -13,9 +13,10 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://www.lm-sensors.org
 PKG_SITES:=		http://dl.lm-sensors.org/lm-sensors/releases/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-TARGET_CFLAGS:=		${TARGET_CFLAGS_ARCH} -fwrapv -fno-ident
 
-PKG_SUBPKGS:=	LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
+PKG_ARCH_DEPENDS:=	x86 x86_64
+
+PKG_SUBPKGS:=		LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
 PKGSD_LM_SENSORS_DEV:=		lm_sensors header files
 PKGSC_LM_SENSORS_DEV:=		devel
 PKGSD_LM_SENSORS_DETECT:=	lm_sensors perl scripts (e.g. sensors-detect)
@@ -43,22 +44,22 @@ do-build:
 		
 lm-sensors-install:
 	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/local/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
+	${INSTALL_BIN} ${WRKINST}/usr/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
 	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib
-	${CP} ${WRKINST}/usr/local/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib
 	${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc
 	${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc
 
 lm-sensors-dev-install:
 	${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
-	${CP} ${WRKINST}/usr/local/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+	${CP} ${WRKINST}/usr/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
 
 lm-sensors-detect-install:
 	${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
-	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
-	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
-	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
-	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lm_sensors/patches/patch-Makefile b/package/lm_sensors/patches/patch-Makefile
new file mode 100644
index 000000000..223321ada
--- /dev/null
+++ b/package/lm_sensors/patches/patch-Makefile
@@ -0,0 +1,15 @@
+--- lm_sensors-3.3.1.orig/Makefile	2010-10-26 15:24:12.000000000 +0200
++++ lm_sensors-3.3.1/Makefile	2011-09-18 19:09:30.217984317 +0200
+@@ -42,10 +42,10 @@ DEBUG := 0
+ DESTDIR :=
+ 
+ # This is the prefix that will be used for almost all directories below.
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ # Your C compiler
+-CC := gcc
++CC ?= gcc
+ 
+ # This is the directory where sensors3.conf will be installed, if no other
+ # configuration file is found
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index c65fe0b84..ffc5b6fe5 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -13,9 +13,12 @@ PKG_DEPENDS:=		apr apr-util
 PKG_BUILDDEP:=		apr apr-util
 PKG_URL:=		http://logging.apache.org/log4cxx/
 PKG_SITES:=		http://www.apache.org/dist/logging/log4cxx/0.10.0/
+
 DISTFILES:=		apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
 
+PKG_ARCH_DEPENDS:=	!cris
+
 PKG_SUBPKGS:=		LOG4CXX LOG4CXX_DEV
 PKGSD_LOG4CXX_DEV:=	log4cxx development headers
 PKGSC_LOG4CXX_DEV:=	devel
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 9e2481658..163028ca2 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -14,6 +14,8 @@ PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}
 
+PKG_ARCH_DEPENDS:=	!cris
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
@@ -28,7 +30,9 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--disable-skins2 \
 			--disable-remoteosd \
 			--disable-dvdnav \
+			--disable-glx \
 			--disable-libxml2 \
+			--disable-smb \
 			--enable-libgcrypt \
 			--enable-theora
 
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 215f11a87..50c88f713 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_EVDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index a3ff2c6c1..1ca92886c 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -410,13 +410,15 @@ config ADK_KPACKAGE_KMOD_HOSTAP
 	tristate
 	select ADK_KPACKAGE_KMOD_MAC80211
 	default n
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
 	  HostAP Driver for wireless chips.
 
 config ADK_KPACKAGE_KMOD_HOSTAP_CS
 	prompt "kmod-hostap-cs................ HostAP driver for PC Cards"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_HOSTAP
+	select ADK_KPACKAGE_KMOD_HOSTAP
+	depends on ADK_TARGET_WITH_PCMCIA
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 	help