pmb/build: remove implicit native cross-compilation (MR 1941)
If a package want native cross compilation, it should explicit that with "pmb:cross-native" in `options=`. See https://gitlab.com/postmarketOS/pmbootstrap/-/issues/1910.
This commit is contained in:
parent
7f60a6d782
commit
075706b26e
|
@ -1,6 +1,5 @@
|
||||||
# Copyright 2020 Oliver Smith
|
# Copyright 2020 Oliver Smith
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
import fnmatch
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
@ -68,18 +67,6 @@ def suffix(args, apkbuild, arch):
|
||||||
if "pmb:cross-native" in apkbuild["options"]:
|
if "pmb:cross-native" in apkbuild["options"]:
|
||||||
return "native"
|
return "native"
|
||||||
|
|
||||||
pkgname = apkbuild["pkgname"]
|
|
||||||
if args.cross:
|
|
||||||
for pattern in pmb.config.build_cross_native:
|
|
||||||
if fnmatch.fnmatch(pkgname, pattern):
|
|
||||||
logging.info(f"NOTE: '{pkgname}' would implicitly get cross"
|
|
||||||
f" compiled with the 'native' method, because"
|
|
||||||
f" it matches pattern '{pattern}'.")
|
|
||||||
logging.info("NOTE: this pattern matching will be removed in"
|
|
||||||
" the future, add 'pmb:cross-native' to the"
|
|
||||||
" APKBUILD's options to make it explicit.")
|
|
||||||
return "native"
|
|
||||||
|
|
||||||
return "buildroot_" + arch
|
return "buildroot_" + arch
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -179,10 +179,6 @@ build_device_architectures = ["armhf", "armv7", "aarch64", "x86_64", "x86"]
|
||||||
# for the first time
|
# for the first time
|
||||||
build_packages = ["abuild", "build-base", "ccache", "git"]
|
build_packages = ["abuild", "build-base", "ccache", "git"]
|
||||||
|
|
||||||
# fnmatch for supported pkgnames, that can be directly compiled inside
|
|
||||||
# the native chroot and a cross-compiler, without using distcc
|
|
||||||
build_cross_native = ["linux-*", "arch-bin-masquerade"]
|
|
||||||
|
|
||||||
# Necessary kernel config options
|
# Necessary kernel config options
|
||||||
necessary_kconfig_options = {
|
necessary_kconfig_options = {
|
||||||
">=0.0.0": { # all versions
|
">=0.0.0": { # all versions
|
||||||
|
|
Loading…
Reference in New Issue