From bfcc3d91497c7da75d2e582139e42d6bc1c6479b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Wed, 9 Oct 2013 19:58:28 +0200 Subject: [PATCH] Move package submodules to packages/ --- .gitmodules | 20 ++++++++++---------- LICENSE | 6 +++--- Makefile | 8 ++++---- packages_gluon => packages/gluon | 0 packages_luci => packages/luci | 0 packages_openwrt => packages/openwrt | 0 packages/routing | 1 + packages_routing | 1 - 8 files changed, 18 insertions(+), 18 deletions(-) rename packages_gluon => packages/gluon (100%) rename packages_luci => packages/luci (100%) rename packages_openwrt => packages/openwrt (100%) create mode 160000 packages/routing delete mode 160000 packages_routing diff --git a/.gitmodules b/.gitmodules index 6785426b..dfa3b9eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,16 @@ -[submodule "packages_gluon"] - path = packages_gluon - url = git://github.com/freifunk-gluon/packages.git -[submodule "packages_openwrt"] - path = packages_openwrt - url = git://nbd.name/packages_12.09.git [submodule "openwrt"] path = openwrt url = git://nbd.name/attitude_adjustment.git -[submodule "packages_routing"] - path = packages_routing +[submodule "packages/openwrt"] + path = packages/openwrt + url = git://nbd.name/packages_12.09.git +[submodule "packages/gluon"] + path = packages/gluon + url = git://github.com/freifunk-gluon/packages.git +[submodule "packages/routing"] + path = packages/routing url = https://github.com/openwrt-routing/packages.git -[submodule "packages_luci"] - path = packages_luci +[submodule "packages/luci"] + path = packages/luci url = https://github.com/freifunk-gluon/luci.git branch = luci-0.11 diff --git a/LICENSE b/LICENSE index ee6618bd..adc32281 100644 --- a/LICENSE +++ b/LICENSE @@ -29,6 +29,6 @@ OpenWRT is licensed under the terms of the GNU General Public License Version 2, which can be found under openwrt/LICENSE after the openwrt submodule has been obtained. This applies to the following submodules: * openwrt - * packages_luci - * packages_openwrt - * packages_routing \ No newline at end of file + * packages/openwrt + * packages/routing + * packages/luci diff --git a/Makefile b/Makefile index 96849326..f64819d0 100644 --- a/Makefile +++ b/Makefile @@ -117,10 +117,10 @@ refresh_feeds: FORCE define FEEDS -src-link gluon ../../packages_gluon -src-link packages ../../packages_openwrt -src-link routing ../../packages_routing -src-link luci ../../packages_luci +src-link gluon ../../packages/gluon +src-link packages ../../packages/openwrt +src-link routing ../../packages/routing +src-link luci ../../packages/luci endef export FEEDS diff --git a/packages_gluon b/packages/gluon similarity index 100% rename from packages_gluon rename to packages/gluon diff --git a/packages_luci b/packages/luci similarity index 100% rename from packages_luci rename to packages/luci diff --git a/packages_openwrt b/packages/openwrt similarity index 100% rename from packages_openwrt rename to packages/openwrt diff --git a/packages/routing b/packages/routing new file mode 160000 index 00000000..1c0b3152 --- /dev/null +++ b/packages/routing @@ -0,0 +1 @@ +Subproject commit 1c0b31528970a181327ff9309e3efd1e8c625ff0 diff --git a/packages_routing b/packages_routing deleted file mode 160000 index af1b35bd..00000000 --- a/packages_routing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit af1b35bd8052643869b2658dfcc88b75029099f2 -- GitLab