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
c059c980
Commit
c059c980
authored
10 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
build: make manifest generation more robust
parent
a2e88140
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
Makefile
+5
-4
5 additions, 4 deletions
Makefile
with
5 additions
and
4 deletions
Makefile
+
5
−
4
View file @
c059c980
...
...
@@ -89,19 +89,20 @@ manifest: FORCE
@
echo
'
$(
GLUON_PRIORITY
)
'
|
grep
-qE
'^([0-9]*\.)?[0-9]+$$'
||
(
echo
'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'
;
false
)
@$(
CheckExternal
)
mkdir
-p
$(GLUON_IMAGEDIR)/sysupgrade
(
\
echo
'BRANCH=$(GLUON_BRANCH)'
&&
\
echo
'DATE=$(shell $(GLUON_ORIGOPENWRTDIR)/staging_dir/host/bin/lua $(GLUONDIR)/scripts/rfc3339date.lua)'
&&
\
echo
'PRIORITY=$(GLUON_PRIORITY)'
&&
\
echo
\
)
>
$(GLUON_
IMAGEDIR)/sysupgrade
/$(GLUON_BRANCH).manifest
)
>
$(GLUON_
BUILDDIR)
/$(GLUON_BRANCH).manifest
.tmp
+(
$(
foreach
GLUON_TARGET,
$(
GLUON_TARGETS
)
,
\
(
[
!
-e
$(
BOARD_BUILDDIR
)
/prepared
]
||
(
$(
GLUONMAKE
)
manifest
GLUON_TARGET
=
'
$(
GLUON_TARGET
)
'
V
=
s
$(
OPENWRT_VERBOSE
)
)
)
&&
\
)
:)
mkdir
-p
$(GLUON_IMAGEDIR)/sysupgrade
mv
$(GLUON_BUILDDIR)/$(GLUON_BRANCH).manifest.tmp
$(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest
dirclean
:
FORCE
for
dir
in
build_dir dl staging_dir tmp
;
do
\
rm
-rf
$(
GLUON_ORIGOPENWRTDIR
)
/
$$
dir
;
\
...
...
@@ -394,7 +395,7 @@ manifest: FORCE
[
-e
"
$$
file"
]
&&
echo
'
$(
model
)
'
"
$(
PREPARED_RELEASE
)
"
"
$$($(
SHA512SUM
)
"
$$
file
"
)
"
"
$$
file"
;
\
)
\
)
:
\
)
>>
$(
GLUON_
IMAGEDIR
)
/sysupgrade
/
$(
GLUON_BRANCH
)
.manifest
)
>>
$(
GLUON_
BUILDDIR
)
/
$(
GLUON_BRANCH
)
.manifest
.tmp
.PHONY
:
all images prepare clean gluon-tools manifest
...
...
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