From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a1c:7f87:: with SMTP id a129mr3902958wmd.156.1580293811402; Wed, 29 Jan 2020 02:30:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c0d9:: with SMTP id s25ls5449684wmh.0.gmail; Wed, 29 Jan 2020 02:30:10 -0800 (PST) X-Google-Smtp-Source: APXvYqzWH6aDJL4O/IOA0XJWMQlrQBM1cfpsFjM9USMZVL7X0JfGnoVDWvnfXGUGimsuSD98oj75 X-Received: by 2002:a1c:dc85:: with SMTP id t127mr11554881wmg.16.1580293810646; Wed, 29 Jan 2020 02:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580293810; cv=none; d=google.com; s=arc-20160816; b=ScQauZ+Bu5JaScEqIUfsKHjKzuyWcfgrxBY9HTkeIDmcA3hxxHp3PrKezY3KTTUj5B QuljJ4rai52Kp/MLs/cEH6yLMkT2MI+G0RRk5aBJLbWZmTN8KcK3dRnvGeKD0brjjCSi 0Ji7HS2PgjPr4MYQdF+EYdDmdZdsuF24AIYqYnoNFgf/+jGu1s5KnOOiXOOb6Isj+H/H Da9dRsvdEgVpwn74X6qeyUkGmuqwBNmGMcN2okZhOKksNkecG+lN2jo9Emuyvz4seQUG A6JpQMLR5cR6myve5yBGerCR9BGPyiDizgElfUju1y+yXYzOlhG/h0oYRD1SrVDtreG5 kjjw== 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=mltU1J3eewFCgkaaLzIWK5unKjANU5dvULCiMqq6uvY=; b=hYzHcVA+L5O9mZpRoDcW2hyHzTaw/ENeE/qHHKGQO5YZN5nV9pyuFQHhL9oVd7guFz pNY4T5SuQzwN6s2zfUYY76SXfjckr7SAm2MLy4SWEM4U2813bxW/0cxOJa1S/k0j60Sq EFVuFNs8rXip9+PS7HJ4yDUG3p4NgHAbFGZWcqbZFnd+IsFVq/kSIdKY8Pr44MbPKLjd A92by9jViwsDnT3q8bhbXA/3fC9M1Xf8rAQBrbZirgYkGPjSKK60lKuQS8fFnrp+9LrR W4NZmGvk/0U6zLcHI2EEOOUF5YLU0+ynpXVkzkU+Z1ZneAR7P+arpf8QTYJzqN1feTJm MiaQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id w11si89732wmk.0.2020.01.29.02.30.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2020 02:30:10 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 00TAUAmS009293 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Jan 2020 11:30:10 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.47.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00TAU6E1009574 for ; Wed, 29 Jan 2020 11:30:10 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 12/14] linux-mainline: Avoid failing UBIFS test when defconfig does not support it Date: Wed, 29 Jan 2020 11:30:04 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: n/f7f7XrJXIG From: Jan Kiszka Will be relevant for RISC-V. Signed-off-by: Jan Kiszka --- meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb index cb4d5e33..3c5335e8 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb @@ -28,8 +28,10 @@ LINUX_VERSION_EXTENSION = "-isar" # For testing purposes only dpkg_configure_kernel_append() { - grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \ - bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled" + if ! grep "# CONFIG_MTD is not set" ${S}/${KERNEL_BUILD_DIR}/.config; then + grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \ + bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled" + fi grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \ bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled" } -- 2.16.4