Merge pull request #237 from freifunk-berlin/features/backport_cpe

Features/backport cpe

Makefile

@@ -93,9 +93,11 @@ firmwares: stamp-clean-firmwares .stamp-firmwares
 .stamp-firmwares: .stamp-compiled
 	rm -rf $(IB_BUILD_DIR)
 	mkdir -p $(IB_BUILD_DIR)
+	$(eval TOOLCHAIN_PATH := $(shell printf "%s:" $(OPENWRT_DIR)/staging_dir/toolchain-*/bin))
 	$(eval IB_FILE := $(shell ls $(OPENWRT_DIR)/bin/$(MAINTARGET)/OpenWrt-ImageBuilder-$(TARGET)*.tar.bz2))
 	$(eval IB_DIR := $(shell basename $(IB_FILE) .tar.bz2))
 	cd $(IB_BUILD_DIR); tar xf $(IB_FILE)
+	export PATH=$(PATH):$(TOOLCHAIN_PATH); \
 	PACKAGES_PATH="$(FW_DIR)/packages"; \
 	for PROFILE in $(PROFILES); do \
 	  for PACKAGES_FILE in $(PACKAGES_LIST_DEFAULT); do \
@@ -120,12 +122,12 @@ firmwares: stamp-clean-firmwares .stamp-firmwares
 	  rm -rf $$TARGET_DIR; \
 	  mv $$DIR_ABS $$TARGET_DIR; \
 	done;
-	# copy imagebuilder
-	cp -a $(IB_FILE) $(FW_TARGET_DIR)/; \
+	# copy imagebuilder, sdk and toolchain (if existing)
+	cp -a $(OPENWRT_DIR)/bin/$(MAINTARGET)/OpenWrt-*.tar.bz2 $(FW_TARGET_DIR)/
 	# copy packages
-	$(eval PACKAGES_DIR := "$(FW_TARGET_DIR)/packages")
-	rm -rf $(PACKAGES_DIR)
-	cp -a $(OPENWRT_DIR)/bin/$(MAINTARGET)/packages $(PACKAGES_DIR)
+	PACKAGES_DIR="$(FW_TARGET_DIR)/packages"; \
+	rm -rf $$PACKAGES_DIR; \
+	cp -a $(OPENWRT_DIR)/bin/$(MAINTARGET)/packages $$PACKAGES_DIR
 	rm -rf $(IB_BUILD_DIR)
 	touch $@
 

configs/ar71xx.config

@@ -130,6 +130,7 @@ CONFIG_PACKAGE_openvpn-polarssl=m
 CONFIG_PACKAGE_px5g=m
 CONFIG_PACKAGE_qos-scripts=m
 CONFIG_PACKAGE_rrdtool1=m
+CONFIG_PACKAGE_rssileds=m
 CONFIG_PACKAGE_tc=m
 CONFIG_PACKAGE_tcpdump=m
 CONFIG_PACKAGE_tcpdump-mini=m
@@ -142,6 +143,7 @@ CONFIG_PACKAGE_uhttpd-mod-tls_polarssl=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=m
 CONFIG_PACKAGE_vnstat=m
 CONFIG_PACKAGE_zlib=m
+CONFIG_SDK=y
 CONFIG_SSP_SUPPORT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_DIST="Freifunk Berlin"