From 63059c7e8f40bd3db31a9114c08c546e8a1e3746 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 22 Apr 2015 20:51:29 +0200
Subject: [PATCH] Switch to new reduced gluon package module
---
Makefile | 5 +++--
modules | 2 +-
scripts/check_site.sh | 2 +-
scripts/site.sh | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index b5f4305b7..7f5fd437e 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,8 @@ feeds: FORCE
rm -rf $(TOPDIR)/package/feeds
mkdir $(TOPDIR)/package/feeds
[ ! -f $(GLUON_SITEDIR)/modules ] || . $(GLUON_SITEDIR)/modules && for feed in $$GLUON_SITE_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/$$feed; done
- . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/$$feed; done
+ ln -s ../../../package $(TOPDIR)/package/feeds/gluon
+ . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/module_$$feed; done
+$(GLUONMAKE_EARLY) prepare-tmpinfo
config: FORCE
@@ -284,7 +285,7 @@ prepare-image: FORCE
+$(SUBMAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image -f $(GLUONDIR)/include/Makefile.image prepare KDIR="$(BOARD_KDIR)"
prepare: FORCE
- @$(STAGING_DIR_HOST)/bin/lua $(GLUONDIR)/packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua \
+ @$(STAGING_DIR_HOST)/bin/lua $(GLUONDIR)/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua \
|| (echo 'Your site configuration did not pass validation.'; false)
mkdir -p $(GLUON_IMAGEDIR) $(BOARD_BUILDDIR)
diff --git a/modules b/modules
index 04e3f0f4b..d574193ae 100644
--- a/modules
+++ b/modules
@@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=01fcd1f29174a56d6ddb59901ed8c67ea42c3a8f
PACKAGES_OPENWRT_BRANCH=for-14.07
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=6f4e75c6405ac028ddac17e80d3b09cdefae3391
+PACKAGES_GLUON_COMMIT=db5699bede2e1223624a0d87c9ae91219b08572d
PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=5d4ad63897b435d5df0f39a49bd58962c22c33b8
diff --git a/scripts/check_site.sh b/scripts/check_site.sh
index 17ee4b56d..e0aa43e57 100755
--- a/scripts/check_site.sh
+++ b/scripts/check_site.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-SITE_CONFIG_LUA=packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
+SITE_CONFIG_LUA=package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
CHECK_SITE_LIB=scripts/check_site_lib.lua
"$GLUONDIR"/openwrt/staging_dir/host/bin/lua -e "site = dofile(os.getenv('GLUONDIR') .. '/${SITE_CONFIG_LUA}'); dofile(os.getenv('GLUONDIR') .. '/${CHECK_SITE_LIB}'); dofile()"
diff --git a/scripts/site.sh b/scripts/site.sh
index c523da204..82016cbe5 100755
--- a/scripts/site.sh
+++ b/scripts/site.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-SITE_CONFIG_LUA=packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
+SITE_CONFIG_LUA=package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
"$GLUONDIR"/openwrt/staging_dir/host/bin/lua -e "print(assert(dofile(os.getenv('GLUONDIR') .. '/${SITE_CONFIG_LUA}').$1))" 2>/dev/null
--
GitLab