From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6768877608478179328 X-Received: by 2002:adf:f484:: with SMTP id l4mr4804968wro.207.1576002130875; Tue, 10 Dec 2019 10:22:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fc89:: with SMTP id g9ls7202829wrr.5.gmail; Tue, 10 Dec 2019 10:22:10 -0800 (PST) X-Google-Smtp-Source: APXvYqzs8D4DeEVRQC4dHBDmmN/eXlQYsVqqoBbehcoEgxeHjxMIpJnS0kk8ud2d+30Pj68ChCe7 X-Received: by 2002:adf:e3d0:: with SMTP id k16mr4891664wrm.241.1576002130112; Tue, 10 Dec 2019 10:22:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576002130; cv=none; d=google.com; s=arc-20160816; b=tG9SfQqf39RMi5oe8HZ07WFJZJQkDB7GSbT5Wb7RxnsYl8MdzwpHJfmt8alT2k4jmF /FfXdDaNJ4zrXx8y995PWvS0GlGCxplFn9ixhCFG6MPWv5bQ3cEVgDcMyftPykwyCOgN ssyuMUSE/X3n9X3tTqDRqOuseEgzRudKTOgk1qfPPchB2XsBiXrR22osX9tZk/HDoPSW rUntvd1PC8g3kpOPH2e4OlLp2oXRys+j6dYViMXciiTCOJl92ZESwJmOl/33vUV4fG7H T8cnbnFwsngWovv0iHERLE5AQ6m01LBO3pJtb2GjoyCUc5mbXZg//QqTvtIZaj6hZZbC nMkw== 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=jgC/P6+YYflcaHI1Ou9/AKVNdArxccEqOo7pNlVrglM=; b=VYHt7nz26CPPKkx345J0SuvkJ8MbTAf2jxfZmwe9RNEzz5op5q68a7f8pf4pwADY7u FVnURbIoS3RARrjQ4y3Ywb1RcqGDgcG5ALLcpHuCcR6bOZmNB1op46NY3j5oDbs450n6 nXBytOubTxe/V5vARSevpjpk+sNf1cxLO+EFf4egl0C7UMvksP5Jq0WbNP2Ph7vWCmpu yyCCuAaF3oinRM8VvEi5rkADWc3X4zcbwPcFRgnHiUI0vh7837wAiGAOzGnv+Bon09Yn ofVNtj9durUeEVcY8RgbI5y2sbEjyEGtD7BpXRtZlNeTR0N8Y3czlSfhopj+mO4IFGa3 LNGg== 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 b196si121780wmb.2.2019.12.10.10.22.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2019 10:22:10 -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 xBAIM9bU000422 (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 xBAIM9NG019987 for ; Tue, 10 Dec 2019 19:22:09 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v5 5/5] linux-mainline: Test config fragments Date: Tue, 10 Dec 2019 19:22:08 +0100 Message-Id: <9f3d678969d395ded8babaf1680a4204ef5d5b31.1576002128.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 49I2SyUiHim8 From: Jan Kiszka Covers both the case of successful application as well as suppressed one via "apply=no". Signed-off-by: Jan Kiszka --- meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg | 1 + meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg | 1 + meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb | 13 ++++++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg create mode 100644 meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg diff --git a/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg b/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg new file mode 100644 index 0000000..97ec48c --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg @@ -0,0 +1 @@ +# CONFIG_ROOT_NFS is not set diff --git a/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg b/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg new file mode 100644 index 0000000..72c1f7a --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg @@ -0,0 +1 @@ +# CONFIG_UBIFS_FS is not set 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 695eb39..759d123 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 @@ -11,7 +11,10 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else SRC_URI += " \ https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${ARCHIVE_VERSION}.tar.xz \ - file://x86_64_defconfig" + file://x86_64_defconfig \ + file://no-ubifs-fs.cfg \ + file://no-root-nfs.cfg;apply=no" + SRC_URI[sha256sum] = "c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe" SRC_URI_append_de0-nano-soc = " \ @@ -20,3 +23,11 @@ SRC_URI_append_de0-nano-soc = " \ S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" + +# 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" + grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \ + bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled" +} -- 2.16.4