[Armadeus-commitlog] SF.net SVN: armadeus:[944] trunk/Makefile

[<ar...@us...>]

Revision: 944
          http://armadeus.svn.sourceforge.net/armadeus/?rev=944&view=rev
Author:   artemys
Date:     2008-12-11 12:47:33 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
[BUILD] Add config-merge target to main Makefile. This will help merging important config files (buildroot, linux, uclibc)

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-12-10 16:45:23 UTC (rev 943)
+++ trunk/Makefile	2008-12-11 12:47:33 UTC (rev 944)
@@ -32,6 +32,10 @@
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 
 -include $(BUILDROOT_DIR)/.config
+LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
+BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
+UCLIBC_VERSION:=0.9.29
 
 ARMADEUS_TOPDIR:=$(shell pwd)
 export ARMADEUS_TOPDIR
@@ -39,7 +43,9 @@
 PATCH_DIR=patches
 TAR_OPTIONS=--exclude=.svn -xf 
 
-LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(BR2_GCC_TARGET_ARCH)/$(BR2_BOARD_NAME)/linux-$(BR2_LINUX26_VERSION)
+LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
+UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARCH)/uClibc-$(UCLIBC_VERSION)
+BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
 
 ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
                 echo "                                                   "; \
@@ -162,6 +168,13 @@
 
 buildroot-dirclean:
 	rm -rf $(BUILDROOT_DIR)	
-	
-.PHONY: dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean menuconfig $(BUILDROOT_DIR)/.config
 
+config-merge:
+	kompare $(BUILDROOT_DIR)/.config $(BOARD_DIR)/$(BOARD_NAME)_defconfig
+	kompare $(LINUX_DIR)/.config     $(BOARD_DIR)/$(BOARD_NAME)-linux-$(LINUX_VERSION).config
+	kompare $(UCLIBC_DIR)/.config    $(BOARD_DIR)/uClibc.config.arm
+
+PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
+PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config config-merge
+.PHONY: $(PHONY_TARGETS)
+


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