aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-08 17:00:46 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-08 17:00:46 +0000
commit3ba43e6528779d7f9e582c213298512aad7fdb9e (patch)
tree29819706b0a4a347682744a92d71ea16163df5cb /target
parent342ab781f5c77960c061b1479286dbbe3d3370e0 (diff)
downloadupstream-3ba43e6528779d7f9e582c213298512aad7fdb9e.tar.gz
upstream-3ba43e6528779d7f9e582c213298512aad7fdb9e.tar.bz2
upstream-3ba43e6528779d7f9e582c213298512aad7fdb9e.zip
imagebuilder: add REVISION variable (closes #6795)
SVN-Revision: 20064
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/Makefile3
-rw-r--r--target/imagebuilder/files/Makefile5
2 files changed, 6 insertions, 2 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index d0b6b88b2e..923c1e94b7 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -38,6 +38,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(PKG_BUILD_DIR)/target/linux/*/patches \
$(PKG_BUILD_DIR)/target/linux/*/*/patches
-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
+ echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf
find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index f73642b6ad..49fd6db949 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -1,6 +1,6 @@
# Makefile for OpenWrt
#
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -24,6 +24,9 @@ include rules.mk
include $(INCLUDE_DIR)/debug.mk
include $(INCLUDE_DIR)/depends.mk
+include $(INCLUDE_DIR)/version.mk
+export REVISION
+
define Helptext
Available Commands:
help: This help text