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
37f1248d
Commit
37f1248d
authored
11 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Add some more fixes and some checks for the new module system
parent
1b331343
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+9
-2
9 additions, 2 deletions
Makefile
include/toplevel.mk
+1
-1
1 addition, 1 deletion
include/toplevel.mk
scripts/openwrt_rev.sh
+0
-3
0 additions, 3 deletions
scripts/openwrt_rev.sh
with
10 additions
and
6 deletions
Makefile
+
9
−
2
View file @
37f1248d
...
@@ -30,6 +30,7 @@ unpatch: FORCE
...
@@ -30,6 +30,7 @@ unpatch: FORCE
$(
GLUONDIR
)
/scripts/unpatch.sh
$(
GLUONDIR
)
$(
GLUONDIR
)
/scripts/unpatch.sh
$(
GLUONDIR
)
update-patches
:
FORCE
update-patches
:
FORCE
$(
GLUONDIR
)
/scripts/update.sh
$(
GLUONDIR
)
$(
GLUONDIR
)
/scripts/update-patches.sh
$(
GLUONDIR
)
$(
GLUONDIR
)
/scripts/update-patches.sh
$(
GLUONDIR
)
$(
GLUONDIR
)
/scripts/patch.sh
$(
GLUONDIR
)
$(
GLUONDIR
)
/scripts/patch.sh
$(
GLUONDIR
)
...
@@ -38,9 +39,8 @@ update-patches: FORCE
...
@@ -38,9 +39,8 @@ update-patches: FORCE
_SINGLE
=
export
MAKEFLAGS
=
$(
space
);
_SINGLE
=
export
MAKEFLAGS
=
$(
space
);
override
OPENWRT_BUILD
=
1
override
OPENWRT_BUILD
=
1
override
REVISION
:=
$(
shell
$(
GLUONDIR
)
/scripts/openwrt_rev.sh
$(
GLUONDIR
))
GREP_OPTIONS
=
GREP_OPTIONS
=
export
OPENWRT_BUILD
GREP_OPTIONS
REVISION
export
OPENWRT_BUILD
GREP_OPTIONS
-include
$(TOPDIR)/include/debug.mk
-include
$(TOPDIR)/include/debug.mk
-include
$(TOPDIR)/include/depends.mk
-include
$(TOPDIR)/include/depends.mk
...
@@ -53,20 +53,27 @@ endef
...
@@ -53,20 +53,27 @@ endef
include
$(GLUONDIR)/include/profiles.mk
include
$(GLUONDIR)/include/profiles.mk
CheckExternal
:=
test
-d
$(
GLUON_OPENWRTDIR
)
||
(
echo
'You don'
"'"
't seem to have optained the external repositories needed by Gluon; please call `make update` first!'
;
false
)
all
:
FORCE
all
:
FORCE
+@
$(
CheckExternal
)
+@
$(
GLUONMAKE
)
prepare
+@
$(
GLUONMAKE
)
prepare
+@
$(
GLUONMAKE
)
images
+@
$(
GLUONMAKE
)
images
download prepare images
:
FORCE
download prepare images
:
FORCE
+@
$(
CheckExternal
)
+@
$(
GLUONMAKE
)
$@
+@
$(
GLUONMAKE
)
$@
dirclean
:
clean
dirclean
:
clean
+@
$(
CheckExternal
)
+@
$(
SUBMAKE
)
-C
$(
TOPDIR
)
-r
dirclean
+@
$(
SUBMAKE
)
-C
$(
TOPDIR
)
-r
dirclean
cleanall
:
clean
cleanall
:
clean
+@
$(
CheckExternal
)
+@
$(
SUBMAKE
)
-C
$(
TOPDIR
)
-r
clean
+@
$(
SUBMAKE
)
-C
$(
TOPDIR
)
-r
clean
clean
:
clean
:
+@
$(
CheckExternal
)
+@
$(
GLUONMAKE
)
clean
+@
$(
GLUONMAKE
)
clean
else
else
...
...
This diff is collapsed.
Click to expand it.
include/toplevel.mk
+
1
−
1
View file @
37f1248d
...
@@ -12,7 +12,7 @@ PREP_MK= OPENWRT_BUILD= QUIET=0
...
@@ -12,7 +12,7 @@ PREP_MK= OPENWRT_BUILD= QUIET=0
-include
$(TOPDIR)/include/verbose.mk
-include
$(TOPDIR)/include/verbose.mk
REVISION
:=
$(
shell
$(
TOPDIR
)
/scripts/getver.sh
)
REVISION
:=
$(
shell
$(
TOPDIR
)
/scripts/getver.sh
2>/dev/null
)
HOSTCC
?=
gcc
HOSTCC
?=
gcc
OPENWRTVERSION
:=
$(
RELEASE
)$(
if
$(
REVISION
)
,
(
$(
REVISION
))
)
OPENWRTVERSION
:=
$(
RELEASE
)$(
if
$(
REVISION
)
,
(
$(
REVISION
))
)
...
...
This diff is collapsed.
Click to expand it.
scripts/openwrt_rev.sh
deleted
100755 → 0
+
0
−
3
View file @
1b331343
#!/bin/sh
echo
"r
$(
git
--git-dir
=
"
$1
"
/.git/modules/openwrt log |
grep
-m
1 git-svn-id |
awk
'{ gsub(/.*@/, "", $0); print $1 }'
)
"
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