aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-12-13 06:25:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-12-13 06:25:54 +0000
commit51996a78f1abc9a57feeb98bf4cad6e8faec05a3 (patch)
tree1e2aac02c0eadeee0856f723ae58c5db5fa52418 /package/base-files/Makefile
parent084c9abec3a213f17a9abdf1292e4ecc1cbcd496 (diff)
downloadupstream-51996a78f1abc9a57feeb98bf4cad6e8faec05a3.tar.gz
upstream-51996a78f1abc9a57feeb98bf4cad6e8faec05a3.tar.bz2
upstream-51996a78f1abc9a57feeb98bf4cad6e8faec05a3.zip
clean up openwrt version handling, use a separate script that is executed at the beginning of the build process, fix revision checking with git
SVN-Revision: 9723
Diffstat (limited to 'package/base-files/Makefile')
-rw-r--r--package/base-files/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 3e83c01d93..091ce0f016 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -14,14 +14,10 @@ PKG_RELEASE:=12
PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifeq ($(REV),)
- REV:=0
-endif
include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1)
- TARGET:=-$(BOARD)-$(KERNEL)
+ TARGET:=-$(BOARD)
LIBGCC_VERSION:=$(GCC_VERSION)
else
UCLIBC_VERSION:=<UCLIBC_VERSION>
@@ -35,7 +31,7 @@ define Package/base-files$(TARGET)
CATEGORY:=Base system
TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/
- VERSION:=$(PKG_RELEASE)-$(REV)
+ VERSION:=$(PKG_RELEASE)-$(REVISION)
$(call Config,network.lan.proto,string,static,LAN Protocol)
$(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
$(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
@@ -138,7 +134,7 @@ define Package/base-files$(TARGET)/install
$(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
fi \
)
- $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
+ $(SED) 's,$$$$R,r$(REVISION),g' $(1)/etc/banner
$(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
mkdir -p $(1)/dev
mkdir -p $(1)/etc/crontabs