From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6755821036247187456 X-Received: by 2002:a54:4601:: with SMTP id p1mr4105617oip.113.1572962202238; Tue, 05 Nov 2019 05:56:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:1211:: with SMTP id 17ls751808ois.4.gmail; Tue, 05 Nov 2019 05:56:41 -0800 (PST) X-Google-Smtp-Source: APXvYqy3OsDIuHOUTEpw5dqrsQtDAQ0hVp8JQqzYpgbegNBHADPq0PbSvz1PI/vjgKdDWzQYTzjP X-Received: by 2002:aca:7585:: with SMTP id q127mr1593833oic.81.1572962201877; Tue, 05 Nov 2019 05:56:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572962201; cv=none; d=google.com; s=arc-20160816; b=dRVNELW7VawUxW2v5KahrCA+lT+E8G158nQjKnVrdpnR+X6Tm2Lmx2WOrmRl6OFL/b AiP+buwminIVJkVvHGMAB1Du35uQLEo9BGBKjTbdpT7WjuOoELqkTBbsLGc4AfQ4Lf4a 1ky3q3mMCZn03pMWc6ea4Z6EjVKN5VjBHwLESefd8z5cSScU7O2um4I9Dmf830StbY4S jtqjors/eUQT0eFlmJTItOGBYB6iw6QO3S+MS8wH81knMEoOWLw51562RQsXaOxn6iX7 2h0r1JUVoAyYmi46n55OYj4JmExXFtwJFBU07PkeoGLZmkoRytkgiRpJanOXwFK+oHhd n2Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=Z9oFfniSYH14XKpWTYoZATbImXqytESyyjxYvnbRHjs=; b=z8Bhk6/Z4jgo9ZfSBRKTrxxcQ2O8cVC194G2eQedGHAte6Or8lcqR5XS0NSlJFJYvx 3YJ7r7zPA5n8vMqvuPy7k/aAHvm1pIoEfQpxoY/4g/4H8tF2JOCYOS7Sm4t/Cd09xaYb c8nsw0guuH6fbFi7mbnersQKcyPWpPxNSPmB4KJpWN82c8GcCp0ryNhktxIJfDp5vpKc g7HN6VipojZ195tmDaZSQB8xgctf0Ir7P2jUseU6DYZLjIAWCqo4OXyiKv+gjpL1wva7 +RoukpO9YmqsWXqIN6lWui8UlDHFiDxgT/gwvgBxzza7nuBs842yY6DPG3iI+VvsJOV6 QY8Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 144si1078670oii.2.2019.11.05.05.56.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 05:56:41 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: 9rmY24+ipDL2eHzCmWfI6gzZ54pBgewb50ZBJKMSo98LCTxtFat+itNuqgkBa3+WNLLRLI+XBH PchL0dWSJqNo8Zh5f+NpiaeDsKfG7SYKnc2CuACu/WyjRIOTnIzmLF85+DIY5gayoqPTQ0hBG8 eHl6aeT3YkzPqGWbbk7Go5ZMEdbQdtObpWnReIiOSc+PdvvJR5u3h+yRoTmuO4XuH0TfaNT33R Dd1Jv8eaONS1wsPyMMNYLmXtzMLxLGXSf2qiB+vxM4m7SfcRcu0PGEQjU4VVNuaW+L3vPUSvXm JUg= X-IronPort-AV: E=Sophos;i="5.68,271,1569312000"; d="scan'208";a="44728249" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 05 Nov 2019 05:56:40 -0800 IronPort-SDR: wmYtRN68K132BR/XnZ07BZNRiP9Y0sXpHkP8obIwyD/MDJTyThJB5t7HkreTe8YPcdWf66NSJF XwpujE9TqIBrvXlW1OWn3x1qnD0tRTybeFPQ+TgW6cgdNPq8xpbA+fiK5GQJJBJEfGg5pyduGU CCe5LSjC4PRf/qZbBtpZFHObnhPCswsUlM00mJHr93tZynpm28zY7qpA1UBPhJxm13IaO8y2BY Mg9NbYFBpuUgWQ02RE+4q26TF0sicGla4x2y4RYhcCMImXSTxn70aG+JoXNOOkYddnX3dn1tSD e1E= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 4/7] linux-custom: add support for kernel config fragments Date: Tue, 5 Nov 2019 14:55:42 +0100 Message-ID: <1572962145-318-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572962145-318-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1572962145-318-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-06.mgc.mentorg.com (139.181.222.6) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: 8mr2rOMvnurP Check for .cfg files listed in SRC_URI and merge them with the main defconfig using the kernel merge_config script. The optional "apply" parameter may be used for the specified fragment to be ignore (set to "no"). Signed-off-by: Cedric Hombourger --- .../linux/files/build-kernel.sh | 3 +++ meta/recipes-kernel/linux/linux-custom.inc | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index 386e58b..f56e96c 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -37,6 +37,9 @@ REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image" REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers" make ${KERNEL_CONFIG_TARGET} || exit ${?} +if [ -n "${KERNEL_FRAGMENTS}" ]; then + scripts/kconfig/merge_config.sh -m .config ${KERNEL_FRAGMENTS} +fi KV=$( make -s kernelrelease ) if [ "${KV}" != "${PV}" ]; then diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 0c185d8..ca91f64 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -18,6 +18,19 @@ python() { 'linux-headers-' + kernel_name) } +def config_fragments(d): + fragments = [] + sources = d.getVar("SRC_URI").split() + for s in sources: + _, _, local, _, _, parm = bb.fetch.decodeurl(s) + apply = parm.get("apply") + if apply == "no": + continue + base, ext = os.path.splitext(os.path.basename(local)) + if ext and ext in (".cfg"): + fragments.append(local) + return fragments + inherit dpkg-base SRC_URI += "file://build-kernel.sh" @@ -71,6 +84,16 @@ dpkg_runbuild() { KERNEL_CONFIG_TARGET="defconfig" fi + # copy config fragments over to the kernel tree + src_frags="${@ " ".join(config_fragments(d)) }" + out_frags="${@ " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d))) }" + rm -rf ${S}/debian/fragments + if [ -n "${src_frags}" ]; then + mkdir -p ${S}/debian/fragments + (cd ${WORKDIR} && cp ${src_frags} ${S}/debian/fragments/) + fi + export KERNEL_FRAGMENTS="${out_frags}" + E="${@ bb.utils.export_proxies(d)}" export PV=${PV} -- 2.20.1