From 6c4dbdaddecb4397c2bda2f74569a968714815ee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 31 Aug 2011 09:49:16 +0200 Subject: add TCP port configuration for typical Qemu setup --- mk/build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 854fdb19d..c8fa47387 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -590,8 +590,10 @@ include $(TOPDIR)/toolchain/gcc/Makefile.inc check: @-rm tests/adk.exp tests/master.exp @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 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 + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc RUNTESTFLAGS="execute.exp" -- cgit v1.2.3 From 0d3d3eb227d0b0c26e40cbb08a8e57ef80e390c1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 31 Aug 2011 18:17:07 +0200 Subject: add g++ checks, separate checks for gcc and g++ --- mk/build.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index c8fa47387..6f52bb868 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -587,13 +587,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-gcc RUNTESTFLAGS="execute.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++ -- cgit v1.2.3 From 64d1148c48e3cd428da42a5eb9bcda50f08171fb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 Sep 2011 19:11:35 +0200 Subject: add support for qemu-arm, fix usage of xz compressed initramfs, which is now the default here --- mk/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 185164c22..78b18e716 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).*//' \ -- cgit v1.2.3 From e61aad237ecb819635bb7550dbbf66f2b8817b50 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Sep 2011 11:50:10 +0200 Subject: more make bulkallmod patches --- mk/build.mk | 8 ++++---- mk/vars.mk | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 854fdb19d..5eecb0a6d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -513,7 +513,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 +531,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 +549,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; \ diff --git a/mk/vars.mk b/mk/vars.mk index 89d78be83..e77726943 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -53,6 +53,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 -- cgit v1.2.3 From a0e2c5dc26f0126d8462e15e3bdf9a92bbbbee34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Sep 2011 18:25:34 +0200 Subject: some sparc help fixes --- mk/rootfs.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 5080944e6..6b34156a5 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 -- cgit v1.2.3 From f139a9abc43cce01741da6193ba6aa8e60411430 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 11 Sep 2011 06:21:45 +0200 Subject: always add /dev/{console,tty,null} to initramfs --- mk/image.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 78b18e716..e6dd06a82 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -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} \ -- cgit v1.2.3 From 86dda57f431de5dc944ea600fcfb90b95afb2eb7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Sep 2011 14:12:31 +0200 Subject: add special case for sharp zaurus --- mk/rootfs.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk') diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 6b34156a5..f5e2b74c5 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,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 -- cgit v1.2.3 From fed44cfff7a6b3b1696870b86aa4a98ac02a6c80 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Sep 2011 14:12:43 +0200 Subject: add hostap driver --- mk/modules.mk | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index e51732a4c..0a68e4096 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,14 @@ $(eval $(call KMOD_template,B43,b43,\ $(MODULES_DIR)/kernel/drivers/net/wireless/b43/b43 \ ,70)) +$(eval $(call KMOD_template,HOSTAP,hostap,\ + $(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)) -- cgit v1.2.3 From ed7c0c316f29cade934c3d90e1e257675cb0fa4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Sep 2011 03:52:40 +0200 Subject: add support for sharp zaurus (tested on terrier cl-3200) --- mk/mirrors.mk | 1 + mk/modules.mk | 14 ++++++++++++++ 2 files changed, 15 insertions(+) (limited to 'mk') 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 0a68e4096..0cc7603ad 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -68,6 +68,8 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(MODULES_DIR)/kernel/net/wireless/lib80211 \ + $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_ccmp \ + $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_tkip \ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) @@ -1091,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 \ @@ -1130,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 -- cgit v1.2.3 From ae4488db4c3cc376adf8bf07d5a9470f7ce2f455 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Sep 2011 11:52:22 +0200 Subject: only hostap driver uses these modules here --- mk/modules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 0cc7603ad..73e0b205f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -68,8 +68,6 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(MODULES_DIR)/kernel/net/wireless/lib80211 \ - $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_ccmp \ - $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_tkip \ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) @@ -92,6 +90,8 @@ $(eval $(call KMOD_template,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)) -- cgit v1.2.3 From b2999e12c816bf189ba07f1661805c8d42d6bfae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Sep 2011 17:58:59 +0200 Subject: fix symbol name --- mk/modules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 73e0b205f..9b3d225b7 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1158,9 +1158,9 @@ $(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_PWC,usb-pwc,\ + $(MODULES_DIR)/kernel/drivers/media/video/pwc/pwc \ +,80)) # # PCMCIA/CardBus -- cgit v1.2.3 From 619e851e929947a445d6380b1f84f0a93868013a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Sep 2011 21:06:47 +0200 Subject: add some more webcam drivers to kernel config --- mk/modules.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 9b3d225b7..0288222c9 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1158,6 +1158,18 @@ $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ $(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \ ,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_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)) -- cgit v1.2.3 From 65cd7b7d328e4ca6e0b2e074b442aa5933cd90d8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Sep 2011 22:07:28 +0200 Subject: add another cheap webcam driver --- mk/modules.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 0288222c9..d722fde19 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1166,6 +1166,10 @@ $(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)) -- cgit v1.2.3 From 13318ddbb68d4da204921d7cb31cdd4fecfdc148 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 25 Sep 2011 10:41:30 +0200 Subject: fixes for make bulkallmod --- mk/build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mk') 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 \ -- cgit v1.2.3