aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2012-03-01 14:05:41 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2012-03-01 14:05:41 +0100
commit7a58ed7317573f23da2e2ad822003705db85a58f (patch)
treea8ff3dd8f4c40c5d875cc884e79cb5a04e92540b /Makefile
parent9fc43591447c8c8c61843f1f537660855b6d049b (diff)
parent97165f123bd67b8d1a9a0a3bb41f2c4b8475156d (diff)
downloadbuildroot-7a58ed7317573f23da2e2ad822003705db85a58f.tar.gz
buildroot-7a58ed7317573f23da2e2ad822003705db85a58f.tar.bz2
Merge branch 'next'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bf7a6f4769..d508888b37 100644
--- a/Makefile
+++ b/Makefile
@@ -368,7 +368,7 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
-$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake
+$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
@@ -377,7 +377,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
-$(O)/toolchainfile.cmake:
+$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
+ mkdir -p $(@D)
@echo -en "\
set(CMAKE_SYSTEM_NAME Linux)\n\
set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
@@ -477,9 +478,16 @@ endif
else \
/sbin/ldconfig -r $(TARGET_DIR); \
fi
- echo $(BR2_VERSION_FULL) > $(TARGET_DIR)/etc/br-version
+ ( \
+ echo "NAME=Buildroot"; \
+ echo "VERSION=$(BR2_VERSION_FULL)"; \
+ echo "ID=buildroot"; \
+ echo "VERSION_ID=$(BR2_VERSION)"; \
+ echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
+ ) > $(TARGET_DIR)/etc/os-release
ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
+ @$(call MESSAGE,"Executing post-build script")
$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
endif