From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6743574894420688896 X-Received: by 2002:a17:906:6d4:: with SMTP id v20mr7719863ejb.223.1570110883368; Thu, 03 Oct 2019 06:54:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:a585:: with SMTP id a5ls1547325edc.11.gmail; Thu, 03 Oct 2019 06:54:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7ldBnZCs2E02uN+vVb38FE8tF0kE7a4Wf2bbfyfgumj5PtUAiLbQNupXUwFO5vApZ/tNm X-Received: by 2002:a50:c209:: with SMTP id n9mr9552509edf.215.1570110882805; Thu, 03 Oct 2019 06:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570110882; cv=none; d=google.com; s=arc-20160816; b=UQ5oIXRi3irtgaoZCDk7Niv1yb2hMjnJIX7EXfWah8+Md9KvoTS0sWN5uEAy6kgCuN kS0dhj9JlCQIxlo6u6471UYfQx9XNJGzG3iksll47qhgB4M/A1fOAJZXf0JzSuB0gfHs IR+TsX2osheHxLxjnpxgnH+YrOGUzBJf+8fQV2IRWkXIdjNRHQmdgXuWYwbj5/GOlajD c0Bzvgqq4WnkH5jVzIu9htco9cbFpa1P4A6iFeEYcFj4zsPqgXShfLPEoad5nAZ3aZeW NyrHTO3cydVghBl6zSAqyRn1Iu5B8xiNNZhfqt6oX+cC7ocGddPJnRexym6eucm6M0Rs 8POQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=JFkmEvAIyjfGb5WD6LC4qX8e6sK4lsww55T7TOnnUk8=; b=nycrrdjtDdBTxfkdxNPdSw3h5nY17QU+lMACobVCAfnOCKwRU/xcfHSE1SptNEamqL nYp2CGfDI7vXVsKI1rg2PHPvBc3CUWE6VKn4LC4NDWaCWrruwFMT6P3k6lqGVixqfNiq 0s3aqlDdqmFngvxPxDEsLtpPyMNa7Kn1EswkiJ1WRmPGgiHmO14laKWEDi9ay6BmEcj3 P/33nRmedPqX1nzavG1O16fQ/LCK5Ead+c89dJAKG2uSouyuqE/vy+975uv4Mdmz4pUz GGHvxmBObIwHP4HpeZQpAcsCNGMg41FZuPguH6uI476lx6rG8dMHZvoIa7KJKmVrbxot t9FA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JZyC5pAP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::332 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com. [2a00:1450:4864:20::332]) by gmr-mx.google.com with ESMTPS id d14si180272edb.4.2019.10.03.06.54.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Oct 2019 06:54:42 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::332 as permitted sender) client-ip=2a00:1450:4864:20::332; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JZyC5pAP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::332 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x332.google.com with SMTP id b24so2371500wmj.5 for ; Thu, 03 Oct 2019 06:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JFkmEvAIyjfGb5WD6LC4qX8e6sK4lsww55T7TOnnUk8=; b=JZyC5pAPfy9wyhohRStic4mO6ecW8e4ouQPLk2B1SsETKSkDIZkSchCJlzeVrN1alG 980SI8en9gKM+vIgB0b7EryypNRvja66mn/W74puax2duFgv+MWvIkfcovJQW02OQ7Za MBBBv6JojyfwcaEXZzjUq+jrSy0i0yPx5WidIZ5+vod01R+MAGndxfWgU7qK0Nj2tCk+ ETKTE7dYYW9WysX6/jNNsttOrm6BSDucCerLIamE+e3pcJJMuwnyRxTOw4aHHZPazKMu QEaF40NtRF7huOgkhol/g1vkufvCeT+sbLXhJlgFZq7Yzjeljqy+tFNP7TFQ2a9xxP/p +eLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JFkmEvAIyjfGb5WD6LC4qX8e6sK4lsww55T7TOnnUk8=; b=kj3zzer0VJLPfqoavMD5LQuS1nlUbKUE0LvGzlvZezhH5WXE13v8cJqZbChbY/79oc dH2p6y0bKYdjzPBkzP87tMcEYHhUshqBdIhl801yKyS6vh0ftFYVLvyJ8svB7KYf4BL1 tfMCSfHmBBBCpvk+BvHEatKpovnRKUgtecj/RUAInZvBho5T7wEsnXgNwaUweCiyywD1 lLV5qOJ3q8rywCvAfDwv028ZNgFyGUD88tf8CVa4lmiDmsxeSFpM96uVVkL1Xo1lOLbt j024wQXSxdo1w25JJK8X4CzIiUMrAbzAHen8z4zBOMslxEYK8t4fLg4IdSuT0bQUz7nV 1hsg== X-Gm-Message-State: APjAAAVXfOpz7n/f+VzER+abL4CoGIGLTXYIRj6LvFOU6rVCjSmLuie3 aA6SFyPv1NumS3Z5vUXvSOKzGVmKlz4= X-Received: by 2002:a7b:c7c9:: with SMTP id z9mr6458003wmk.61.1570110881973; Thu, 03 Oct 2019 06:54:41 -0700 (PDT) Return-Path: Received: from lightning.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id z125sm4538174wme.37.2019.10.03.06.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2019 06:54:41 -0700 (PDT) From: vijaikumar.kanagarajan@gmail.com X-Google-Original-From: Vijaikumar_Kangarajan@mentor.com To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, claudius.heine.ext@siemens.com, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH] meta: Add support for FILESEXTRAPATHS Date: Thu, 3 Oct 2019 19:24:31 +0530 Message-Id: <20191003135431.26829-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: U7kdDQrjLgR/ From: Vijai Kumar K OE-core provides FILESEXTRAPATHS to extend the search path for files and patches. This is particularly useful when you want to add more files or replace existing files using bbappend. Bring in support for FILESEXTRAPATHS from OE-core. Signed-off-by: Vijai Kumar K --- bitbake/conf/bitbake.conf | 3 ++- meta/classes/base.bbclass | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bitbake/conf/bitbake.conf b/bitbake/conf/bitbake.conf index a460df4..9894ed3 100644 --- a/bitbake/conf/bitbake.conf +++ b/bitbake/conf/bitbake.conf @@ -24,12 +24,13 @@ DEPENDS = "" DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DL_DIR = "${TMPDIR}/downloads" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}" +FILESEXTRAPATHS ?= "__default:" GITDIR = "${DL_DIR}/git" IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_" IMAGE_ROOTFS = "${TMPDIR}/rootfs" OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}" +FILESOVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}" P = "${PN}-${PV}" PERSISTENT_DIR = "${TMPDIR}/cache" PF = "${PN}-${PV}-${PR}" diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 8c7b021..0670430 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -19,6 +19,7 @@ # OTHER DEALINGS IN THE SOFTWARE. THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" +FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${PF}","${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files","${FILE_DIRNAME}"], d)}" def get_deb_host_arch(): import subprocess @@ -222,3 +223,21 @@ python do_cleanall() { except bb.fetch2.BBFetchException as e: bb.fatal(str(e)) } + +# Derived from OpenEmbedded Core: meta/classes/utils.bbclass +def base_set_filespath(path, d): + filespath = [] + extrapaths = (d.getVar("FILESEXTRAPATHS") or "") + # Remove default flag which was used for checking + extrapaths = extrapaths.replace("__default:", "") + # Don't prepend empty strings to the path list + if extrapaths != "": + path = extrapaths.split(":") + path + # The ":" ensures we have an 'empty' override + overrides = (":" + (d.getVar("FILESOVERRIDES") or "")).split(":") + overrides.reverse() + for o in overrides: + for p in path: + if p != "": + filespath.append(os.path.join(p, o)) + return ":".join(filespath) -- 2.17.1