Skip to content

Commit

Permalink
Merge pull request freifunk-gluon#296 from freifunk-berlin/revert-267…
Browse files Browse the repository at this point in the history
…-feature_describe-version

Revert: "[Makefile] describe version" (breaks filenames and migration)
  • Loading branch information
sarumpaet committed Nov 1, 2015
2 parents 00b8ba8 + 2bd373c commit 99780bd
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ include config.mk
MAINTARGET=$(word 1, $(subst _, ,$(TARGET)))
SUBTARGET=$(word 2, $(subst _, ,$(TARGET)))

VERSION=$(shell git describe --tags --long --dirty --match 'v[0-9].[0-9].[0-9]*')
REVISION=$(shell git log -1 --format=format:%h)

# set dir and file names
FW_DIR=$(shell pwd)
OPENWRT_DIR=$(FW_DIR)/openwrt
Expand Down Expand Up @@ -73,14 +70,12 @@ patch: stamp-clean-patched .stamp-patched
# openwrt config
$(OPENWRT_DIR)/.config: .stamp-feeds-updated $(TARGET_CONFIG)
cp $(TARGET_CONFIG) $(OPENWRT_DIR)/.config
echo "CONFIG_VERSION_NUMBER=\"$(VERSION)\"" >> $(OPENWRT_DIR)/.config
$(UMASK); \
$(MAKE) -C $(OPENWRT_DIR) defconfig

# prepare openwrt working copy
prepare: stamp-clean-prepared .stamp-prepared
.stamp-prepared: .stamp-patched $(OPENWRT_DIR)/.config
sed -i 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(OPENWRT_DIR)/include/version.mk
touch $@

# compile
Expand Down

0 comments on commit 99780bd

Please sign in to comment.