mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-02-08 15:49:35 +00:00
b36068d35d
The commit "1bf2b3fe90 build,json: fixup missing arch_packages" fixes
the missing package architecture locally but runs $(TOPDIR)/Makefile
rather than a target specific one. While this works on local builds just
fine, it causes the buildbots to add garbage to the `arch_packages`
variable:
cd \"/builder/shared-workdir/build\"; git log --format=%h -1
toolchain > /builder/shared-workdir/build/tmp/.ver_check\ncmp -s
/builder/shared-workdir/build/tmp/.ver_check
/builder/shared-workdir/build/staging_dir/toolchain-x86_64_gcc-8.4.0_musl/stamp/.ver_check
|| { \\\n\trm -rf
/builder/shared-workdir/build/build_dir/target-x86_64_musl
/builder/shared-workdir/build/staging_dir/target-x86_64_musl
/builder/shared-workdir/build/staging_dir/toolchain-x86_64_gcc-8.4.0_musl
/builder/shared-workdir/build/build_dir/toolchain-x86_64_gcc-8.4.0_musl;
\\\n\tmkdir -p
/builder/shared-workdir/build/staging_dir/toolchain-x86_64_gcc-8.4.0_musl/stamp;
\\\n\tmv /builder/shared-workdir/build/tmp/.ver_check
/builder/shared-workdir/build/staging_dir/toolchain-x86_64_gcc-8.4.0_musl/stamp/.ver_check;
\\\n}\nx86_64
Only the last line contains the desired string.
Future investigation should check why the build system prints this to
stdout rather than stderr.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
||
|---|---|---|
| .. | ||
| config | ||
| flashing | ||
| arm-magic.sh | ||
| brcmImage.pl | ||
| bundle-libraries.sh | ||
| cfe-bin-header.py | ||
| cfe-partition-tag.py | ||
| cfe-wfi-tag.py | ||
| checkpatch.pl | ||
| clean-package.sh | ||
| cleanfile | ||
| cleanpatch | ||
| combined-ext-image.sh | ||
| combined-image.sh | ||
| config.guess | ||
| config.rpath | ||
| config.sub | ||
| const_structs.checkpatch | ||
| deptest.sh | ||
| diffconfig.sh | ||
| dl_cleanup.py | ||
| dl_github_archive.py | ||
| download.pl | ||
| dump-target-info.pl | ||
| env | ||
| ext-toolchain.sh | ||
| feeds | ||
| fixup-makefile.pl | ||
| functions.sh | ||
| gen_image_generic.sh | ||
| gen-dependencies.sh | ||
| get_source_date_epoch.sh | ||
| getver.sh | ||
| ipkg-build | ||
| ipkg-make-index.sh | ||
| ipkg-remove | ||
| json_add_image_info.py | ||
| json_overview_image_info.py | ||
| kconfig.pl | ||
| linksys-image.sh | ||
| make-ipkg-dir.sh | ||
| md5sum | ||
| metadata.pm | ||
| mkhash.c | ||
| mkits-qsdk-ipq-image.sh | ||
| mkits.sh | ||
| om-fwupgradecfg-gen.sh | ||
| package-metadata.pl | ||
| pad_image | ||
| patch-kernel.sh | ||
| patch-specs.sh | ||
| portable_date.sh | ||
| qemustart | ||
| redboot-script.pl | ||
| relink-lib.sh | ||
| remote-gdb | ||
| rstrip.sh | ||
| sercomm-crypto.py | ||
| sercomm-partition-tag.py | ||
| sercomm-payload.py | ||
| sign_images.sh | ||
| size_compare.sh | ||
| slugimage.pl | ||
| spelling.txt | ||
| srecimage.pl | ||
| strip-kmod.sh | ||
| symlink-tree.sh | ||
| sysupgrade-tar.sh | ||
| target-metadata.pl | ||
| time.pl | ||
| timestamp.pl | ||
| ubinize-image.sh | ||