a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
108 lines
3.7 KiB
Python
108 lines
3.7 KiB
Python
import os
|
|
import shutil
|
|
import subprocess
|
|
|
|
import infra
|
|
|
|
|
|
class Builder(object):
|
|
def __init__(self, config, builddir, logtofile):
|
|
self.config = '\n'.join([line.lstrip() for line in
|
|
config.splitlines()]) + '\n'
|
|
self.builddir = builddir
|
|
self.logfile = infra.open_log_file(builddir, "build", logtofile)
|
|
|
|
def is_defconfig_valid(self, configfile, defconfig):
|
|
"""Check if the .config is contains all lines present in the defconfig."""
|
|
with open(configfile) as configf:
|
|
configlines = configf.readlines()
|
|
|
|
defconfiglines = defconfig.split("\n")
|
|
|
|
# Check that all the defconfig lines are still present
|
|
for defconfigline in defconfiglines:
|
|
if defconfigline + "\n" not in configlines:
|
|
self.logfile.write("WARN: defconfig can't be used\n")
|
|
self.logfile.write(" Missing: %s\n" % defconfigline.strip())
|
|
self.logfile.flush()
|
|
return False
|
|
|
|
return True
|
|
|
|
def configure(self, make_extra_opts=[], make_extra_env={}):
|
|
"""Configure the build.
|
|
|
|
make_extra_opts: a list of arguments to be passed to the make
|
|
command.
|
|
e.g. make_extra_opts=["BR2_EXTERNAL=/path"]
|
|
|
|
make_extra_env: a dict of variables to be appended (or replaced)
|
|
in the environment that calls make.
|
|
e.g. make_extra_env={"BR2_DL_DIR": "/path"}
|
|
"""
|
|
if not os.path.isdir(self.builddir):
|
|
os.makedirs(self.builddir)
|
|
|
|
config_file = os.path.join(self.builddir, ".config")
|
|
with open(config_file, "w+") as cf:
|
|
cf.write(self.config)
|
|
# dump the defconfig to the logfile for easy debugging
|
|
self.logfile.write("> start defconfig\n" + self.config +
|
|
"> end defconfig\n")
|
|
self.logfile.flush()
|
|
|
|
env = {"PATH": os.environ["PATH"]}
|
|
env.update(make_extra_env)
|
|
|
|
cmd = ["make",
|
|
"O={}".format(self.builddir)]
|
|
cmd += make_extra_opts
|
|
cmd += ["olddefconfig"]
|
|
|
|
ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
|
|
cwd=infra.basepath(), env=env)
|
|
if ret != 0:
|
|
raise SystemError("Cannot olddefconfig")
|
|
|
|
if not self.is_defconfig_valid(config_file, self.config):
|
|
raise SystemError("The defconfig is not valid")
|
|
|
|
def build(self, make_extra_opts=[], make_extra_env={}):
|
|
"""Perform the build.
|
|
|
|
make_extra_opts: a list of arguments to be passed to the make
|
|
command. It can include a make target.
|
|
e.g. make_extra_opts=["foo-source"]
|
|
|
|
make_extra_env: a dict of variables to be appended (or replaced)
|
|
in the environment that calls make.
|
|
e.g. make_extra_env={"BR2_DL_DIR": "/path"}
|
|
"""
|
|
env = {"PATH": os.environ["PATH"]}
|
|
if "http_proxy" in os.environ:
|
|
self.logfile.write("Using system proxy: " +
|
|
os.environ["http_proxy"] + "\n")
|
|
env['http_proxy'] = os.environ["http_proxy"]
|
|
env['https_proxy'] = os.environ["http_proxy"]
|
|
env.update(make_extra_env)
|
|
|
|
cmd = ["make", "-C", self.builddir]
|
|
cmd += make_extra_opts
|
|
|
|
ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
|
|
env=env)
|
|
if ret != 0:
|
|
raise SystemError("Build failed")
|
|
|
|
open(self.stamp_path(), 'a').close()
|
|
|
|
def stamp_path(self):
|
|
return os.path.join(self.builddir, "build-done")
|
|
|
|
def is_finished(self):
|
|
return os.path.exists(self.stamp_path())
|
|
|
|
def delete(self):
|
|
if os.path.exists(self.builddir):
|
|
shutil.rmtree(self.builddir)
|