From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6768877609333817344 X-Received: by 2002:a05:6402:1742:: with SMTP id v2mr39939739edx.171.1576002130628; Tue, 10 Dec 2019 10:22:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:cec9:: with SMTP id si9ls4904597ejb.4.gmail; Tue, 10 Dec 2019 10:22:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyiUjWAkqaEPpslKh9H916SZJkSXEzB4eDwuqkuExaPt0HsBuTAnNvrsM+ONlbM+fUCuPIU X-Received: by 2002:a17:906:d7b4:: with SMTP id pk20mr5184726ejb.71.1576002129800; Tue, 10 Dec 2019 10:22:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576002129; cv=none; d=google.com; s=arc-20160816; b=CX0Yh7tEAw2GeZJHcbxjRikAYr/XMpp/ZUu/8hwonWuoqPlTPE83uAqtrYVJSKV3zj HPxpfe7cVhhHJGD5Ok12glbJdzHgLghQRpLQedmmEBPD6Sbi4Kdqfe6MtlA0EEn8r/3a p6w2dVzKMBblUc1PMBLMXUQuy83UjF2HV50+Sa0YyK2csbX3WBWBDs/euB/xo8NpL211 Ylh+tRhOXPoDyO76iE5IF4w3+7LxRuBwyVX+ts51XwqEuX8jCtjKIOwtHT82m1vU9Caa w62XiBg+miiIiYbmixecuprsvwK9L7vE8Gdex738+tUsNg9kR9fqXAgQhj9t7S3kL3lN b7rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=AI9G1Jf4B9akKiiYVg3p6WeaYWPzx9j8LSVHCZTNq9g=; b=gbDwQ0sWAF3My/3QH/2T/3iiMxUB4Bbm2VMRNb7pRvmzUbNUtna1Gec/dzw30bOd2k NVt1zDUP2A/f1R+yGNT/9Vv6wGNWQjC4HL0oRS41HTADE+C+GyF5PrGq2/9ts0S8bjJW f/xCejHpI/YLX4B2emNiGRxPrmLaDkLDUKkKGNlHhOhjBFt0S7VfNzTBH32taPJ5BBWf hUSeQGEZflc+0prO6YuIhuIYJVIuRarDtVkhMMMx6/mUqqeM1qIfKgT/ARt40iIP4rck TNqVXoVrdWWJ1A9NjX7svbtH0uR7nBW+k4/eOJGlnIIIEf48OmZQmfYLI5Uiw+eatNPc HPng== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id n21si139206eja.0.2019.12.10.10.22.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2019 10:22:09 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id xBAIM9SH000407 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Dec 2019 19:22:09 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBAIM9NC019987 for ; Tue, 10 Dec 2019 19:22:09 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v5 1/5] recipes-kernel/linux: make KERNEL_DEFCONFIG support in-tree defconfigs Date: Tue, 10 Dec 2019 19:22:04 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: eX2WBAkW56LW From: 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). To support this change, a KERNEL_CONFIG_TARGET variable is passed to the build-kernel.sh script via the environment. Signed-off-by: Cedric Hombourger Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/files/build-kernel.sh | 6 +----- meta/recipes-kernel/linux/linux-custom.inc | 9 ++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index b46cefa..386e58b 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_CONFIG_TARGET} || exit ${?} 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 17f8464..712f52b 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 + KERNEL_CONFIG_TARGET="${KERNEL_DEFCONFIG}" if [ -n "${KERNEL_DEFCONFIG}" ]; then - cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config + if [ -e "${WORKDIR}/${KERNEL_DEFCONFIG}" ]; then + cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config + KERNEL_CONFIG_TARGET="olddefconfig" + fi + else + KERNEL_CONFIG_TARGET="defconfig" fi E="${@ isar_export_proxies(d)}" @@ -71,6 +77,7 @@ dpkg_runbuild() { export KERNEL_NAME=${KERNEL_NAME_PROVIDED} export KBUILD_DEPENDS="${KBUILD_DEPENDS}" + export KERNEL_CONFIG_TARGET export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}" export KERNEL_FILE="${KERNEL_FILE}" export KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}" -- 2.16.4