From 298b78086c3e9bd6bded55d9e8dc37ce7a3b45ea Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 3 Jan 2014 13:16:09 +0100 Subject: [PATCH] Remove modules.local support This feature wasn't really thought through, so let's just remove it... --- README.md | 4 +--- modules | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b5800d7..a3f9340c 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ rerun make update -The repository paths may be changed locally by creating a file `modules.local`. - `make update` also applies the patches that can be found in the directories found in `patches`; the resulting branch will be called `patched`, while the commit specified in `modules` can be refered to by the branch `base`. @@ -64,4 +62,4 @@ If applying a patch fails because you have changed the base commit, the reposito and you can try rebasing it onto the new `base` branch yourself and after that call `make update-patches` to fix the problem. Always call `make update-patches` after making changes to a module repository as `make update` will overwrite your -commits, making `git reflog` the only way to recover them! \ No newline at end of file +commits, making `git reflog` the only way to recover them! diff --git a/modules b/modules index 730191df..934a4474 100644 --- a/modules +++ b/modules @@ -14,6 +14,3 @@ PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 PACKAGES_LUCI_REPO=https://github.com/freifunk-gluon/luci.git PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003 - -# It is possible to change the values defined in this file in a new file `modules.local` -if [ -f modules.local ]; then . ./modules.local; fi