domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdk: unset BINARY_FOLDER and DOWNLOAD_FOLDER in final archives

Browse Source 
Using these config-options to customize the folders used at build-time makes these
folder settings appear in generated archive. This causes the SDK to be not
portable, as it's going to use the build-time folders on the new systems.
The errors vary from passing the build, disk out-of-space to permission denied.

The build-time settings of these folders are passed into the archive via Config.build.
The expected behavior is that the SDK acts after unpacking like these settings have
their defaults, using intree folders. So just filter these folders out when running
convert-config.pl to create Config.build.

This addresses the same issue that's fixed in the previous commit for the imagebuilder.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
(cherry picked from commit 1e4b191ac8)
This commit is contained in:
Sven Roederer
2021-05-07 21:35:21 +02:00
committed by Baptiste Jonglez
parent f25dc53723
commit 930e9c0621
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/sdk/convert-config.pl
View File

@@ -9,7 +9,13 @@ while (<>) {
chomp; chomp;
next if /^CONFIG_SIGNED_PACKAGES/; next if /^CONFIG_SIGNED_PACKAGES/;
if (/^CONFIG_([^=]+)=(.*)$/) { if (/^CONFIG_((BINARY)|(DOWNLOAD))_FOLDER=(.*)$/) {
# We don't want to preserve the build setting of
# BINARY_FOLDER and DOWNLOAD_FOLDER.
$var = "$1_FOLDER";
$val = '""';
$type = "string";
} elsif (/^CONFIG_([^=]+)=(.*)$/) {
$var = $1; $var = $1;
$val = $2; $val = $2;