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
c4109b34
Commit
c4109b34
authored
10 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Add DATE and PRIORITY fields to the manifest
parent
d376f4d4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+19
-12
19 additions, 12 deletions
Makefile
scripts/rfc3339date.lua
+5
-0
5 additions, 0 deletions
scripts/rfc3339date.lua
with
24 additions
and
12 deletions
Makefile
+
19
−
12
View file @
c4109b34
...
@@ -90,7 +90,8 @@ toolchain/% package/% target/%: FORCE
...
@@ -90,7 +90,8 @@ toolchain/% package/% target/%: FORCE
+@
$(
GLUONMAKE
)
$@
+@
$(
GLUONMAKE
)
$@
manifest
:
FORCE
manifest
:
FORCE
[
-n
"
$(
GLUON_BRANCH
)
"
]
||
(
echo
'Please set GLUON_BRANCH to create a manifest.'
;
false
)
[
-n
'
$(
GLUON_BRANCH
)
'
]
||
(
echo
'Please set GLUON_BRANCH to create a manifest.'
;
false
)
echo
'
$(
GLUON_PRIORITY
)
'
|
grep
-qE
'^([0-9]*\.)?[0-9]+$$'
||
(
echo
'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'
;
false
)
@$(
CheckExternal
)
@$(
CheckExternal
)
+@
$(
GLUONMAKE_EARLY
)
maybe-prepare-target
+@
$(
GLUONMAKE_EARLY
)
maybe-prepare-target
+@
$(
GLUONMAKE
)
$@
+@
$(
GLUONMAKE
)
$@
...
@@ -342,17 +343,23 @@ images: $(patsubst %,call_image/%,$(PROFILES)) ;
...
@@ -342,17 +343,23 @@ images: $(patsubst %,call_image/%,$(PROFILES)) ;
manifest
:
FORCE
manifest
:
FORCE
mkdir
-p
$(
GLUON_IMAGEDIR
)
/sysupgrade
mkdir
-p
$(
GLUON_IMAGEDIR
)
/sysupgrade
(
cd
$(
GLUON_IMAGEDIR
)
/sysupgrade
&&
echo
'BRANCH=
$(
GLUON_BRANCH
)
'
&&
echo
&&
(
$(
foreach profile,
$(
PROFILES
)
,
\
(
cd
$(
GLUON_IMAGEDIR
)
/sysupgrade
&&
\
$(
foreach model,
$(
GLUON_
$(
profile
)
_MODELS
)
,
\
echo
'BRANCH=
$(
GLUON_BRANCH
)
'
&&
\
for
file
in
gluon-
*
-
'
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
))
-sysupgrade.bin'
;
do
\
echo
'DATE=
$(
shell
$(
STAGING_DIR_HOST
)
/bin/lua
$(
GLUONDIR
)
/scripts/rfc3339date.lua
)
'
&&
\
[
-e
"
$$
file"
]
&&
echo
\
echo
'PRIORITY=
$(
GLUON_PRIORITY
)
'
&&
\
'
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
))
'
\
echo
&&
\
"
$$(
echo "
$$
file
" | sed -n -r -e 's/^gluon-
$(
call regex-escape,
$(
GLUON_SITE_CODE
))
-(.*
)
-
$(
call regex-escape,
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
)))
-sysupgrade
\.
bin
$$
/
\1
/p'
)
"
\
(
$(
foreach profile,
$(
PROFILES
)
,
\
"
$$($(
SHA512SUM
)
"
$$
file
"
)
"
\
$(
foreach model,
$(
GLUON_
$(
profile
)
_MODELS
)
,
\
"
$$
file"
&&
break
;
\
for
file
in
gluon-
*
-
'
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
))
-sysupgrade.bin'
;
do
\
done
;
\
[
-e
"
$$
file"
]
&&
echo
\
)
\
'
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
))
'
\
)
:
))
>
$(
GLUON_IMAGEDIR
)
/sysupgrade/
$(
GLUON_BRANCH
)
.manifest
"
$$(
echo "
$$
file
" | sed -n -r -e 's/^gluon-
$(
call regex-escape,
$(
GLUON_SITE_CODE
))
-(.*
)
-
$(
call regex-escape,
$(
GLUON_
$(
profile
)
_MODEL_
$(
model
)))
-sysupgrade
\.
bin
$$
/
\1
/p'
)
"
\
"
$$($(
SHA512SUM
)
"
$$
file
"
)
"
\
"
$$
file"
&&
break
;
\
done
;
\
)
\
)
:
)
\
)
>
$(
GLUON_IMAGEDIR
)
/sysupgrade/
$(
GLUON_BRANCH
)
.manifest
.PHONY
:
all images prepare clean gluon-tools
.PHONY
:
all images prepare clean gluon-tools
...
...
This diff is collapsed.
Click to expand it.
scripts/rfc3339date.lua
0 → 100644
+
5
−
0
View file @
c4109b34
local
time
=
os.time
()
local
timestamp
=
os.date
(
'%F %T'
,
time
)
local
timezone
=
os.date
(
'%z'
,
time
):
gsub
(
'^
(
[+-]%d%d
)(
%
d
%
d
)
$
', '
%
1
:
%
2
')
print(timestamp .. timezone)
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