Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
ffbs-gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ffbs
ffbs-gluon
Commits
298b7808
Commit
298b7808
authored
11 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Remove modules.local support
This feature wasn't really thought through, so let's just remove it...
parent
75374642
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
README.md
+1
-3
1 addition, 3 deletions
README.md
modules
+0
-3
0 additions, 3 deletions
modules
with
1 addition
and
6 deletions
README.md
+
1
−
3
View file @
298b7808
...
...
@@ -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!
This diff is collapsed.
Click to expand it.
modules
+
0
−
3
View file @
298b7808
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment