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
2a8943e5
Commit
2a8943e5
authored
5 years ago
by
Matthias Schiffer
Committed by
Martin Weinelt
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
build: use .SILENT instead of adding @ to each recipe
parent
4e02d9ba
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
+12
-14
12 additions, 14 deletions
Makefile
with
12 additions
and
14 deletions
Makefile
+
12
−
14
View file @
2a8943e5
...
...
@@ -61,25 +61,23 @@ unexport $(GLUON_VARS)
GLUON_ENV
=
$(
foreach var,
$(
GLUON_VARS
)
,
$(
var
)
=
$(
call escape,
$($(
var
))))
show-release
:
@
echo
'
$(
GLUON_RELEASE
)
'
echo
'
$(
GLUON_RELEASE
)
'
update
:
FORCE
@
export
$(
GLUON_ENV
)
scripts/update.sh
scripts/patch.sh
scripts/feeds.sh
update-patches
:
FORCE
@
export
$(
GLUON_ENV
)
scripts/update.sh
scripts/update-patches.sh
scripts/patch.sh
update-feeds
:
FORCE
@
$(
GLUON_ENV
)
scripts/feeds.sh
$(
GLUON_ENV
)
scripts/feeds.sh
GLUON_TARGETS
:=
...
...
@@ -119,23 +117,23 @@ endef
define
CheckSite
if
!
GLUON_SITEDIR
=
'
$(
GLUON_SITEDIR
)
'
GLUON_SITE_CONFIG
=
'
$(
1
)
.conf'
$(
LUA
)
-e
'assert(dofile("scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))'
;
then
echo
'Your site configuration ($(1).conf) did not pass validation
echo
'Your site configuration ($(1).conf) did not pass validation
'
exit
1
fi
endef
list-targets
:
FORCE
@
for target in $(GLUON_TARGETS); do
for
target
in
$(
GLUON_TARGETS
);
do
echo
"
$$
target"
done
lint
:
lint-lua lint-sh
lint-lua
:
FORCE
@
scripts/lint-lua.sh
scripts/lint-lua.sh
lint-sh
:
FORCE
@
scripts/lint-sh.sh
scripts/lint-sh.sh
define
merge_lists
$(1)
:=
...
...
@@ -166,7 +164,7 @@ $(eval $(call merge_lists,GLUON_CLASS_PACKAGES_tiny,$(GLUON_FEATURE_PACKAGES_tin
LUA
:=
openwrt/staging_dir/hostpkg/bin/lua
$(LUA)
:
+
@
+
$(CheckExternal)
...
...
@@ -176,7 +174,7 @@ $(LUA):
config
:
$(LUA) FORCE
+
@
+
$(CheckExternal)
$(CheckTarget)
...
...
@@ -194,7 +192,7 @@ config: $(LUA) FORCE
all
:
config
+
@
+
$(
GLUON_ENV
)
\
$(
LUA
)
scripts/clean_output.lua
$(
OPENWRTMAKE
)
...
...
@@ -202,16 +200,15 @@ all: config
$(
LUA
)
scripts/copy_output.lua
'
$(
GLUON_TARGET
)
'
clean download
:
config
+
@
$(
OPENWRTMAKE
)
$@
+
$(
OPENWRTMAKE
)
$@
dirclean
:
FORCE
+
@
+
[
-e
openwrt/.config
]
||
$(
OPENWRTMAKE
)
defconfig
$(
OPENWRTMAKE
)
dirclean
rm
-rf
$(
GLUON_TMPDIR
)
$(
GLUON_OUTPUTDIR
)
manifest
:
$(LUA) FORCE
@
[
'
$(
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
)
...
...
@@ -235,3 +232,4 @@ FORCE: ;
.PHONY
:
FORCE
.NOTPARALLEL
:
.ONESHELL
:
.SILENT
:
This diff is collapsed.
Click to expand it.
shoragan
@shoragan
mentioned in commit
a3569da1
·
4 years ago
mentioned in commit
a3569da1
mentioned in commit a3569da164d51a4e938f5b95f5b34485808f7ca1
Toggle commit list
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