nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some more fixes and some checks for the new module system

Browse Source
This commit is contained in:
Matthias Schiffer 2013-12-28 22:13:18 +01:00
parent 1b33134353
commit 37f1248d3d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -30,6 +30,7 @@ unpatch: FORCE
$(GLUONDIR)/scripts/unpatch.sh $(GLUONDIR) $(GLUONDIR)/scripts/unpatch.sh $(GLUONDIR)
update-patches: FORCE update-patches: FORCE
$(GLUONDIR)/scripts/update.sh $(GLUONDIR)
$(GLUONDIR)/scripts/update-patches.sh $(GLUONDIR) $(GLUONDIR)/scripts/update-patches.sh $(GLUONDIR)
$(GLUONDIR)/scripts/patch.sh $(GLUONDIR) $(GLUONDIR)/scripts/patch.sh $(GLUONDIR)
@ -38,9 +39,8 @@ update-patches: FORCE
_SINGLE=export MAKEFLAGS=$(space); _SINGLE=export MAKEFLAGS=$(space);
override OPENWRT_BUILD=1 override OPENWRT_BUILD=1
override REVISION:=$(shell $(GLUONDIR)/scripts/openwrt_rev.sh $(GLUONDIR))
GREP_OPTIONS= GREP_OPTIONS=
export OPENWRT_BUILD GREP_OPTIONS REVISION export OPENWRT_BUILD GREP_OPTIONS
-include $(TOPDIR)/include/debug.mk -include $(TOPDIR)/include/debug.mk
-include $(TOPDIR)/include/depends.mk -include $(TOPDIR)/include/depends.mk
@ -53,20 +53,27 @@ endef
include $(GLUONDIR)/include/profiles.mk include $(GLUONDIR)/include/profiles.mk
CheckExternal := test -d $(GLUON_OPENWRTDIR) || (echo 'You don'"'"'t seem to have optained the external repositories needed by Gluon; please call `make update` first!'; false)
all: FORCE all: FORCE
+@$(CheckExternal)
+@$(GLUONMAKE) prepare +@$(GLUONMAKE) prepare
+@$(GLUONMAKE) images +@$(GLUONMAKE) images
download prepare images: FORCE download prepare images: FORCE
+@$(CheckExternal)
+@$(GLUONMAKE) $@ +@$(GLUONMAKE) $@
dirclean: clean dirclean: clean
+@$(CheckExternal)
+@$(SUBMAKE) -C $(TOPDIR) -r dirclean +@$(SUBMAKE) -C $(TOPDIR) -r dirclean
cleanall: clean cleanall: clean
+@$(CheckExternal)
+@$(SUBMAKE) -C $(TOPDIR) -r clean +@$(SUBMAKE) -C $(TOPDIR) -r clean
clean: clean:
+@$(CheckExternal)
+@$(GLUONMAKE) clean +@$(GLUONMAKE) clean
else else

2
include/toplevel.mk
View File

@ -12,7 +12,7 @@ PREP_MK= OPENWRT_BUILD= QUIET=0
-include $(TOPDIR)/include/verbose.mk -include $(TOPDIR)/include/verbose.mk
REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) REVISION:=$(shell $(TOPDIR)/scripts/getver.sh 2>/dev/null)
HOSTCC ?= gcc HOSTCC ?= gcc
OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION))) OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))

3
scripts/openwrt_rev.sh
View File

@ -1,3 +0,0 @@
#!/bin/sh
echo "r$(git --git-dir="$1"/.git/modules/openwrt log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"