Skip to content

Commit

Permalink
partially revert "add FLAG "GLUON_FOREIGN" ot make the frmework usabl…
Browse files Browse the repository at this point in the history
…efor other types of firmwares"

reenable setting of
* CONFIG_TARGET_DEVICE_%s_DEVICE_%s
* CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s
* CONFIG_TARGET_PER_DEVICE_ROOTFS=y

to fix building of initramfs. This way we also honor the devices-packages, and
e.g. remove the ath9k-ct drivers in favor of ath9k. Else it causes double
inclusion of drivers and results in file-conflicts.
  • Loading branch information
SvenRoederer committed Mar 5, 2020
1 parent 826f811 commit ddb4a96
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
10 changes: 4 additions & 6 deletions scripts/target_config_lib.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@ io.stderr:write(string.format("debug: %s\n", device_pkgs))
handle_pkg(pkg)
end

if env.FOREIGN_BUILD == '' then
funcs.config_message(lib.config, string.format("unable to enable device '%s'", profile),
'CONFIG_TARGET_DEVICE_%s_DEVICE_%s=y', openwrt_config_target, profile)
lib.config('CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s="%s"',
openwrt_config_target, profile, device_pkgs)
end
funcs.config_message(lib.config, string.format("unable to enable device '%s'", profile),
'CONFIG_TARGET_DEVICE_%s_DEVICE_%s=y', openwrt_config_target, profile)
lib.config('CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s="%s"',
openwrt_config_target, profile, device_pkgs)

end

Expand Down
1 change: 1 addition & 0 deletions targets/generic_ffberlin
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

try_config 'CONFIG_TARGET_MULTI_PROFILE=y'
try_config 'CONFIG_TARGET_ALL_PROFILES=y'
try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'

config 'CONFIG_DEVEL=y'
config 'CONFIG_TOOLCHAINOPTS=y'
Expand Down

0 comments on commit ddb4a96

Please sign in to comment.