From 9e6e137925f9f34c17c1482de4b1c2aa4e32b967 Mon Sep 17 00:00:00 2001 From: Jean-Philippe SAVE Date: Wed, 21 Nov 2012 12:03:22 +0100 Subject: polux: reorder bundle Makefile to be able to compile on HEAD, refs #3476 --- polux/Makefile | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'polux/Makefile') diff --git a/polux/Makefile b/polux/Makefile index 45828b201e..8e5dba6495 100644 --- a/polux/Makefile +++ b/polux/Makefile @@ -435,31 +435,24 @@ VERSION_TAG:=$(shell git status > /dev/null; git describe --dirty --always) BUNDLE_DIR:=../SPiDBundle-$(VERSION_TAG) bundle: + #create bundle directory rm -rf $(BUNDLE_DIR) mkdir -p $(BUNDLE_DIR) git archive --format=tar HEAD | (cd $(BUNDLE_DIR) && tar x) - rm -f $(BUNDLE_DIR)/.hg* - rm -f $(BUNDLE_DIR)/.gitignore + #suppress unused directories rm -rf $(BUNDLE_DIR)/devkit rm -rf $(BUNDLE_DIR)/toolkit rm -rf $(BUNDLE_DIR)/ppc_spc200c_defconfig rm -rf $(BUNDLE_DIR)/ppc_spc200e_defconfig rm -rf $(BUNDLE_DIR)/all_mse500dini_200_defconfig rm -rf $(BUNDLE_DIR)/slave_mse500dini_200_defconfig - mkdir -p $(BUNDLE_DIR)/binaries - mkdir -p $(BUNDLE_DIR)/include/plc-drv - make -C $(PLC_DIR) clean plc_drv-headers - cp -u $(INCLUDE_DIR)/plc-drv/plc_sysctl.h $(BUNDLE_DIR)/include/plc-drv - cp -u $(INCLUDE_DIR)/plc-drv/plc_ioctl.h $(BUNDLE_DIR)/include/plc-drv - cp -u $(INCLUDE_DIR)/plc-drv/plc_drv_if.h $(BUNDLE_DIR)/include/plc-drv - cp -u $(INCLUDE_DIR)/plc-drv/ioctl-interface.h $(BUNDLE_DIR)/include/plc-drv - cp -u $(INCLUDE_DIR)/plc-drv/pmd.h $(BUNDLE_DIR)/include/plc-drv - cp -u $(INCLUDE_DIR)/plc-drv/version.h $(BUNDLE_DIR)/include/plc-drv/ - cp -u $(INCLUDE_DIR)/plc-drv/eoc_stats.h $(BUNDLE_DIR)/include/plc-drv/ + #prepare linux-kernel part $(BUNDLE_DIR)/linux-2.6.10/scripts/cpincludes $(BUNDLE_DIR)/linux-2.6.10 rm -f $(BUNDLE_DIR)/linux-2.6.10/scripts/cpincludes rm -f $(BUNDLE_DIR)/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore + #generate plc binaries # make mrproper + mkdir -p $(BUNDLE_DIR)/binaries make slave_spc200e_defconfig make devkit make mrproper @@ -478,6 +471,19 @@ bundle: make all_mse500_200_defconfig make devkit cp $(BINARIES_DIR)/* $(BUNDLE_DIR)/binaries + mkdir -p $(BUNDLE_DIR)/include/plc-drv + make -C $(PLC_DIR) clean plc_drv-headers + cp -u $(INCLUDE_DIR)/plc-drv/plc_sysctl.h $(BUNDLE_DIR)/include/plc-drv + cp -u $(INCLUDE_DIR)/plc-drv/plc_ioctl.h $(BUNDLE_DIR)/include/plc-drv + cp -u $(INCLUDE_DIR)/plc-drv/plc_drv_if.h $(BUNDLE_DIR)/include/plc-drv + cp -u $(INCLUDE_DIR)/plc-drv/ioctl-interface.h $(BUNDLE_DIR)/include/plc-drv + cp -u $(INCLUDE_DIR)/plc-drv/pmd.h $(BUNDLE_DIR)/include/plc-drv + cp -u $(INCLUDE_DIR)/plc-drv/version.h $(BUNDLE_DIR)/include/plc-drv/ + cp -u $(INCLUDE_DIR)/plc-drv/eoc_stats.h $(BUNDLE_DIR)/include/plc-drv/ + #final clean + rm -f $(BUNDLE_DIR)/.hg* + rm -f $(BUNDLE_DIR)/.gitignore + #create the bundle archive tar -cf $(BUNDLE_DIR).tar $(BUNDLE_DIR) bzip2 $(BUNDLE_DIR).tar -- cgit v1.2.3