Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
IOWRT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue 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
IOPSYS
IOWRT
Commits
ace94615
Commit
ace94615
authored
9 years ago
by
Felix Fietkau
Browse files
Options
Downloads
Patches
Plain Diff
image.mk: fix emitting profiles for targets that have no subtargets
Signed-off-by:
Felix Fietkau
<
nbd@nbd.name
>
parent
ce21e18d
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
include/image.mk
+2
-3
2 additions, 3 deletions
include/image.mk
include/target.mk
+1
-1
1 addition, 1 deletion
include/target.mk
with
3 additions
and
4 deletions
include/image.mk
+
2
−
3
View file @
ace94615
...
@@ -20,7 +20,6 @@ DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
...
@@ -20,7 +20,6 @@ DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
sanitize
=
$(
call tolower,
$(
subst _,-,
$(
1
)))
sanitize
=
$(
call tolower,
$(
subst _,-,
$(
1
)))
SUBTARGET
?=
default
DIST_SANITIZED
:=
$(
call sanitize,
$(
VERSION_DIST
))
DIST_SANITIZED
:=
$(
call sanitize,
$(
VERSION_DIST
))
EXTRA_NAME_SANITIZED
=
$(
call sanitize,
$(
EXTRA_IMAGE_NAME
))
EXTRA_NAME_SANITIZED
=
$(
call sanitize,
$(
EXTRA_IMAGE_NAME
))
...
@@ -475,7 +474,7 @@ define Device/Export
...
@@ -475,7 +474,7 @@ define Device/Export
endef
endef
define
Device/Check
define
Device/Check
_TARGET
=
$$(
if
$$(
and
$$(
filter
$(
SUBTARGET
)
,
$$(
SUBTARGETS
))
,
$$(
filter
$(
PROFILE
)
,
$$(
PROFILES
)
DEVICE_
$(
1
)))
,install,install-disabled
)
_TARGET
=
$$(
if
$$(
and
$(
if
$(
SUBTARGET
)
,,1
)
$$(
filter
$(
SUBTARGET
)
,
$$(
SUBTARGETS
))
,
$$(
filter
$(
PROFILE
)
,
$$(
PROFILES
)
DEVICE_
$(
1
)))
,install,install-disabled
)
_COMPILE_TARGET
=
$$(
if
$(
if
$(
IB
)
,,
$(
CONFIG_IB
)$$(
filter
$(
PROFILE
)
,
$$(
PROFILES
)
DEVICE_
$(
1
)))
,compile,compile-disabled
)
_COMPILE_TARGET
=
$$(
if
$(
if
$(
IB
)
,,
$(
CONFIG_IB
)$$(
filter
$(
PROFILE
)
,
$$(
PROFILES
)
DEVICE_
$(
1
)))
,compile,compile-disabled
)
endef
endef
...
@@ -563,7 +562,7 @@ $(DEVICE_DESCRIPTION)
...
@@ -563,7 +562,7 @@ $(DEVICE_DESCRIPTION)
endef
endef
DEVICE_PROFILE_CHECK
=
$(
and
$(
DEVICE_TITLE
)
,
$(
filter
$(
SUBTARGET
)
,
$(
SUBTARGETS
)))
DEVICE_PROFILE_CHECK
=
$(
and
$(
DEVICE_TITLE
)
,
$(
if
$(
SUBTARGET
)
,,1
)$(
filter
$(
SUBTARGET
)
,
$(
SUBTARGETS
)))
define
Device/Dump
define
Device/Dump
$
$(
eval
$$(
if
$$(
DEVICE_PROFILE_CHECK
)
,
$$(
info
$$(
call Device/DumpInfo,
$(
1
)))))
$
$(
eval
$$(
if
$$(
DEVICE_PROFILE_CHECK
)
,
$$(
info
$$(
call Device/DumpInfo,
$(
1
)))))
...
...
This diff is collapsed.
Click to expand it.
include/target.mk
+
1
−
1
View file @
ace94615
...
@@ -274,7 +274,7 @@ endif
...
@@ -274,7 +274,7 @@ endif
CUR_SUBTARGET
:=
$(
SUBTARGET
)
CUR_SUBTARGET
:=
$(
SUBTARGET
)
ifeq
($(SUBTARGETS),)
ifeq
($(SUBTARGETS),)
CUR_SUBTARGET
?
=
default
CUR_SUBTARGET
:
=
default
endif
endif
define
BuildTargets/DumpCurrent
define
BuildTargets/DumpCurrent
...
...
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