From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:aa7:8287:: with SMTP id s7mr16357487pfm.82.1571907953412; Thu, 24 Oct 2019 02:05:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:8dc2:: with SMTP id j2ls1674407pfr.8.gmail; Thu, 24 Oct 2019 02:05:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyO5KhcJ4poERxSWMnMjNOj4w+BlmQZ8nssLnoEpiIRGBoWS/q0R2wJJrq6Ja/k8OzmmH31 X-Received: by 2002:aa7:8652:: with SMTP id a18mr15818797pfo.190.1571907953113; Thu, 24 Oct 2019 02:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571907953; cv=none; d=google.com; s=arc-20160816; b=L5kGb91AXH/fd04eZbstnRIPi2zg2xEhbqu23Df7N5JlKNBU0oVrqKMWF0++YTCAGn nksoU7Dkjio7xkPwV6NRXXBsSSb2a+5c0NPo/qzZQU2vj+27gW7JNi0zjGbGFfJGSi15 dIVfN1K7a81DKOq9rIVWAYY8wedHB5n1zuW8Qq6lgm3PLMISqGima2YilIbXuZLUb630 yp5Zm+tVkUSH78Vxv4HoXyzPBfDgrIr7of8JON39hk2/uObPUQ2Nzen0yf8AanRWlYRk bZGUo06Z6tBA98zws3/JWzai7o8enqaWYijwcPBOSGCS3TATZ6Na7Gva3oa4C8zCoUJm gC9A== 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=+kIpz9ie/b40pFRtrkYetoWbcmcR98H7R4K6bUANlxY=; b=xDWPWBAhNwsOaCQdPXndQHgmML1mRa+/cdKe8VaMA9eMdbY/WNiLuqkbHeKGV0xO+O +qc01bTJt/Uj/E/MloXUzX6RSRW4cjMUYTonxW/uCl4N/aVHWONZ2JtyWTgb2dHcugWi IIUBd2w+h8LkhLhoSuut3sQpzYAxQuLenFElmSBW/OAz7PdJ740h6DCxqOJLAj9WSjLQ R2EnM74j+76dh38UesGb9CM+hhXTOAGfbgOASHqSvoSrdW6uS4+OPHsrnLzpQl/AHkSI A5KBCbWBobe44G+l8jx9GhN0w/vAhxswDDL5XS9HnpQ0lNXfF9ww3QpYOtqX+X38nB2N ucew== 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 x2si1385679pfq.3.2019.10.24.02.05.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 02:05:53 -0700 (PDT) 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: iMapdrM68NcweOSvly5U3nOPOLxHChKgafbKq4RydvrkfLlh5hPNJYD2uonfVjJNjcczssgW2U j0EsiddHCROdtG21R1/tMbQK6+bZOzWodXMnbV2z5Y0fdwhCdTQJy0FriIGcec8W018KhNVLQe ZQbMGMMFeiEYh4i4HzU2YiIDFfY7nXvCB6/dOS0vK0FcxjZo+kthkclDJnpapaX2ALDgLE0063 LU93Wiag71XWspBrXopD9YG8PiJkIEwH1sqBJFXcJFgW6eftqFJb9Pwz8ciTyt33lcVjd2zUmO Z7U= X-IronPort-AV: E=Sophos;i="5.68,224,1569312000"; d="scan'208";a="44388644" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 24 Oct 2019 01:05:51 -0800 IronPort-SDR: WuZMlGY4kJnTOaZRp8favNe4ZfuzdTjauh0PrWiBBmhAtHEj7XT3P25RfHY9ag/Ak3uxKbbtHS XcDUBTKaxrEOvfkNYV6zQpE/cuU7IY8cwPP8KHUhX7MiIjSjR221bz8Y19Uo51fnZtljPFtA93 XmIsUhTezXxQ9LFLirYNx3jpJ/Ekhklry2YPOUyUhMtkKyaXJamEAr9zII+XjEsmhluvUfst2C JzPbFA+TpssoK7rCSsBJ0R1g8upXku6+4zFaQEZoOcYDI4BKpS15vUYwiczBkAiKVdOwnznGe1 nPY= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 08/10] linux-custom: add support for kernel config fragments Date: Thu, 24 Oct 2019 11:02:22 +0200 Message-ID: <1571907744-1121-9-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-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-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: XFjbxWynA3v9 Check for .cfg files listed in SRC_URI and merge them with the main defconfig using the kernel merge_config script. Signed-off-by: Cedric Hombourger --- .../linux/files/build-kernel.sh | 5 ++++- meta/recipes-kernel/linux/linux-custom.inc | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index cb310f7..9faa6bb 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -36,7 +36,10 @@ REPACK_DIR="$1/../repack" REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image" REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers" -make ${KERNEL_DEFCONFIG} +make ${KERNEL_DEFCONFIG} || 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 c53cd90..b06529f 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -18,6 +18,16 @@ 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) + 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 +81,16 @@ dpkg_runbuild() { defconfig="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