From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6608507886135934976 X-Received: by 2002:ac2:421a:: with SMTP id y26-v6mr500643lfh.12.1539802130896; Wed, 17 Oct 2018 11:48:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:1251:: with SMTP id t78-v6ls1463328lje.6.gmail; Wed, 17 Oct 2018 11:48:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV60o8wj/OIwFvHqdMZahJ0hd+7avaaO7FIbJ2je5RcjPbgYYwt2PuFOOzcPE0Jusio/64r+g X-Received: by 2002:a2e:93c6:: with SMTP id p6-v6mr838650ljh.16.1539802130185; Wed, 17 Oct 2018 11:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539802130; cv=none; d=google.com; s=arc-20160816; b=vT0s/IMYMNARnl/gTzrz4oNUOSsDzDmcOP/NSccRost+QJYIQgUL0zm9FwS8C9m/y6 I26sUGtsLhGCq/l6IyW6FmmNT70ot6sqpUqnCxS0vry+fNhcpICfWz7JZ0Op3au+K7j1 fVthdHe/UPncgOJko3zYVuYshkZdr8Aqn1WUKFTvcStu3MQL0K9jpS9OKz5glf8G2cGK gvQRgSXztu6h37mT01IR+cfnEVu5kfgHqyKRxJB2F0np76xDNv8OIgQQb6WjGSOWxguv F9pqnNH52HrHzh9sjDTD5vuhjeJgSAqurbaVGEhKcNB6R1jFvdL9f82X61ISpIOFWK4i RYzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=sf4lO2yJyHn2zVMHbsxQelPjJLDqmMDsRB+GCQ2OK30=; b=ZX0cdjhzBVo8KH/eU251ICiAh0WpG2yZ76VafArnKsCIE8TT02mlCw38Cxloxpu8I0 zTy9MhOa5yv/Ta/hU7hzOOjK0zRKEP65KKVpoaXs8AqvurpfbHYX1Fi+mkhl+OFsbXut nUOJ7muLeYz/zT/bxZusfhEelr65CUnl00lnMngOjTr2+/E+SrfN4qNagCBAstLeSJio Ms3LA5qSo00kne42alcQnIMizAckamepIPuLRT5RXYChA8PmOEVBACkJgaoQAm64kr4m Ujp4XE02cpclMAlQT1X4sFpkQj3oX+fDC4JbMVtt3ZhTXr+zzGnVavkxcfZ5Z73eO9sf BpNg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f192-v6si401189lff.4.2018.10.17.11.48.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Oct 2018 11:48:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w9HImnQQ021634 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 17 Oct 2018 20:48:49 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w9HImmFa023740; Wed, 17 Oct 2018 20:48:48 +0200 To: isar-users Cc: Henning Schild From: Jan Kiszka Subject: [PATCH v2] linux-custom: fall back to using "make defconfig" when no config given Message-ID: Date: Wed, 17 Oct 2018 20:48:49 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 9pdKjSPqozb3 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". 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)}" -- 2.16.4