From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6608507886135934976 X-Received: by 2002:adf:f8cc:: with SMTP id f12-v6mr778867wrq.2.1540558651168; Fri, 26 Oct 2018 05:57:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:e501:: with SMTP id c1-v6ls339076wmh.15.canary-gmail; Fri, 26 Oct 2018 05:57:30 -0700 (PDT) X-Google-Smtp-Source: AJdET5fk9MWRI6P8SzX4nycLTkfZsHy5zLqKHnz3984DCJHBCR2bwQ7xmjS5eklFiNqnvciiDfOS X-Received: by 2002:a1c:cc9:: with SMTP id 192-v6mr816663wmm.8.1540558650703; Fri, 26 Oct 2018 05:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540558650; cv=none; d=google.com; s=arc-20160816; b=hI9QC+4n06Fkz9PAiQGJH4Y2bYrHSppHBVy9H0MWuAOP3NnLMLjq5WWNse4HUw+Bd8 G1snO7T7L6dRL/48/q0+QGTfcYbqlx7MHs5LyFTEF65vOvLTsAw8jIamOK+qcXKP5H31 0jp16/JUCSD+Kmr/IO2s6kaCduYG3VvGy8tqslwePNp/sWRs+DfcBLueUxTbmMqEWfjL 1xQPsPZ7sZMF+j0LYpPeOlqCv/BTaAn5tjkFXwgFJ6hd4l3wzhzk6JziQUGSQ8B+tJVg A5aFKPxhAUWF+ioudeDvfkcYNzdeovGoE6lAAxsj7lYNPTQaga4Q7MjrzFK3CDQt0eOb jQ3A== 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:organization:from:references:to:subject; bh=p9C35BtYcTXqSbOzxivQ2DbDx4UdiVDIWB9WP4X4wPA=; b=zlCRY6KfUAjBI2Zic8xLZSQi/ZMpy8Tax6JYxsGEfpEJ5nBFtwDG/6Cm+v+16l7byt SE8Hef49nHcL925l5gG9vNpF89g4zT6vaXAHb7xj5evUL++YySD9PzyAxREtvYfVXq2B gc3q8E/8M9YqvFg1iJnfM9NZ9RS3L3UQ+Nh4GtSNSLMr/uDnxNyuMEuvBeMoIG8KC9j4 diaBkN6ufMHStu+AOAbNtYm5KRm4nn99j5I+3ZR/TdVo0LMKOU+qRJxnXx9xEPq5yOxX ZdHCjzeHmCxEywwF21fIe99/AS4jlqSw5HDHbKLyWpmdz1f4WqxZ9shMCeRALbgKfMVb PFig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id y10-v6si280391wrl.4.2018.10.26.05.57.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 05:57:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w9QCvRE0000993 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 26 Oct 2018 14:57:29 +0200 Subject: Re: [PATCH v2] linux-custom: fall back to using "make defconfig" when no config given To: Jan Kiszka , isar-users References: From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: Date: Fri, 26 Oct 2018 15:57:22 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 7r/0BzIJlcqJ On 10/17/18 9:48 PM, Jan Kiszka wrote: > From: Henning Schild > > This allows us to write kernel recipes that do not have to bring what > they consider their defconfig. If KERNEL_DEFCONFIG is empty, do not > attempt to copy a file into the tree and call "make defconfig" instead > of "make olddefconfig". Applied to the 'next'. Thanks, Maxim. > Signed-off-by: Henning Schild > [Jan: avoid negation in test] > Signed-off-by: Jan Kiszka > --- > > As I started to use that patch, I'm sending already v2 on behalf of > Henning. > > meta/recipes-kernel/linux/files/build-kernel.sh | 6 +++++- > meta/recipes-kernel/linux/linux-custom.inc | 6 ++++-- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh > index 3f39d43..32d62bf 100644 > --- a/meta/recipes-kernel/linux/files/build-kernel.sh > +++ b/meta/recipes-kernel/linux/files/build-kernel.sh > @@ -34,7 +34,11 @@ REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image" > REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers" > > cd $1 > -make olddefconfig > +if [ -e .config ]; then > + make olddefconfig > +else > + make defconfig > +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 8c89637..e9a68fd 100644 > --- a/meta/recipes-kernel/linux/linux-custom.inc > +++ b/meta/recipes-kernel/linux/linux-custom.inc > @@ -10,7 +10,7 @@ FILESPATH =. "${LAYERDIR_core}/recipes-kernel/linux/files:" > DESCRIPTION ?= "Custom kernel" > > KERNEL_NAME_PROVIDED ?= "${@ d.getVar('PN', True).partition('linux-')[2]}" > -KERNEL_DEFCONFIG ?= "defconfig" > +KERNEL_DEFCONFIG ?= "" > > python() { > kernel_name = d.getVar("KERNEL_NAME_PROVIDED", True) > @@ -43,7 +43,9 @@ dpkg_runbuild() { > # Install package builder script > sudo install -m 755 ${WORKDIR}/build-kernel.sh ${BUILDCHROOT_DIR} > > - sudo cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config > + if [ -n "${KERNEL_DEFCONFIG}" ]; then > + sudo cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config > + fi > > E="${@ bb.utils.export_proxies(d)}" > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov