diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-13 06:25:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-13 06:25:54 +0000 |
| commit | f2ea91f2c1499e6e7a8962540385e821f19c2128 (patch) | |
| tree | 0f0417bb685fd2df11ad192254a394cd7401e162 /package | |
| parent | 8ffc910447a1f43d5e13ef9433cfdcf5ff2a5ac4 (diff) | |
clean up openwrt version handling, use a separate script that is executed at the beginning of the build process, fix revision checking with git
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3e83c01d9..091ce0f01 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 |