Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
b48cdd4f
Commit
b48cdd4f
authored
11 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Add documentation for the new module system
parent
fba9492b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+43
-8
43 additions, 8 deletions
README.md
with
43 additions
and
8 deletions
README.md
+
43
−
8
View file @
b48cdd4f
To build Gluon, after checkeing out the repository change to the source root directory
To build Gluon, after checkeing out the repository change to the source root directory
to perform the following commands:
to perform the following commands:
git submodule update --init # Get other repositories used by Gluon
git clone git://github.com/freifunk-gluon/site-ffhl.git site # Get the Freifunk Lübeck site repository - or use your own!
git clone git://github.com/freifunk-gluon/site-ffhl.git site # Get the Freifunk Lübeck site repository - or use your own!
make update # Get other repositories used by Gluon
make # Build Gluon
make # Build Gluon
When calling make, the OpenWRT build environment is prepared/updated. To rebuil
t
When calling make, the OpenWRT build environment is prepared/updated. To rebuil
d
the images only, just use:
the images only, just use:
make images
make images
The built images can be found in the directory
./
images.
The built images can be found in the directory
`
images
`
.
For the build reserve 6GB of disk space. The building requires packages
For the build reserve 6GB of disk space. The building requires packages
for subversion, ncurses headers (libncurses-dev) and zlib headers
for
`
subversion
`
, ncurses headers (
`
libncurses-dev
`
) and zlib headers
(libz-dev).
`
(
`
libz-dev
`
).
`
There are three levels of
'
make clean
'
:
There are three levels of
`
make clean
`
:
make clean
make clean
...
@@ -25,8 +25,43 @@ will only clean the Gluon-specific files;
...
@@ -25,8 +25,43 @@ will only clean the Gluon-specific files;
make cleanall
make cleanall
will also call
'
make clean
'
on the OpenWRT tree, and
will also call
`
make clean
`
on the OpenWRT tree, and
make dirclean
make dirclean
will do all this, and call 'make dirclean' on the OpenWRT tree.
will do all this, and call `
make dirclean
` on the OpenWRT tree.
# Development
To update the repositories used by Gluon, just adjust the commit IDs in `
modules
` and
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
`.
make unpatch
sets the repositories to the `
base
` branch,
make patch
re-applies the patches by resetting the `
patched
` branch to `
base
` and calling `
git am
`
for the patch files. Calling `
make
` or a similar command after calling `
make unpatch
`
is generally not a good idea.
After new patches have been commited on top of the patched branch (or existing commits
since the base commit have been edited or removed), the patch directories can be regenerated
using
make update-patches
If applying a patch fails because you have changed the base commit, the repository will be reset to the old `
patched
` branch
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
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