nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove modules.local support

Browse Source 
This feature wasn't really thought through, so let's just remove it...
This commit is contained in:
Matthias Schiffer 2014-01-03 13:16:09 +01:00
parent 7537464262
commit 298b78086c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -39,8 +39,6 @@ rerun
make update 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 `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` `patches`; the resulting branch will be called `patched`, while the commit specified in `modules`
can be refered to by the branch `base`. 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. 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 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! commits, making `git reflog` the only way to recover them!

3
modules
View File

@ -14,6 +14,3 @@ PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370
PACKAGES_LUCI_REPO=https://github.com/freifunk-gluon/luci.git PACKAGES_LUCI_REPO=https://github.com/freifunk-gluon/luci.git
PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003 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