Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

kconfig check: add support for nftables (MR 2042)

Browse source
This commit is contained in:
Clayton Craft 2021-03-30 17:34:14 -07:00 • committed by Oliver Smith
parent df9c61a868
commit 599d74ec25
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
8 changed files with 456 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pmb/parse/kconfig.py
View file

@ -65,7 +65,7 @@ def check_option(component, details, config, config_path_pretty, option,
def check_config(config_path, config_path_pretty, config_arch, pkgver,
anbox=False, details=False):
anbox=False, nftables=False, details=False):
logging.debug("Check kconfig: " + config_path)
with open(config_path) as handle:
config = handle.read()
@ -73,6 +73,9 @@ def check_config(config_path, config_path_pretty, config_arch, pkgver,
if anbox:
options = pmb.config.necessary_kconfig_options_anbox
component = "anbox"
elif nftables:
options = pmb.config.necessary_kconfig_options_nftables
component = "nftables"
else:
options = pmb.config.necessary_kconfig_options
component = "postmarketOS"
@ -103,7 +106,8 @@ def check_config(config_path, config_path_pretty, config_arch, pkgver,
return ret
def check(args, pkgname, force_anbox_check=False, details=False):
def check(args, pkgname, force_anbox_check=False, force_nftables_check=False,
details=False):
"""
Check for necessary kernel config options in a package.
@ -124,6 +128,8 @@ def check(args, pkgname, force_anbox_check=False, details=False):
pkgver = apkbuild["pkgver"]
check_anbox = force_anbox_check or (
"pmb:kconfigcheck-anbox" in apkbuild["options"])
check_nftables = force_nftables_check or (
"pmb:kconfigcheck-nftables" in apkbuild["options"])
for config_path in glob.glob(aport + "/config-*"):
# The architecture of the config is in the name, so it just needs to be
# extracted
@ -134,6 +140,9 @@ def check(args, pkgname, force_anbox_check=False, details=False):
if check_anbox:
ret &= check_config(config_path, config_path_pretty, config_arch,
pkgver, anbox=True, details=details)
if check_nftables:
ret &= check_config(config_path, config_path_pretty, config_arch,
pkgver, nftables=True, details=details)
return ret
@ -169,7 +178,8 @@ def extract_version(config_file):
return "unknown"
def check_file(args, config_file, anbox=False, details=False):
def check_file(args, config_file, anbox=False, nftables=False,
details=False):
"""
Check for necessary kernel config options in a kconfig file.
@ -184,4 +194,7 @@ def check_file(args, config_file, anbox=False, details=False):
if anbox:
ret &= check_config(config_file, config_file, arch, version,
anbox=True, details=details)
if nftables:
ret &= check_config(config_file, config_file, arch, version,
nftables=True, details=details)
return ret