diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-07-02 14:23:19 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-07-02 14:27:06 +0200 |
| commit | 29b2199eb084bb3d8a58f92d3b2256a4fb53fe51 (patch) | |
| tree | a52f998b4e07544a812f5f9aa9d16b731804abe7 /scripts/feeds | |
| parent | 516d995d6ada872701e05fab12c0655ea2025eca (diff) | |
| download | upstream-29b2199eb084bb3d8a58f92d3b2256a4fb53fe51.tar.gz upstream-29b2199eb084bb3d8a58f92d3b2256a4fb53fe51.tar.bz2 upstream-29b2199eb084bb3d8a58f92d3b2256a4fb53fe51.zip | |
build: fix target metadata scan dependencies
Move SCAN_DEPS to scan.mk to eliminate redundancy with scripts/feeds
Add image/*.mk to SCAN_DEPS for targets to pick up newly added devices
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'scripts/feeds')
| -rwxr-xr-x | scripts/feeds | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index 437af035fd..7613d3a107 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -105,8 +105,8 @@ sub update_index($) -d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1; system("$mk -s prepare-mk OPENWRT_BUILD= TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); - system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); - system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPS=\"profiles/*.mk $ENV{TOPDIR}/include/target.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); + system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); + system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index"); system("ln -sf $name.tmp/.targetinfo ./feeds/$name.targetindex"); |