From dc52bfe889dc085aeabe6d977d5940592f263206 Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Tue, 30 Jun 2009 14:34:20 +0800 Subject: [PATCH] add cross compile to Makefile.am Signed-off-by: Xiangfu Liu --- qiboot/Makefile | 1 - usbboot/debian/changelog | 6 ++++-- usbboot/debian/control | 2 +- usbboot/debian/copyright | 4 +--- usbboot/src/Makefile.am | 8 ++------ 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/qiboot/Makefile b/qiboot/Makefile index 2ac0e2c..5e04f75 100644 --- a/qiboot/Makefile +++ b/qiboot/Makefile @@ -90,4 +90,3 @@ clean: @rm -f src/fs/*.o src/fs/*~ @rm -f include/*~ ${IMAGE_DIR}/* @make clean -C $(TOOLS) - diff --git a/usbboot/debian/changelog b/usbboot/debian/changelog index 2ff76c0..7f1a7db 100644 --- a/usbboot/debian/changelog +++ b/usbboot/debian/changelog @@ -1,5 +1,7 @@ xburst-tools (20090630-1) unstable; urgency=low - * Initial release (Closes: #nnnn) + [ xiangfu liu ] + * Initial release - -- xiangfu Mon, 29 Jun 2009 16:27:20 +0800 + + -- xiangfu liu Tue, 30 Jun 2009 14:28:36 +0800 diff --git a/usbboot/debian/control b/usbboot/debian/control index 5aa3563..e4420b8 100644 --- a/usbboot/debian/control +++ b/usbboot/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: xiangfu liu Build-Depends: debhelper (>= 7), libusb-dev, libconfuse-dev Standards-Version: 3.8.0 -Homepage: http://code.google.com/p/pi-project +Homepage: http://github.com/xiangfu/xburst-tools Package: xburst-tools Architecture: any diff --git a/usbboot/debian/copyright b/usbboot/debian/copyright index 38f8de5..cb2736c 100644 --- a/usbboot/debian/copyright +++ b/usbboot/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Xiangfu Liu on Mon, 22 Jun 2009 22:48:14 +0800. -It was downloaded from +It was downloaded from Upstream Author(s): Xiangfu Liu @@ -15,5 +15,3 @@ or (at your option) any later version. On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL-3'. -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/usbboot/src/Makefile.am b/usbboot/src/Makefile.am index b978e47..5888a42 100644 --- a/usbboot/src/Makefile.am +++ b/usbboot/src/Makefile.am @@ -1,9 +1,5 @@ AM_CFLAGS = -pedantic -Wall -W -O1 -g3 -std=gnu99 -lusb -lconfuse -BUILD_BRANCH := $(shell git branch | grep ^\* | cut -d' ' -f2) -BUILD_HEAD := $(shell git show --pretty=oneline | head -n1 | cut -d' ' -f1 | cut -b1-16) -BUILD_VERSION := ${BUILD_BRANCH}_${BUILD_HEAD} - xburst_tools_version.h: echo -e '#ifndef XBURST_TOOLS_VERSION' \ '\n#define XBURST_TOOLS_VERSION "20090630-1"' \ @@ -22,7 +18,7 @@ data_DATA = ../xburst_stage1/xburst_stage1.bin \ EXTRA_DIST = $(datadir) ../xburst_stage1/xburst_stage1.bin: - $(MAKE) -C ../xburst_stage1 + $(MAKE) CROSS_COMPILE=mipsel-openwrt-linux- -C ../xburst_stage1 ../xburst_stage2/xburst_stage2.bin: - $(MAKE) -C ../xburst_stage2 + $(MAKE) CROSS_COMPILE=mipsel-openwrt-linux- -C ../xburst_stage2