Remove things not needed anymore with the new site config

Makefile

@@ -148,7 +148,7 @@ gluon_prepared_stamp := $(BOARD_BUILDDIR)/prepared
 include $(INCLUDE_DIR)/target.mk
 
 
-gluon-tools: $(STAGING_DIR_HOST)/bin/stat package/lua/host/install
+gluon-tools: package/lua/host/install
 
 prepare-tmpinfo: FORCE
 	mkdir -p tmp/info
@@ -210,8 +210,6 @@ dirclean: FORCE
 	+$(SUBMAKE) dirclean
 	rm -rf $(GLUON_BUILDDIR)
 
-export GLUON_GENERATE := $(GLUONDIR)/scripts/generate.sh
-export GLUON_CONFIGURE := $(GLUONDIR)/scripts/configure.pl
 
 export MD5SUM := $(GLUONDIR)/scripts/md5sum.sh
 export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh

include/gluon.mk

@@ -28,9 +28,6 @@ export GLUON_VERSION
 ifeq ($(OPENWRT_BUILD),1)
 ifeq ($(GLUON_TOOLS),1)
 
-GLUON_CONFIG_VERSION := $(shell test -d $(GLUON_SITEDIR) && (cd $(GLUON_SITEDIR) && git describe --always --dirty=.$$($(STAGING_DIR_HOST)/bin/stat -c %Y $(GLUON_SITEDIR)/site.conf) 2>/dev/null || $(STAGING_DIR_HOST)/bin/stat -c %Y site.conf))
-export GLUON_CONFIG_VERSION
-
 CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/attitude_adjustment/12.09/%S/packages)
 export CONFIG_VERSION_REPO
 

patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependency.patch

@@ -1,26 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 7 May 2014 22:57:10 +0200
-Subject: tools/Makefile: fix host tools build dependency
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 2236373..88c0562 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -100,7 +100,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
- 
- 
- define PrepareCommand
--$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
-+$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR_HOST)/.prepared
- 	@mkdir -p "$$(dir $$@)"; rm -f "$$@"
- 	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
- 		echo "Command $(1) not found."; false; \
-@@ -109,7 +109,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
- endef
- endif
- 
--$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR)/.prepared
-+$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR_HOST)/.prepared
- 	@rm -f $@
- 	@if stat --version > /dev/null 2>&1; then \
- 		ln -s `which stat` $@; \

scripts/configure.pl

@@ -1,16 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-use POSIX qw(strftime);
-
-
-sub nightly {
-    strftime "%Y%m%d", localtime;
-}
-
-
-our $CONFIG = do $ENV{GLUONDIR} . '/site/site.conf.pl';
-
-my $script = shift @ARGV;
-do $script;

scripts/generate.pl

@@ -1,33 +0,0 @@
-use warnings;
-
-
-my %config;
-
-sub add_config {
-	my ($prefix, $c) = @_;
-
-	foreach my $key (keys $c) {
-		my $val = $c->{$key};
-
-		if (ref($val) eq 'HASH') {
-			add_config($key . '.', $val);
-		}
-		elsif (ref($val) eq 'ARRAY') {
-			$config{'@' . $prefix . $key . '@'} = join ' ', map {s/'/'\\''/g; "'" . $_ . "'"} @{$val}
-		}
-		unless (ref($val)) {
-			$config{'@' . $prefix . $key . '@'} = $val;
-		}
-	}
-}
-
-add_config('', $CONFIG);
-
-
-my $regex = join '|', map {quotemeta} keys %config;
-
-
-for (<>) {
-	s/($regex)/${config{$1}}/g;
-	print;
-}

scripts/generate.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-declare -a IN
-
-
-for ((i = 1; i < $#; i++)); do
-	IN[$i]="${!i}"
-done
-
-OUT="$(readlink -f "${!#}")"
-
-for S in "${IN[@]}"; do (
-	cd "$(dirname "$S")"
-	NAME="$(basename "$S")"
-	IFS='
-'
-
-	for FILE in $(find "$NAME" -type f); do
-		D="$(dirname "$FILE")"
-
-		mkdir -p "$OUT/$D"
-		(cd "$GLUONDIR"; scripts/configure.pl scripts/generate.pl) < "$FILE" > "$OUT/$FILE"
-		chmod --reference="$FILE" "$OUT/$FILE"
-	done
-); done