From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6755821036247187456 X-Received: by 2002:aa7:cac7:: with SMTP id l7mr4327766edt.25.1576696267603; Wed, 18 Dec 2019 11:11:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:a2c5:: with SMTP id by5ls812110ejb.12.gmail; Wed, 18 Dec 2019 11:11:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwpVqbqZGLVFMLwbCdfgBLv7gb5afi/Pd5oqe4sJSyNNRPxWmgrAMNy/ijhGDPS1ghyFXHo X-Received: by 2002:a17:906:5ac2:: with SMTP id x2mr4574651ejs.29.1576696266632; Wed, 18 Dec 2019 11:11:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576696266; cv=none; d=google.com; s=arc-20160816; b=dGSiZSFpGUFMHPI6HyagLtpnA+IiNfeVDY2+S6SOlDXzxqdw98CxUnKNVicnZDYsjT STsU1Uj1eLvnPuebIrUlH/U8Kr4y6VYR8KZwNwTqcghv8sEYHEUwKJS+6Bhr7R6BpvyN A+Z/Xdh9G7vEVxtJrITFYXpMqtDBmiMREVf4l44WpjF24I6pAhN3GwOBbdLICN2FS11e PTIh5h+O03KPmX4RZuNQjwZn3S6cxiuk7Y+1tFpbha+w64hSec22TReeYfHslcb+7hU3 nqwsMA/3e9254JnKVdKEJoaD88HVAWnjg+w35D1dJVtEKA/Z48zJFsRgPc5LK4p3g+6R 8bGw== 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=z8SoLVipYUfDrdfGTm4aNH+DBDs2nWz+9JrERdxWBQ0=; b=zfva/sII4NWiSksBAjlWOojJqoorKop+TNa71gNAztPGBGA3NKveiuJ2tmlPt/CeaM Mqg4rCv1y+Q+0PT6bwokaJN0Z/rq4qJbKErLqolj/U8TVuKSwabEajnKd4Y3sNzdN00/ 6IQH32zRiFEJZEEDL78TElWm0uziochfCjwsGzESIevrdq5Pm9v6y8Qbf4GBTJ8dgZsu MKAm5wB1tocK57QCrSdgtvhzpYGQIaO9iBesTVhpdA3fL0jrQTU6v3N5OdJQn+djeDKO zKq1VKfzmOeGG3k5T79TTTiOCHCN/dcTjREAgdLpUDXbneDhJ2cNaS6BV9E1sq2K/E0W nTbw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id w19si116390edr.1.2019.12.18.11.11.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 11:11:06 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xBIJB626027203 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Dec 2019 20:11:06 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.25.68.37]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xBIJB5xx012070 for ; Wed, 18 Dec 2019 20:11:06 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v6 1/5] recipes-kernel/linux: make KERNEL_DEFCONFIG support in-tree defconfigs Date: Wed, 18 Dec 2019 20:11:00 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: aufgpQpxgGS2 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 b46cefa5..386e58b5 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 17f8464d..712f52bd 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