[Astlinux-commits] SF.net SVN: astlinux: [200] trunk/package/linux

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 200
Author:   krisk84
Date:     2006-08-07 06:16:49 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=200&view=rev

Log Message:
-----------
cross compile build fixes

Modified Paths:
--------------
    trunk/package/linux/linux.mk
    trunk/package/zaptel/zaptel.mk
Modified: trunk/package/linux/linux.mk
===================================================================

--- trunk/package/linux/linux.mk	2006-08-07 06:26:57 UTC (rev 199)
+++ trunk/package/linux/linux.mk	2006-08-07 13:16:49 UTC (rev 200)
@@ -18,6 +18,20 @@
 LINUX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_LINUX_BASECONFIG)-$(BR2_PACKAGE_LINUX_VERSION).config))
 #"
 
+LINUX_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh[234].*/sh/' \
+		-e 's/mips.*/mips/' \
+		-e 's/mipsel.*/mips/' \
+		-e 's/cris.*/cris/' \
+		-e 's/nios2.*/nios2/' \
+)
+
 $(DL_DIR)/$(LINUX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
 
@@ -31,24 +45,24 @@
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.unpacked
 	cp $(LINUX_CONFIG_FILE) $(LINUX_DIR)/.config
-	$(MAKE) -C $(LINUX_DIR) oldconfig
+	$(MAKE) ARCH=$(LINUX_TARGET_ARCH) -C $(LINUX_DIR) oldconfig
 	touch $(LINUX_DIR)/.configured
 
-$(LINUX_DIR)/arch/i386/boot/bzImage: $(LINUX_DIR)/.configured
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 -C $(LINUX_DIR) bzImage
+$(LINUX_DIR)/arch/$(LINUX_TARGET_ARCH)/boot/bzImage: $(LINUX_DIR)/.configured
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_TARGET_ARCH) -C $(LINUX_DIR) bzImage
 	mkdir -p $(TARGET_DIR)/boot
 	ln -sf $(LINUX_DIR) $(BUILD_DIR)/linux
-	cp $(LINUX_DIR)/arch/i386/boot/bzImage $(TARGET_DIR)/boot/bzImage
+	cp $(LINUX_DIR)/arch/$(LINUX_TARGET_ARCH)/boot/bzImage $(TARGET_DIR)/boot/bzImage
 
-$(LINUX_DIR)/.modules: $(LINUX_DIR)/arch/i386/boot/bzImage
-	-$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 -C $(LINUX_DIR) modules
-	-$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 INSTALL_MOD_PATH=$(STAGING_DIR) -C $(LINUX_DIR) modules_install
+$(LINUX_DIR)/.modules: $(LINUX_DIR)/arch/$(LINUX_TARGET_ARCH)/boot/bzImage
+	-$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_TARGET_ARCH) -C $(LINUX_DIR) modules
+	-$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_TARGET_ARCH) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(LINUX_DIR) modules_install
 	-mkdir -p $(TARGET_DIR)/lib/modules/$(LINUX_VER)
 	-cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER) $(TARGET_DIR)/lib/modules/
 	-rm $(TARGET_DIR)/lib/modules/$(LINUX_VER)/build $(TARGET_DIR)/lib/modules/$(LINUX_VER)/source
 	touch $(LINUX_DIR)/.modules
 
-linux: uclibc $(LINUX_DIR)/arch/i386/boot/bzImage $(LINUX_DIR)/.modules
+linux: uclibc $(LINUX_DIR)/arch/$(LINUX_TARGET_ARCH)/boot/bzImage $(LINUX_DIR)/.modules
 
 linux-clean:
 	rm -f $(TARGET_DIR)/boot/bzImage

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2006-08-07 06:26:57 UTC (rev 199)
+++ trunk/package/zaptel/zaptel.mk	2006-08-07 13:16:49 UTC (rev 200)
@@ -19,6 +19,20 @@
 
 LINUX_VER=2.6.16.12
 
+ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh[234].*/sh/' \
+		-e 's/mips.*/mips/' \
+		-e 's/mipsel.*/mips/' \
+		-e 's/cris.*/cris/' \
+		-e 's/nios2.*/nios2/' \
+)
+
 $(DL_DIR)/$(ZAPTEL_SOURCE):
 	$(WGET) -P $(DL_DIR) $(ZAPTEL_SITE)/$(ZAPTEL_SOURCE)
 	# Rhino-enabled
@@ -47,7 +61,8 @@
 	#CWD=$(shell pwd)
 	#cd $(ZAPTEL_DIR) 
 	$(MAKE) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits fw2h #hack
-	$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
+	$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) ARCH=$(ZAPTEL_TARGET_ARCH) \
+	PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
 	$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/ PWD=$(ZAPTEL_DIR)
 	#cd $(CWD)
 
@@ -55,9 +70,9 @@
 	mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
 	mkdir -p $(STAGING_DIR)/share/man/man8 #yet another hack...
 	mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
-	$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
-	$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool \
-	PWD=$(ZAPTEL_DIR) install
+	$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) ARCH=$(ZAPTEL_TARGET_ARCH) \
+	KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" \
+	INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool PWD=$(ZAPTEL_DIR) install
 	mkdir -p $(STAGING_DIR)/usr/include/linux
 	cp -a $(STAGING_DIR)/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/zaptel.h #Hack for Asterisk to find us
 	cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc $(TARGET_DIR)/lib/modules/$(LINUX_VER)/
@@ -88,7 +103,7 @@
 	rm -Rf $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
 	$(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
 	rm $(BUILD_DIR)/zaptel
-	-$(MAKE) -C $(ZAPTEL_DIR) clean
+	-$(MAKE) -C $(ZAPTEL_DIR) PWD=$(ZAPTEL_DIR) clean
 
 zaptel-dirclean:
 	rm -rf $(ZAPTEL_DIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



