[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2540-gb37a125

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b37a1259a1e410dff312ad1a1fa2378a071dfbf2 (commit)
      from  5721600386f66e3d07902a3cd90df39db0464352 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b37a1259a1e410dff312ad1a1fa2378a071dfbf2
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Oct 13 14:34:07 2011 +0200

    [BUILD] Add script to export/save minified Linux kernel configs

-----------------------------------------------------------------------

Summary of changes:
 Makefile                       |    2 ++
 Makefile.in                    |    2 ++
 scripts/export_linux_config.sh |   29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100755 scripts/export_linux_config.sh

diff --git a/Makefile b/Makefile
index 0374289..eb10c00 100644
--- a/Makefile
+++ b/Makefile
@@ -206,6 +206,8 @@ shell_env:
 	@echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_LINUX_CONFIG=$(ARMADEUS_LINUX_CONFIG) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_ROOTFS_DIR=$(ARMADEUS_ROOTFS_DIR) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index 61ac4d3..73dbfa7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@ BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
 -include $(BUILDROOT_DIR)/.config
 
 ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
+ARMADEUS_LINUX_MAIN_VERSION:=$(shell echo $(ARMADEUS_LINUX_VERSION) | cut -d . -f 1-3)
 ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
 ARMADEUS_LIBC_NAME=unknown
 ARMADEUS_LIBC_VERSION=X.Y
@@ -65,6 +66,7 @@ ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
 ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
 ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
+ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
 ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
 ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
diff --git a/scripts/export_linux_config.sh b/scripts/export_linux_config.sh
new file mode 100755
index 0000000..2253751
--- /dev/null
+++ b/scripts/export_linux_config.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+pwd
+make shell_env
+source ./armadeus_env.sh
+
+if [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.29" ]; then
+	echo "Not supported for this kernel version ($ARMADEUS_LINUX_MAIN_VERSION)"
+	exit 1
+fi
+
+cd $ARMADEUS_LINUX_DIR
+make savedefconfig
+if [ $? != 0 ]; then
+	echo "Failed to save defconfig"
+	exit 1
+fi
+cd -
+
+echo "Please enter your favorite merge tool (ex: kompare, vimdiff, etc...)"
+read -p "> " DIFFTOOL
+
+if [ "$DIFFTOOL" == "" ]; then
+	DIFFTOOL=kompare
+fi
+echo "Using: $DIFFTOOL"
+$DIFFTOOL $ARMADEUS_LINUX_DIR/defconfig $ARMADEUS_LINUX_CONFIG
+
+exit 0


hooks/post-receive
-- 
armadeus