From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a17:906:5fce:: with SMTP id k14mr130770ejv.162.1571940168154; Thu, 24 Oct 2019 11:02:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:daca:: with SMTP id x10ls1596333eds.13.gmail; Thu, 24 Oct 2019 11:02:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1zSTssfBRzbm8RtvF7QrpgD07ZW2oVlxkDsAXGGlmTUJiewmFjGSin0LodaWwXL4zho2F X-Received: by 2002:a50:ee8d:: with SMTP id f13mr32681385edr.285.1571940167580; Thu, 24 Oct 2019 11:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571940167; cv=none; d=google.com; s=arc-20160816; b=wlN2h8DhEzeMofVi/fzr8uQCBHkzg0Rm2BcCSKmXcnXFADrsuNBxUKKxiy4EykNceg aium8L2FpSlIWPrkFGVcxiMYFPawa8x8gssOubcuz1OfG4xT4AOZHpCPEYQJ5GbrqP8v y00bGowTSr5AbGzboV43tG1HTJrIN9C9BsRFi2mmQbh6tnya5NnwW+Z0rpGQFve1oelE Djm42yFfLXtNApnSaFcfqwTswVS8vzr5N9FOyyAE7dXx4DXbNd5cxQ2XiJQzUbpxAqEh 5KH3MVIGmo5tGwfhImqSVVwCN1s2BfH2ARsBNTYFN8yGZES27lHQqNu4DfzMz4Z97dYt QZFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=5supoUjcvqUalP3UByx9wmbz04//rWk9eaBZXeO9lW4=; b=l5QQE/l1J8euZ+aBdFW89XZub90NlnuI4eS6LT3Zjq6w7n8Fe+KRBGtyqpJPcEwa9Q 7CDIeCss9co1jAWhuzjCeZO+xe/OTJbuvNA0D32mwsbxBvFHAmqedxfMMGYor8+vIOuO YoC/HOZO0mmexOjDC773+WcGLF8FudAEGC8A9sGAWabKALF8OkMH+tP/wCLfzx2KP0l/ l7w9HoZak6g4K068xplUI0NCuLBZw6s/mzHSLlpiBCBGBShWkD3nD/OjK9LkEZhbNQVH /bwaAo9H7LvDoLgXHuoUl1j63bnnwjNAcmkUStxMzIvue4vCDo2pTz+pMAILtYIGukmZ ZFSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id c28si1273402eda.4.2019.10.24.11.02.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 11:02:47 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x9OI2lPp006923 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 20:02:47 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9OI2l5b014232; Thu, 24 Oct 2019 20:02:47 +0200 Date: Thu, 24 Oct 2019 20:02:46 +0200 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH 04/10] recipes-kernel/linux: make KERNEL_DEFCONFIG support in-tree defconfigs Message-ID: <20191024200246.291f526c@md1za8fc.ad001.siemens.net> In-Reply-To: <1571907744-1121-5-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> <1571907744-1121-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: j2m8+xoqyANN Not sure i like that. We are mixing "make target" and .config-filename into one variable. I would rather invent another one. KERNEL_CONFIG_FILE ?= "foo" KERNEL_CONFIG_TARGET ?= "olddefconfig" Henning Am Thu, 24 Oct 2019 11:02:18 +0200 schrieb Cedric Hombourger : > The recipe expected the specified KERNEL_DEFCONFIG to be provided as a > SRC_URI while the kernel already provides many useful defconfigs. The > recipe will now check if the specified configuration can be found in > WORKDIR. If it is found, it will then be used via "make olddefconfig" > as before. It will otherwise assume that it is an in-tree defconfig > and attempt a "make foobar_defconfig" (where foobar_defconfig is the > user-provided KERNEL_DEFCONFIG setting). > > Signed-off-by: Cedric Hombourger > --- > meta/recipes-kernel/linux/files/build-kernel.sh | 6 +----- > meta/recipes-kernel/linux/linux-custom.inc | 11 +++++++++-- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh > b/meta/recipes-kernel/linux/files/build-kernel.sh index > dcb46f7..cb310f7 100644 --- > a/meta/recipes-kernel/linux/files/build-kernel.sh +++ > b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -36,11 +36,7 @@ > REPACK_DIR="$1/../repack" > REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image" > REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers" > -if [ -e .config ]; then > - make olddefconfig > -else > - make defconfig > -fi > +make ${KERNEL_DEFCONFIG} > > 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 5a34dd1..c53cd90 > 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc > +++ b/meta/recipes-kernel/linux/linux-custom.inc > @@ -61,8 +61,14 @@ addtask devshell after do_install_builddeps > > dpkg_runbuild() { > chmod +x ${WORKDIR}/build-kernel.sh > - if [ -n "${KERNEL_DEFCONFIG}" ]; then > - cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config > + defconfig="${KERNEL_DEFCONFIG}" > + if [ -n "${defconfig}" ]; then > + if [ -e "${WORKDIR}/${defconfig}" ]; then > + cp ${WORKDIR}/${defconfig} ${S}/.config > + defconfig="olddefconfig" > + fi > + else > + defconfig="defconfig" > fi > > E="${@ bb.utils.export_proxies(d)}" > @@ -72,6 +78,7 @@ dpkg_runbuild() { > > export KBUILD_DEPENDS="${KBUILD_DEPENDS}" > export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}" > + export KERNEL_DEFCONFIG="${defconfig}" > export KERNEL_FILE="${KERNEL_FILE}" > export > KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}"