From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6755821036247187456 X-Received: by 2002:a2e:8981:: with SMTP id c1mr1675707lji.8.1573118679046; Thu, 07 Nov 2019 01:24:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:904c:: with SMTP id n12ls1445597ljg.8.gmail; Thu, 07 Nov 2019 01:24:38 -0800 (PST) X-Google-Smtp-Source: APXvYqwYCBFs6+stNuqvYEUonc/XaBZnSpULpMltVgFNku8brK3YTC/x16yvgsRyrvtlhXK/zhIP X-Received: by 2002:a2e:898d:: with SMTP id c13mr1657279lji.54.1573118678117; Thu, 07 Nov 2019 01:24:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573118678; cv=none; d=google.com; s=arc-20160816; b=JYSD3QZOrqHmbs9qH5MeFMDJ5BezY3mmylacq3joknFRPofamfITLxt/uUQQQUqFF9 mAu90Z1gT0QwoUZHEAfIUN8NChQJEIuTchy89BBGYh7NjdNjVQf+Zx/XjYT3eUjyazjl ZCexNstl2oKCArHcTK6luh+/aTE5eITcpm1W7IBXgBVG1tQwWQltClSnu2eBz34vWU6E OvmX753+kTnmQndhA5gSg0PqwkMfaM5H/r+pDhFwKVTkvcbzJYP6ujfABKX8faG9CMf8 9Q8mylzYeRhH4GOyefhrG6+pRqftcgvBjrzO6LLatZnQZgrvrQP6M3cjtDP8QFMXZX+B 6G7A== 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=EyDe+k9kEEw/GJ2buHavuZjK1/NSEOwe6gtUBQYIhzuH88draIMmLrT355v5coJvWx 2ZhcT2yD86K1mt27/Lmj5QLY7AguKe24Oy6zOozeP9TM5FaBHyoi26tgsM0V22h6PSAz LWX8RKl3xhRUpHNGKQS7QOqfsHHSpNKENYCuKSxymXX13YqF9fPvK2j4vghPf+U0spOF bS0bnC96hWVJKDA0Xn2cNnBbK9f4zIB52AtjROV2M0VJzuuoIoUKg+mBS96Hfe7SqLOu xtgrx9TdZrLykq4PR+bXrosx7IhnKFWG1Pr3W1e9piUnpDgtw7HY/UiKeR7FGeAgXuTC h+6A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id z9si116405ljj.4.2019.11.07.01.24.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 01:24:38 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: KUyZHkxTSgwP8RXq8m25UKL+bJX3JkSM+1OG39PBJs2jF5Y2QDDoS2zrG1JlTtQ6hIUUuIpRA+ xamsXry0PLZHMFb2zSNu45cesxeVKaXCaedyCzgZpQkfHHSxTngX7OmN14Dk3ZruQwWoZ3jgZD JDKYVqC7cAn87IuYPdYGXs39Wv4UHJqNmYt3Vx+wmIX4NkdqRPXccmdKpJQItJms/gGr+CM655 sfKac/cTjYFg5klINPNhgFbZO0O1ymI+l6UCcJzn5Fv5ka6Xd/ZfUzM8nd97qa+aehXVZD3LMx C4k= X-IronPort-AV: E=Sophos;i="5.68,277,1569312000"; d="scan'208";a="42954970" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 07 Nov 2019 01:24:35 -0800 IronPort-SDR: twCvrs8y0Cb6261nf07fSOwpyWXJDqBc2p7GuvLYFe9lRkjCyZsWwgbbeKfboBXr85szPr3234 by7Z1i8KQLWyf9zmTxKbhekcMcXUmXDAb+YWlR2yXqXccRSSw3LG8k0AvxyQ56NS8sXK1lw+TR nUuUhQ006nIEBYO3iTL4CAI5nC0V5uzDhZjMkHuPPPNnZunH5xbNzaoaCJYl5oaS1Hd3T7zN4a Yxz67MgnMTvUwuwoSpyNgf//m1Rz55hBtjivma9gsW41tvNRW36DoCotTdD4v32u1NdhzkUZT/ o8M= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH L-C v2 4/7] linux-custom: add support for kernel config fragments Date: Thu, 7 Nov 2019 10:23:21 +0100 Message-ID: <1573118604-909-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1573118604-909-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1572962145-318-1-git-send-email-Cedric_Hombourger@mentor.com> <1573118604-909-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-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: Shm+7vBx6BeB 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