Skip to content
Snippets Groups Projects
Unverified Commit 587c5016 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

build: handle generic and target-specific config in the same run of target_config{,_check}.sh

This, together with a new try_config directive, will allow checking the
generic config and make it more flexible.
parent b325f005
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,6 @@ config: FORCE ...@@ -103,7 +103,6 @@ config: FORCE
echo 'CONFIG_TARGET_$(BOARD)=y' \ echo 'CONFIG_TARGET_$(BOARD)=y' \
$(if $(SUBTARGET),&& echo 'CONFIG_TARGET_$(BOARD)_$(SUBTARGET)=y') \ $(if $(SUBTARGET),&& echo 'CONFIG_TARGET_$(BOARD)_$(SUBTARGET)=y') \
$(foreach pkg,$(GLUON_PACKAGES_NO),&& echo '# CONFIG_PACKAGE_$(pkg) is not set') \ $(foreach pkg,$(GLUON_PACKAGES_NO),&& echo '# CONFIG_PACKAGE_$(pkg) is not set') \
&& scripts/target_config.sh generic \
&& GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/target_config.sh '$(GLUON_TARGET)' \ && GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/target_config.sh '$(GLUON_TARGET)' \
$(foreach pkg,$(GLUON_PACKAGES_YES),&& echo 'CONFIG_PACKAGE_$(pkg)=y') \ $(foreach pkg,$(GLUON_PACKAGES_YES),&& echo 'CONFIG_PACKAGE_$(pkg)=y') \
$(foreach lang,$(GLUON_LANGS),&& echo 'CONFIG_GLUON_WEB_LANG_$(lang)=y') \ $(foreach lang,$(GLUON_LANGS),&& echo 'CONFIG_GLUON_WEB_LANG_$(lang)=y') \
......
...@@ -2,6 +2,10 @@ config() { ...@@ -2,6 +2,10 @@ config() {
: :
} }
try_config() {
:
}
device() { device() {
: :
} }
......
...@@ -35,6 +35,10 @@ config() { ...@@ -35,6 +35,10 @@ config() {
echo "$1" echo "$1"
} }
try_config() {
echo "$1"
}
device() { device() {
emit emit
...@@ -63,6 +67,7 @@ packages() { ...@@ -63,6 +67,7 @@ packages() {
fi fi
} }
. targets/generic
# The sort will not only remove duplicate entries, # The sort will not only remove duplicate entries,
# but also magically make =y entries override =m ones # but also magically make =y entries override =m ones
......
...@@ -92,6 +92,7 @@ packages() { ...@@ -92,6 +92,7 @@ packages() {
} }
. targets/generic
. targets/"$target" . targets/"$target"
check_devices check_devices
......
...@@ -7,8 +7,8 @@ config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set' ...@@ -7,8 +7,8 @@ config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
config 'CONFIG_PACKAGE_ATH_DEBUG=y' config 'CONFIG_PACKAGE_ATH_DEBUG=y'
config 'CONFIG_TARGET_MULTI_PROFILE=y' try_config 'CONFIG_TARGET_MULTI_PROFILE=y'
config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y' try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'
if [ "$GLUON_DEBUG" ] if [ "$GLUON_DEBUG" ]
then then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment