[Balloon-svn] r1219 - balloon/branches/menuconfig

Author: nick
Date: 2010-09-03 14:39:39 +0100 (Fri, 03 Sep 2010)
New Revision: 1219

Modified:
balloon/branches/menuconfig/Makefile
balloon/branches/menuconfig/Makefile.conf
balloon/branches/menuconfig/Makefile.local
balloon/branches/menuconfig/Makefile.tools
Log:
add target dist support and multistrap version checking

Modified: balloon/branches/menuconfig/Makefile
===================================================================
--- balloon/branches/menuconfig/Makefile    2010-09-03 13:38:03 UTC (rev 1218)
+++ balloon/branches/menuconfig/Makefile    2010-09-03 13:39:39 UTC (rev 1219)
@@ -26,11 +26,9 @@
 ifdef CONF

 all: setup buildenv config
-    @echo building all

else

-
 all: setup buildenv
     for subdir in $(SUBDIRS); do\
                 (cd $$subdir && $(MAKE) $@) || exit 1;\

Modified: balloon/branches/menuconfig/Makefile.conf
===================================================================
--- balloon/branches/menuconfig/Makefile.conf    2010-09-03 13:38:03 UTC (rev 1218)
+++ balloon/branches/menuconfig/Makefile.conf    2010-09-03 13:39:39 UTC (rev 1219)
@@ -20,6 +20,8 @@

endif

+PACKAGEDIR:=$(CHECKOUT)/package
+
 MAKEOPTS:=
 ifdef BR2_MAKE_JOBS
 MAKEOPTS=-j $(BR2_MAKE_JOBS)
@@ -73,6 +75,7 @@
     fi

TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+TARGETS_DIST:=$(patsubst %,%-dist,$(TARGETS))
TARGETS_DISTCLEAN:=$(patsubst %,%-distclean,$(TARGETS))
TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
@@ -84,8 +87,10 @@

config-distclean: $(TARGETS_DISTCLEAN)

+config-dist: $(TARGETS_DIST)
+
config-source: $(TARGETS_SOURCE)

config-install: $(TARGETS_INSTALL)

-.phony: config config-clean config-distclean config-source config-install defconfig defconfig-sl40
+.phony: config config-clean config-distclean config-source config-install defconfig

Modified: balloon/branches/menuconfig/Makefile.local
===================================================================
--- balloon/branches/menuconfig/Makefile.local    2010-09-03 13:38:03 UTC (rev 1218)
+++ balloon/branches/menuconfig/Makefile.local    2010-09-03 13:39:39 UTC (rev 1219)
@@ -1,3 +1,5 @@
+XILINX-TOOLS=/usr/share/xilinx/
+
 -include $(CHECKOUT)/Makefile.conf

ifndef CONF

Modified: balloon/branches/menuconfig/Makefile.tools
===================================================================
--- balloon/branches/menuconfig/Makefile.tools    2010-09-03 13:38:03 UTC (rev 1218)
+++ balloon/branches/menuconfig/Makefile.tools    2010-09-03 13:39:39 UTC (rev 1219)
@@ -43,8 +43,10 @@

 multistrap:
     #testing if $@ is installed - install it if the build stops here
-    /usr/sbin/multistrap --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install multistrap; fi
+    /usr/sbin/multistrap --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install multistrap; fi
+    dpkg --compare-versions `dpkg-query -W -f '$${Version}' multistrap` '>=' "2.1.5~tcl+1" || exit 2

+
 debhelper:
     #testing if $@ is installed - install it if the build stops here
     test -x /usr/bin/dh_testversion &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install debhelper; fi