diff --git a/Makefile b/Makefile
index 3dce862727d1ff1d4008282ce14a959c215a9146..30c0e06f0ee483d7f158f52d4141ceef543132c7 100644
--- a/Makefile
+++ b/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
diff --git a/include/gluon.mk b/include/gluon.mk
index a9ad6e2ab73fa96a85064e4408256e36159adbd4..2b4c8d195d726a075b1fba53f803a81311be4445 100644
--- a/include/gluon.mk
+++ b/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
diff --git a/patches/openwrt/0002-Make-Unifi-images-flashable.patch b/patches/openwrt/0001-Make-Unifi-images-flashable.patch
similarity index 100%
rename from patches/openwrt/0002-Make-Unifi-images-flashable.patch
rename to patches/openwrt/0001-Make-Unifi-images-flashable.patch
diff --git a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependency.patch b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependency.patch
deleted file mode 100644
index c686df058739e96c626055cc5ef868937ad703b7..0000000000000000000000000000000000000000
--- a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependency.patch
+++ /dev/null
@@ -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` $@; \
diff --git a/patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch b/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
rename to patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker.patch b/patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker.patch
rename to patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0005-package-base-files-change-sysctl-handling.patch b/patches/openwrt/0004-package-base-files-change-sysctl-handling.patch
similarity index 100%
rename from patches/openwrt/0005-package-base-files-change-sysctl-handling.patch
rename to patches/openwrt/0004-package-base-files-change-sysctl-handling.patch
diff --git a/patches/openwrt/0006-Fix-ping6-sender-address.patch b/patches/openwrt/0005-Fix-ping6-sender-address.patch
similarity index 100%
rename from patches/openwrt/0006-Fix-ping6-sender-address.patch
rename to patches/openwrt/0005-Fix-ping6-sender-address.patch
diff --git a/patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch b/patches/openwrt/0006-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
rename to patches/openwrt/0006-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch b/patches/openwrt/0007-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
rename to patches/openwrt/0007-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch b/patches/openwrt/0008-ar71xx-build-image-for-the-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch
rename to patches/openwrt/0008-ar71xx-build-image-for-the-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch b/patches/openwrt/0009-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
rename to patches/openwrt/0009-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch b/patches/openwrt/0010-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
rename to patches/openwrt/0010-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch b/patches/openwrt/0011-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
similarity index 100%
rename from patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
rename to patches/openwrt/0011-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
diff --git a/patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch b/patches/openwrt/0012-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
rename to patches/openwrt/0012-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch b/patches/openwrt/0013-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
similarity index 100%
rename from patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
rename to patches/openwrt/0013-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
diff --git a/patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch b/patches/openwrt/0014-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
rename to patches/openwrt/0014-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch b/patches/openwrt/0015-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
similarity index 100%
rename from patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
rename to patches/openwrt/0015-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
diff --git a/patches/openwrt/0017-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch b/patches/openwrt/0016-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0017-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
rename to patches/openwrt/0016-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch b/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch
similarity index 100%
rename from patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch
rename to patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch
diff --git a/patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch b/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
similarity index 100%
rename from patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
rename to patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
diff --git a/patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch b/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch
similarity index 100%
rename from patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch
rename to patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch
diff --git a/scripts/configure.pl b/scripts/configure.pl
deleted file mode 100755
index 58242e17c6be057983dcda871f41048d83b82e8c..0000000000000000000000000000000000000000
--- a/scripts/configure.pl
+++ /dev/null
@@ -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;
diff --git a/scripts/generate.pl b/scripts/generate.pl
deleted file mode 100644
index 222ff77a1d3c41960274bb9d90281bd2641d11b8..0000000000000000000000000000000000000000
--- a/scripts/generate.pl
+++ /dev/null
@@ -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;
-}
diff --git a/scripts/generate.sh b/scripts/generate.sh
deleted file mode 100755
index 667df4003a0428fadbf7ecff5e713315f247c867..0000000000000000000000000000000000000000
--- a/scripts/generate.sh
+++ /dev/null
@@ -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