From 451a887894faddef019e9a0628c21b5f2e9eee56 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Feb 2012 12:58:25 +0100 Subject: Makefile: use /etc/os-release for version info rather than /etc/br-version /etc/os-release is becoming a standard interface for distribution name/version info, so let's use that instead of the nonstandard /etc/br-version. Format of the file is something like: NAME=Buildroot VERSION=2012.02-rc1-00003-g2d10e81 ID=buildroot VERSION_ID=2012.02-rc1 PRETTY_NAME="Buildroot 2012.02-rc1" For more details, see: http://0pointer.de/public/systemd-man/os-release.html Signed-off-by: Peter Korsgaard --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d8dd2ed2..8a8b6760c 100644 --- a/Makefile +++ b/Makefile @@ -477,7 +477,13 @@ 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),"") $(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR) -- cgit v1.2.3 From eb8fad28055b94906e0690f4ae789fbd30bafd17 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 17 Feb 2012 17:12:48 +0100 Subject: Print a message before executing the post-build script Signed-off-by: Luca Ceresoli Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8a8b6760c..d5cd8f03d 100644 --- a/Makefile +++ b/Makefile @@ -486,6 +486,7 @@ endif ) > $(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 -- cgit v1.2.3 From ed7791e2e8cdade564a5f484cdfe62ffe16cb981 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 Feb 2012 23:18:03 +0100 Subject: Makefile: move cmake toolchain file to $HOST_DIR/usr/share/buildroot To make it part of the SDK installation. Signed-off-by: Peter Korsgaard --- Makefile | 5 +++-- package/Makefile.cmake.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d5cd8f03d..9a07f9f79 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\ diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in index 38e459b80..aea118519 100644 --- a/package/Makefile.cmake.in +++ b/package/Makefile.cmake.in @@ -72,7 +72,7 @@ define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ - -DCMAKE_TOOLCHAIN_FILE="$$(BASE_DIR)/toolchainfile.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ $$($$(PKG)_CONF_OPT) \ ) -- cgit v1.2.3