Skip to content
Snippets Groups Projects
Commit 37f1248d authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

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

parent 1b331343
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,7 @@ unpatch: FORCE ...@@ -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 ...@@ -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 ...@@ -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
......
...@@ -12,7 +12,7 @@ PREP_MK= OPENWRT_BUILD= QUIET=0 ...@@ -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)))
......
#!/bin/sh
echo "r$(git --git-dir="$1"/.git/modules/openwrt log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment