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

6 files changed, 77 insertions, 12 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 854fdb19d..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 \
@@ -513,7 +515,7 @@ bulktoolchain:
 bulk:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -531,7 +533,7 @@ bulk:
 bulkall:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -549,14 +551,14 @@ bulkall:
 bulkallmod:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
-		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system >.exit; exit 1;fi; \
+		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
 	      done; \
@@ -587,11 +589,21 @@ dep: $(TOPDIR)/bin/tools/depmaker
 
 include $(TOPDIR)/toolchain/gcc/Makefile.inc
 
-check:
-	@-rm tests/adk.exp tests/master.exp
+check-dejagnu:
+	@-rm tests/adk.exp tests/master.exp >/dev/null 2>&1
 	@sed -e "s#@ADK_TARGET_IP@#$(ADK_TARGET_IP)#" tests/adk.exp.in > \
+		tests/adk.exp.in.tmp
+	@sed -e "s#@ADK_TARGET_PORT@#$(ADK_TARGET_PORT)#" tests/adk.exp.in.tmp > \
 		tests/adk.exp
 	@sed -e "s#@TOPDIR@#$(TOPDIR)#" tests/master.exp.in > \
 		tests/master.exp
+
+check-gcc: check-dejagnu
 	env DEJAGNU=$(TOPDIR)/tests/master.exp \
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc
+
+check-g++: check-dejagnu
+	env DEJAGNU=$(TOPDIR)/tests/master.exp \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-g++
+
+check: check-gcc check-g++
diff --git a/mk/image.mk b/mk/image.mk
index 185164c22..e6dd06a82 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -95,7 +95,7 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
 	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P | \
-		lzma -9 >$@ 2>/dev/null
+		xz -C crc32 >$@ 2>/dev/null
 
 ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
 	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE).*//' \
@@ -103,9 +103,10 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
 	echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config
 	echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \
 		${LINUX_DIR}/.config
+	cp $(TOPDIR)/scripts/dev.cpio $@
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
+	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -A -P -O $@ 2>/dev/null
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index d820a56b3..30e246334 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -21,6 +21,7 @@ MASTER_SITE_XORG?=	\
 	http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.6/src/everything/ \
 	http://xorg.freedesktop.org/releases/X11R7.6/src/everything/ \
 	http://xorg.freedesktop.org/releases/individual/lib/ \
+	http://xorg.freedesktop.org/releases/individual/driver/ \
 	
 MASTER_SITE_GNU?=	\
 	http://ftp.gnu.org/gnu/ \
diff --git a/mk/modules.mk b/mk/modules.mk
index e51732a4c..d722fde19 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -67,6 +67,7 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\
 ,10))
 
 $(eval $(call KMOD_template,MAC80211,mac80211,\
+	$(MODULES_DIR)/kernel/net/wireless/lib80211 \
 	$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
 	$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
 ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb))
@@ -88,6 +89,16 @@ $(eval $(call KMOD_template,B43,b43,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/b43/b43 \
 ,70))
 
+$(eval $(call KMOD_template,HOSTAP,hostap,\
+	$(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_ccmp \
+	$(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_tkip \
+	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap \
+,70))
+
+$(eval $(call KMOD_template,HOSTAP_CS,hostap-cs,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_cs \
+,75))
+
 $(eval $(call KMOD_template,P54_USB,p54-usb,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \
 ,70))
@@ -1082,6 +1093,7 @@ $(eval $(call KMOD_template,SOUND,sound,\
 	$(MODULES_DIR)/kernel/sound/soundcore \
 ,30))
 
+
 $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
 	$(MODULES_DIR)/kernel/sound/core/snd \
@@ -1121,6 +1133,17 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
+$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
+	$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8750 \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
+,55))
+
 #V4L_COMPAT:=drivers/media/video/v4l1-compat
 #ifeq ($(ADK_LINUX_64),y)
 #V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
@@ -1135,9 +1158,25 @@ $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
 	$(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \
 ,70))
 
-$(eval $(call KMOD_template,PWC,pwc,\
-	$(MODULES_DIR)/kernel/drivers/usb/pwc \
-,70))
+$(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\
+	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_main \
+,75))
+
+$(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\
+	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \
+,80))
+
+$(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\
+	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \
+,80))
+
+$(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\
+	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \
+,80))
+
+$(eval $(call KMOD_template,USB_PWC,usb-pwc,\
+	$(MODULES_DIR)/kernel/drivers/media/video/pwc/pwc \
+,80))
 
 #
 # PCMCIA/CardBus
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 5080944e6..f5e2b74c5 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -9,8 +9,10 @@ endif
 endef
 
 ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
+endif
 
 ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
 ROOTFS:=	root=/dev/sda2
@@ -25,6 +27,10 @@ ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
 ROOTFS:=	root=/dev/mmcblk0p2 rootwait
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
+ROOTFS:=	root=/dev/sda1 rootwait
+endif
+
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 USB:=		rootwait
 else
diff --git a/mk/vars.mk b/mk/vars.mk
index 81821095b..896307026 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -59,6 +59,12 @@ endif
 ifeq ($(CPU_ARCH),mipsel)
 QEMU:=			qemu-mipsel
 endif
+ifeq ($(CPU_ARCH),mips)
+QEMU:=			qemu-mips
+endif
+ifeq ($(CPU_ARCH),i486)
+QEMU:=			qemu-i386
+endif
 ifeq ($(CPU_ARCH),i586)
 QEMU:=			qemu-i386
 endif