On Tue, 2018-06-26 at 09:51 +0800, Aaron Chan wrote:
> Signed-off-by: Aaron Chan <aaron.chun.yew.c...@intel.com>
> ---
> scripts/config-intel-lava.json | 129
> +++++++++++++++++++++++++++++++++++++++++
> scripts/utils.py | 2 +-
> 2 files changed, 130 insertions(+), 1 deletion(-)
> create mode 100644 scripts/config-intel-lava.json
>
> diff --git a/scripts/config-intel-lava.json b/scripts/config-intel-
> lava.json
> new file mode 100644
> index 0000000..76bb4f5
> --- /dev/null
> +++ b/scripts/config-intel-lava.json
> @@ -0,0 +1,129 @@
> +{
> + "BASE_HOMEDIR" : "~",
> + "BASE_SHAREDDIR" :
> "/srv/www/vhosts/autobuilder.yoctoproject.org",
> +
> + "defaults" : {
> + "NEEDREPOS" : ["poky"],
> + "DISTRO" : "poky",
> + "SDKMACHINE" : "i686",
> + "PACKAGE_CLASSES" : "package_rpm package_deb package_ipk",
> + "PRSERV" : "PRSERV_HOST = 'localhost:0'",
> + "DLDIR" : "DL_DIR = '${BASE_SHAREDDIR}/current_sources'",
> + "SSTATEDIR" : ["SSTATE_DIR ?=
> '${BASE_SHAREDDIR}/pub/sstate'"],
> + "SSTATEDIR_RELEASE" : ["SSTATE_MIRRORS += 'file://.*
> file://${BASE_SHAREDDIR}/pub/sstate/PATH'", "SSTATE_DIR ?=
> '/srv/www/vhosts/downloads.yoctoproject.org/sstate/@RELEASENUM@'"],
> + "SDKEXTRAS" : ["SSTATE_MIRRORS += '\\", "file://.* http://ss
> tate.yoctoproject.org/dev/@RELEASENUM@PATH;downloadfilename=PATH'"],
> + "BUILDINFO" : false,
> + "BUILDINFOVARS" : ["INHERIT += 'image-buildinfo'",
> "IMAGE_BUILDINFO_VARS_append = ' IMAGE_BASENAME IMAGE_NAME'"],
> + "WRITECONFIG" : true,
> + "SENDERRORS" : true,
> + "extravars" : [
> + "QEMU_USE_KVM = 'True'",
> + "INHERIT += 'report-error'",
> + "PREMIRRORS = ''",
> + "BB_GENERATE_MIRROR_TARBALLS = '1'",
> + "BB_NUMBER_THREADS = '16'",
> + "PARALLEL_MAKE = '-j 16'",
> + "BB_TASK_NICE_LEVEL = '5'",
> + "BB_TASK_NICE_LEVEL_task-testimage = '0'",
> + "BB_TASK_IONICE_LEVEL = '2.7'",
> + "BB_TASK_IONICE_LEVEL_task-testimage = '2.1'",
> + "INHERIT += 'testimage'",
> + "TEST_QEMUBOOT_TIMEOUT = '1500'",
> + "SANITY_TESTED_DISTROS = ''",
> + "SDK_EXT_TYPE = 'minimal'",
> + "SDK_INCLUDE_TOOLCHAIN = '1'"
> + ]
> + },
This does look in direction I'm thinking however do you really change
and override all the above values? Can we get away with just specifying
the values you're actually needing to change?
> + "overrides" : {
> + "nightly-x86-64-bsp" : {
> + "MACHINE" : "intel-corei7-64",
> + "SDKMACHINE" : "x86_64",
> + "extravars" : [
> + "DISTRO_FEATURES_append = \" systemd\"",
> + "IMAGE_INSTALL_append = \" udev util-linux
> systemd\"",
> + "CORE_IMAGE_EXTRA_INSTALL_append += \"python3
> python3-pip git socat apt dpkg openssh\"",
> + "IMAGE__FSTYPES = \"tar.gz\""
> + ],
> + "NEEDREPOS" : ["poky", "meta-intel", "meta-minnow",
> "meta-openembedded"],
> + "step1" : {
> + "ADDLAYER" : [
> + "../meta-intel",
> + "../meta-minnow"
> + ],
> + "BBTARGETS" : "core-image-sato-sdk"
> + }
> + }
> + },
This piece is one of the key pieces and is fine.
> + "repo-defaults" : {
> + "poky" : {
> + "url" : "git://git.yoctoproject.org/poky",
> + "branch" : "master",
> + "revision" : "HEAD",
> + "checkout-dirname" : ".",
> + "no-layer-add" : true,
> + "call-init" : true
> + },
However this is clearly just a unneeded copy
> + "meta-intel" : {
> + "url" : "git://git.yoctoproject.org/meta-intel-contrib",
> + "branch" : "anujm/next",
> + "revision" : "HEAD"
> + },
This appears to just change the branch which you can probably just
specify separately.
> + "meta-minnow" : {
> + "url" : "https://github.com/alimhussin2/meta-minnow";,
> + "branch" : "master",
> + "revision" : "HEAD"
> + },
> + "meta-openembedded" : {
> + "url" : "git://git.openembedded.org/meta-openembedded",
> + "branch" : "master",
> + "revision" : "HEAD"
> + }
These last two are the main additions I could quickly spot.
> + }
> +}
> diff --git a/scripts/utils.py b/scripts/utils.py
> index 7c6535c..d1c3168 100644
> --- a/scripts/utils.py
> +++ b/scripts/utils.py
> @@ -146,7 +146,7 @@ def loadconfig():
> for f in files.split():
> p = f
> if not f.startswith("/"):
> - p = os.path.join(scriptsdir, '..', f)
> + p = os.path.join(scriptsdir, f)
This does not look like it should be here.
Cheers,
Richard
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
