From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:a5d:5230:: with SMTP id i16mr3447255wra.317.1573056229914; Wed, 06 Nov 2019 08:03:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f091:: with SMTP id n17ls2136024wro.4.gmail; Wed, 06 Nov 2019 08:03:49 -0800 (PST) X-Google-Smtp-Source: APXvYqz/zNx7QY/s3CgJYAIvW7s3+jBfywUR4CUpXgkn+onbIl6lputKEheN0E29Hky1caZAPLSh X-Received: by 2002:a5d:4885:: with SMTP id g5mr3639944wrq.287.1573056229274; Wed, 06 Nov 2019 08:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573056229; cv=none; d=google.com; s=arc-20160816; b=KckV+HSa+tjm3xtjmfQIrHHAzAfNe739yKzh5E25VQM75nGTBBOa4FSpzvJiEeYNqg 6rcjL8JAIZTIFC/NfR6VBxnG4CYuOQydyfE+mte1uIwqQ1HKhOmITRat5lvJmivtlsWm Q8CD2Rs4WD+3hbnUyIta8sShC4ja29k69nwcj8LQHHaWm/x6kt0YXwIm8jiLSfs+knqv fnDinpWCtCfWAiBHdIaRlLQghIElGu03T+Wvx96Kd6UMmZPr+6yKyxO+5RNKepT3sqMr XyyN6UewXJclgZWrh0krU0J6ov2VdudzB0CQVYgWy2pvg1yJVsWTO2Aj+9+GJMI/XXT+ M9Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=RoM73qm2J76sBe2Q79JiPbJuuei9XUrFQuDkg2v9QG4=; b=klbF5oxLqeNmSkTH7nRQMSpHUD9JeA1+6djWT2OkTvA1ZILMXErQp/KoRm1yzCzQeX TZXuxk/MD8ZOhATlr2aGU4nUpILJH3K06DxSrCOHGTJ/mYQ/WmUBugcTJXbuhtGPwMuk fEFTcWRxmvo35UjNrStcXr3ikzNS43wkQOlJijBWZm17luJPw79OE9hi+sLI4fEW8BxV wXe39CI3EyGqnOPaGfo8MV3X5TQvHv4q3Y5Tj+NYKlkuRWN7h+bojom6VcD2228Q9/9u gpUeu+Gw2Kr5HCsg60bBrrpobq7uOEJfhYxF6k7v+8u+rVSXBq7eyNY/aEN+peXmKwoO 09YA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y140si173488wmd.0.2019.11.06.08.03.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 08:03:49 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id xA6G3mss013963 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2019 17:03:48 +0100 Received: from [139.22.41.172] ([139.22.41.172]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xA6G3lG8002185; Wed, 6 Nov 2019 17:03:48 +0100 Subject: Re: [PATCH 04/10] recipes-kernel/linux: make KERNEL_DEFCONFIG support in-tree defconfigs To: "[ext] Henning Schild" , Cedric Hombourger Cc: isar-users@googlegroups.com References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> <1571907744-1121-5-git-send-email-Cedric_Hombourger@mentor.com> <20191024200246.291f526c@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <030b523c-6e87-34e0-c4dc-2d27a719cbed@siemens.com> Date: Wed, 6 Nov 2019 17:03:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191024200246.291f526c@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: q/c3H7lSvAhr On 24.10.19 20:02, [ext] Henning Schild wrote: > Not sure i like that. We are mixing "make target" and .config-filename > into one variable. I would rather invent another one. > Would be in line with Yocto/OE at least. > KERNEL_CONFIG_FILE ?= "foo" > KERNEL_CONFIG_TARGET ?= "olddefconfig" Downside: you have to fiddle with both variables when switching from defconfig to provide config + olddefconfig. I think the unified semantic is not that bad. A user still has control over file vs. built-in config by not providing that file in the first place. Jan > > 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}" > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux