From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6755821036247187456 X-Received: by 2002:adf:ef10:: with SMTP id e16mr4382641wro.336.1576696267596; Wed, 18 Dec 2019 11:11:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ebc5:: with SMTP id v5ls956940wrn.8.gmail; Wed, 18 Dec 2019 11:11:06 -0800 (PST) X-Google-Smtp-Source: APXvYqymfcnmPXvZ2h9j3izYIt5ZTD+5WIDP/ZUQnKKaBXYyXvPgv8sDBYqR17kG374iQjCWIKJs X-Received: by 2002:a5d:5491:: with SMTP id h17mr4722548wrv.374.1576696266833; 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=p3fphc3IGKuryxbS2UbWvmQNxRkilBmkUcSqpgyLD/KguViycbaGRZpMki0/tZIypG qTpBZIEtOolNohZmxSp79xXmRu+Pg/UXa6pxYjnznCBbvz4E2fx0jSZLVXo3H6NWK9ps 9oQodbmWZu5NFO4uuG47mFtLLi8+sB6/3sZEkzv+U8iX1Al90qNPj/liGlDyH2isRNgo n+le0ZH5cYAVreM7SaFZiS/qZyGNmgnc/uNJBe/cXBFiMpK2TUr/fIc5bxlG8TyL8TDE 2eJrAIk2TSBkPgAgM4O4LKWvru/tNg+PQQ9daT0cFoE6FEwj/qOJEkCxOcEgjByektm0 ZZDw== 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=D/4PNYHH1BgASFNUcUT2xOFWviQRVC4RdP9vJdQAbSE=; b=ogsB3EHvPc++VtzPvKW8cXkEFCPFh03l3WB4G+ex+bFOASU+Aj46c8KG/NzAWiinmq 4wJaWEAByCBspnYPgPH12yE+feFxsPRdBdgx/e0qXIqmtkHu42O92ze8bfrf4fEISVQS /6Fw8TYPbVZnGMvzHAwC5daQIQlpy1nNERIOk0iFxt85+NefEGV77vfTUDnCNDDR6shN zdiz8uUHMj0iijhBJdUyN7ebHE3NwN6CbxZ8P/s1B/9ir6kinVBXj1QI7xmnMX5Du4ep t8fYalkECchqcoD9prBzkWDWyNmGL6exhIMN2R38nFY2Hu6L66Lmcf9kcx+G3TpRNY2q CZlg== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m12si148393wrq.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.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; 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xBIJB6R0008623 (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 xBIJB503012070 for ; Wed, 18 Dec 2019 20:11:06 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v6 5/5] linux-mainline: Test config fragments and LINUX_VERSION_EXTENSION Date: Wed, 18 Dec 2019 20:11:04 +0100 Message-Id: <92b21f46919c5e865fe057fbf330cfb5ab40cc92.1576696264.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: L8/53i8ZEqR6 From: Jan Kiszka Covers both the case of successful application as well as suppressed one via "apply=no". And it sets a non-empty local version to stress the default-off path. 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 | 15 ++++++++++++++- 3 files changed, 16 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 00000000..97ec48c1 --- /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 00000000..72c1f7a4 --- /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 695eb391..cb4d5e33 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,13 @@ SRC_URI_append_de0-nano-soc = " \ S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" + +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" + grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \ + bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled" +} -- 2.16.4