implement Gluon build-framework

.gitignore

@@ -5,3 +5,4 @@ bin
 ^openwrt
 firmwares
 dl
+/packages

Makefile

@@ -28,7 +28,7 @@ $(info special actions apply to builds on this host ...)
 endif
 
 # test for existing $TARGET-config or abort
-ifeq ($(wildcard $(FW_DIR)/configs/$(TARGET).config),)
+ifeq ($(wildcard $(FW_DIR)/targets/$(TARGET)),)
 $(error config for $(TARGET) not defined)
 endif
 
@@ -40,17 +40,17 @@ PROFILES=$(shell cat $(FW_DIR)/profiles/$(MAINTARGET)-$(SUBTARGET).profiles)
 
 FW_REVISION=$(shell $(REVISION))
 
-define FEEDS
- $(shell ./scripts/ffberlin_feeds.sh)
-endef
-
 default: firmwares
 
 ## Gluon - Begin
 # compatibility to Gluon.buildsystem
 # * setup required makros and variables
 # * create the modules-file from config.mk and feeds.conf
 
+LC_ALL:=C
+LANG:=C
+export LC_ALL LANG
+
 # check for spaces & resolve possibly relative paths
 define mkabspath
  ifneq (1,$(words [$($(1))]))
@@ -61,53 +61,96 @@ endef
 
 # initialize (possibly already user set) directory variables
 GLUON_TMPDIR ?= tmp
+GLUON_TARGETSDIR ?= targets
 GLUON_PATCHESDIR ?= patches
 
 $(eval $(call mkabspath,GLUON_TMPDIR))
+$(eval $(call mkabspath,GLUON_TARGETSDIR))
 $(eval $(call mkabspath,GLUON_PATCHESDIR))
 
-export GLUON_TMPDIR GLUON_PATCHESDIR
-
-# use .stamp-gluon-module-openwrt and .stamp-gluon-module- of each feed to create modules-file
-$(FW_DIR)/modules: $(addprefix .stamp-gluon-module-,$(FEEDS)) .stamp-gluon-module-openwrt
-	rm -f $@
-	cat >>$@ .stamp-gluon-module-openwrt
-	cat >>$@ $(addprefix .stamp-gluon-module-,$(FEEDS))
-	echo >>$@ GLUON_FEEDS=\'$(FEEDS)\'
-
-.stamp-gluon-module-openwrt: $(FW_DIR)/config.mk
-	rm -f $@
-	echo >>$@ "OPENWRT_REPO=$(OPENWRT_SRC)"
-	echo >>$@ "OPENWRT_COMMIT=$(OPENWRT_COMMIT)"
-# set the $FEED-Branch
-	git clone $$(grep _REPO $@ | cut -d "=" -f 2) $(GLUON_TMPDIR)/gluon_$@
-	cd $(GLUON_TMPDIR)/gluon_$@; git name-rev --refs openwrt-* $$(grep _COMMIT $(FW_DIR)/$@ | \
-		cut -d "=" -f 2) | cut -d / -f 2 | cut -d \~ -f 1 >branchname.txt
-	cd $(GLUON_TMPDIR)/gluon_$@; grep -q master branchname.txt  || \
-		printf >>$(FW_DIR)/$@ "OPENWRT_BRANCH=%s\n" \
-			$$(echo $* | tr '[:lower:]' '[:upper:]') \
-			$$(cat branchname.txt)
-	rm -rf $(GLUON_TMPDIR)/gluon_$@
-
-.stamp-gluon-module-%: $(FW_DIR)/feeds.conf
-	rm -f $@
-# set the $FEED-REPO
-	@echo -n "PACKAGES_$*_REPO=" | tr '[:lower:]' '[:upper:]' >>$@
-	@grep -E "^src-(git|svn)[[:space:]]$*[[:space:]].*" $(FW_DIR)/feeds.conf | \
-		awk -F '([[:space:]|^])' '{ print $$3 }' >>$@
-# set the $FEED-COMMIT
-	@echo -n "PACKAGES_$*_COMMIT=" | tr '[:lower:]' '[:upper:]' >>$@
-	@grep -E "^src-(git|svn)[[:space:]]$*[[:space:]].*" $(FW_DIR)/feeds.conf | \
-		awk -F '([[:space:]|^])' '{ print $$4 }' >>$@
-# set the $FEED-Branch
-	git clone $$(grep _REPO $@ | cut -d "=" -f 2) $(GLUON_TMPDIR)/gluon_$@
-	cd $(GLUON_TMPDIR)/gluon_$@; git name-rev $$(grep _COMMIT $(FW_DIR)/$@ | \
-		cut -d "=" -f 2) | cut -d / -f 3 | cut -d \~ -f 1 >branchname.txt
-	cd $(GLUON_TMPDIR)/gluon_$@; grep -q master branchname.txt  || \
-		printf >>$(FW_DIR)/$@ "PACKAGES_%s_BRANCH=%s\n" \
-			$$(echo $* | tr '[:lower:]' '[:upper:]') \
-			$$(cat branchname.txt)
-	rm -rf $(GLUON_TMPDIR)/gluon_$@
+GLUON_SITEDIR ?= site
+$(eval $(call mkabspath,GLUON_SITEDIR))
+
+$(GLUON_SITEDIR)/site.mk:
+	$(error No site configuration was found. Please check out a site configuration to $(GLUON_SITEDIR))
+
+include $(GLUON_SITEDIR)/site.mk
+
+export GLUON_RELEASE GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
+	 GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR
+
+GLUON_CONFIG_VARS := \
+	GLUON_SITEDIR='$(GLUON_SITEDIR)' \
+	GLUON_RELEASE='$(GLUON_RELEASE)' \
+	GLUON_BRANCH='$(GLUON_BRANCH)' \
+	GLUON_LANGS='$(GLUON_LANGS)' \
+	BOARD='$(MAINTARGET)' \
+	SUBTARGET='$(SUBTARGET)'
+
+
+CheckTarget := [ '$(BOARD)' ] \
+	|| (echo 'Please set GLUON_TARGET to a valid target. Gluon supports the following targets:'; $(foreach target,$(GLUON_TARGETS),echo ' * $(target)';) false)
+
+GLUON_TARGET := $(TARGET)
+
+
+OPENWRTMAKE = $(MAKE) -C openwrt
+
+GLUON_DEFAULT_PACKAGES := hostapd-mini
+
+GLUON_FEATURE_PACKAGES := $(shell scripts/features.sh '$(GLUON_FEATURES)' || echo '__ERROR__')
+ifneq ($(filter __ERROR__,$(GLUON_FEATURE_PACKAGES)),)
+$(error Error while evaluating GLUON_FEATURES)
+endif
+
+
+GLUON_PACKAGES :=
+define merge_packages
+  $(foreach pkg,$(1),
+    GLUON_PACKAGES := $$(strip $$(filter-out -$$(patsubst -%,%,$(pkg)) $$(patsubst -%,%,$(pkg)),$$(GLUON_PACKAGES)) $(pkg))
+  )
+endef
+#$(eval $(call merge_packages,$(GLUON_DEFAULT_PACKAGES) $(GLUON_FEATURE_PACKAGES) $(GLUON_SITE_PACKAGES)))
+$(eval $(call merge_packages,$(GLUON_DEFAULT_PACKAGES) $(GLUON_SITE_PACKAGES)))
+
+$(info package-src: $(GLUON_DEFAULT_PACKAGES) $(GLUON_FEATURE_PACKAGES) $(GLUON_SITE_PACKAGES))
+$(info packages   : $(GLUON_PACKAGES))
+
+LUA := openwrt/staging_dir/hostpkg/bin/lua
+
+$(LUA):
+	@$(CheckExternal)
+	@$(CheckTarget)
+
+	+@[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
+	+@$(OPENWRTMAKE) tools/install
+	+@$(OPENWRTMAKE) package/lua/host/compile
+
+gluon-config: $(LUA) .stamp-feeds-updated $(OPENWRT_DIR)/dl
+	@$(CheckExternal)
+	@$(GLUON_CONFIG_VARS) FOREIGN_BUILD=ffberlin \
+		$(LUA) scripts/target_config.lua '$(GLUON_TARGET)' '$(GLUON_PACKAGES)' '$(GLUON_EXTRA_PACKAGES) $(GLUON_FEATURE_PACKAGES)'\
+		> openwrt/.config
+	+@$(OPENWRTMAKE) defconfig
+
+	@$(GLUON_CONFIG_VARS) FOREIGN_BUILD=ffberlin \
+		$(LUA) scripts/target_config_check.lua '$(GLUON_TARGET)' '$(GLUON_PACKAGES)' '$(GLUON_EXTRA_PACKAGES)'
+
+gluon-compile: gluon-config
+	+@$(OPENWRTMAKE)
+
+gluon-profiles: $(GLUON_TMPDIR)/$(GLUON_TARGET).packages
+$(GLUON_TMPDIR)/$(GLUON_TARGET).packages: $(LUA) .stamp-feeds-updated $(GLUON_TARGETSDIR)/$(GLUON_TARGET) $(GLUON_SITEDIR/site.mk)
+	@$(CheckExternal)
+	@$(GLUON_CONFIG_VARS) FOREIGN_BUILD=ffberlin \
+		$(LUA) scripts/target_config_profile.lua '$(GLUON_TARGET)' '$(GLUON_PACKAGES) $(GLUON_FEATURE_PACKAGES)'
+
+gluon-images: $(GLUON_TMPDIR)/$(GLUON_TARGET).packages
+# taken from original images  target
+	$(eval IB_FILE := $(shell ls -tr $(OPENWRT_DIR)/bin/targets/$(MAINTARGET)/$(SUBTARGET)/*-imagebuilder-*.tar.xz | tail -n1))
+	mkdir -p $(FW_TARGET_DIR)
+	./scripts/assemble_firmware.sh -b "$(GLUON_TMPDIR)/$(GLUON_TARGET).packages" -i $(IB_FILE) \
+		-e $(FW_DIR)/embedded-files -t $(FW_TARGET_DIR)
 
 ## Gluon - End