From patchwork Wed Jul 7 12:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D452BC11F6A for ; Wed, 7 Jul 2021 12:17:17 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AC3961CA8 for ; Wed, 7 Jul 2021 12:17:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AC3961CA8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6601+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id v19gYY4521723xAaJbiB6JFU; Wed, 07 Jul 2021 05:17:17 -0700 X-Received: from lizzard.sbs.de (lizzard.sbs.de [194.138.37.39]) by mx.groups.io with SMTP id smtpd.web10.20223.1625660199736032157 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 167CGbm8029829 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:37 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEX020405 for ; Wed, 7 Jul 2021 14:16:37 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 1/9] ci: Select large runner Date: Wed, 7 Jul 2021 14:16:28 +0200 Message-Id: <687844f994dd0a79b63f5263ba2d7d8716c4bb05.1625660195.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: B8dDsPwMsoafWuH2uuzjtlC5x4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660237; bh=zNqvpFgp3fiXO7Yrq0f5Hi35tZVLSQyf3YZpc4q6raY=; h=Content-Type:Date:From:Reply-To:Subject:To; b=HHpBzAIZviI/+G78jue7pvE3qnfurzzHCTzYZYQM/WGhpOe4qhFOWzQtURPgnjHWmgH noi9TADKoRCrZdS03wvOKVGwyI4FqVYh+LelKMKzjAWoej/FgMMja4JIOL6NPcSp2yDDO gxljOPCL9j4Gncsc9fZNyNh4hrqjjBBeKxk= From: Jan Kiszka Needed since we now have multiple options, and the smaller one is not even compatible with Isar. Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d9ced0..823160f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,8 @@ default: .build_base: stage: build + tags: + - large variables: base_yaml: "kas-cip.yml:kas/board/${target}.yml" script: From patchwork Wed Jul 7 12:16:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6335C07E9B for ; Wed, 7 Jul 2021 12:16:59 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45DD861C9A for ; Wed, 7 Jul 2021 12:16:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45DD861C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6598+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id Hyx2YY4521723xQ1wJjdjUvi; Wed, 07 Jul 2021 05:16:58 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web08.20133.1625660199090065128 for ; Wed, 07 Jul 2021 05:16:39 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 167CGbrc014136 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:37 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEY020405 for ; Wed, 7 Jul 2021 14:16:37 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 2/9] Update to kas 2.5 Date: Wed, 7 Jul 2021 14:16:29 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: fxpHvegETEzzxaVAG63Fy8DBx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660218; bh=VeYqJzF+xliGHWbsomaHpmp3GqZY5ikgkRqR2xTln/4=; h=Content-Type:Date:From:Reply-To:Subject:To; b=V2euCmVn/84FwJ7/9xyeKUwlxUXyiyfsffR/jAaOtV9qXqhILYdzDj8BisS3qZoDtuP WLdvf5gsyvhuDoRG6+5wddh/BzIW5525p/I195Xq/5r+t+olPilowgpq/m4/sjcFcklFc Sp821KoB27uQ2hYZbuBSZ+eYPIA0QPRONJk= From: Jan Kiszka Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 823160f..2a9ae22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ghcr.io/siemens/kas/kas-isar:2.3.3 +image: ghcr.io/siemens/kas/kas-isar:2.5 variables: GIT_STRATEGY: clone diff --git a/README.md b/README.md index f038db3..32812a2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ from scratch. Install `kas-container` from the [kas project](https://github.com/siemens/kas): - wget https://raw.githubusercontent.com/siemens/kas/2.3.3/kas-container + wget https://raw.githubusercontent.com/siemens/kas/2.5/kas-container chmod a+x kas-container Furthermore, install docker and make sure you have required permissions to From patchwork Wed Jul 7 12:16:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FAB1C07E95 for ; Wed, 7 Jul 2021 12:17:02 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E7C461CA8 for ; Wed, 7 Jul 2021 12:17:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E7C461CA8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6599+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id umIhYY4521723xWVLUktV44h; Wed, 07 Jul 2021 05:17:01 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web11.20216.1625660199336006262 for ; Wed, 07 Jul 2021 05:16:39 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 167CGbU3014142 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:37 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEZ020405 for ; Wed, 7 Jul 2021 14:16:37 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 3/9] swupdate: Do not add .ini file to SRC_URI if SWUPDATE_BOOTLOADER is not set Date: Wed, 7 Jul 2021 14:16:30 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: EhsVEFgj4hTTkke62nISAVMax4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660221; bh=0ZAIt7MwmASCFEQv8aBOmJ263OAVF7Ki3kxkrhCv9wI=; h=Content-Type:Date:From:Reply-To:Subject:To; b=DGKQypM/HjE12iS10KV1Nk4YNxOyZcSCH6+qPDpYMbQn4VCqq6/zK1z7TFOL9m2cbOu BDFh6q4rCa7sLvCaaLh7mGXzGpLTUxdCLxtAXqU4iw21CNJtw7Y+KbOFHS49h9IV9ZBaA jlebLC/lFSlJ7L2Z7NS+P1+nj1eHDjXQbJw= From: Jan Kiszka This prevents false warning during the parsing stage when swupdate is not used, thus SWUPDATE_BOOTLOADER is not configured. Signed-off-by: Jan Kiszka --- recipes-core/swupdate/swupdate.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb index 4984a63..8bef9ab 100644 --- a/recipes-core/swupdate/swupdate.bb +++ b/recipes-core/swupdate/swupdate.bb @@ -30,7 +30,7 @@ inherit dpkg inherit swupdate-config SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG ?= "swupdate.handler.${SWUPDATE_BOOTLOADER}.ini" -SRC_URI += "file://${SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG}" +SRC_URI += "${@('file://' + d.getVar('SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG')) if d.getVar('SWUPDATE_BOOTLOADER') else ''}" KFEATURES += "luahandler" S = "${WORKDIR}/git" From patchwork Wed Jul 7 12:16:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DBC6C07E9B for ; Wed, 7 Jul 2021 12:17:13 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B553161C9A for ; Wed, 7 Jul 2021 12:17:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B553161C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6600+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id 8JMDYY4521723xI40JUF3NSz; Wed, 07 Jul 2021 05:17:12 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web10.20222.1625660199616047543 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 167CGbXp014150 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:38 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEa020405 for ; Wed, 7 Jul 2021 14:16:37 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 4/9] Update Isar revision Date: Wed, 7 Jul 2021 14:16:31 +0200 Message-Id: <4b8eaad4b549aa53bab9c39919ee19b8d8356d1a.1625660195.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: gOOdIFHov2UDbrZMSu2KqXfbx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660232; bh=D5icoiB1cHiUhGkB1zMjsihLAJiLP7GLqV5dStM/GnE=; h=Content-Type:Date:From:Reply-To:Subject:To; b=dMn6/D8jl/mb7uMU4crtE2gDj7m8kJ0uCZ+60PBU4mvYO8yuw6LTCVH+YZWc9UgP/fP sFs81Yffl/yQNzm1TRnjBlzOh6AdiRv4OSObbMjxDN931Va0+RdKfnXA7MrrvfjQq3kz2 0n5SVYbDQ6i/QS06jhHD1hftgqbvN9VTHh0= From: Jan Kiszka Move to latest master. The only patch we have still applied, could be replaced by an upstream mechanism now, but that can come separately. Signed-off-by: Jan Kiszka --- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas-cip.yml b/kas-cip.yml index 9514083..8fb9004 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: cd1327a47a7b00df98eded582aaf5b1ebdd45628 + refspec: 03124cca669f50b682336a0bdf4ede5a4238e144 layers: meta: patches: From patchwork Wed Jul 7 12:16:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63E64C07E95 for ; Wed, 7 Jul 2021 12:17:08 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE63661C9A for ; Wed, 7 Jul 2021 12:17:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE63661C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6602+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id B1DCYY4521723xVqDoyIk2BF; Wed, 07 Jul 2021 05:17:07 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web10.20224.1625660199783920877 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 167CGcTk014160 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:38 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEb020405 for ; Wed, 7 Jul 2021 14:16:37 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 5/9] conf: Drop no longer needed DISTRO_APT_SOURCES settings Date: Wed, 7 Jul 2021 14:16:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: QEhIHeayGM9EtMAhjyhIKK6Kx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660227; bh=zKRE40md2KdC6wawI2AkoXlRqMX6tvzfYFMFd8PuemE=; h=Content-Type:Date:From:Reply-To:Subject:To; b=OXa0rRdXW2ORo2TGc9FvJ6cDzjP7g0T1tU64eBjLSLGCFjBBhZZEFlvCjqq9i/Wgq4j jQBvWhia58MzajJIrbRxeHNoJE6Kx8+sGs81tfet+gdgFwc5wpu09VDWhWEFzLcbiRV4A LuxtVwSLs5aDUTiS1En77/b9aloL5T3oUbw= From: Jan Kiszka Isar changed its debian.conf files again to make this obsolete. Signed-off-by: Jan Kiszka --- conf/distro/cip-core-buster.conf | 2 -- conf/distro/cip-core-stretch.conf | 2 -- 2 files changed, 4 deletions(-) diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf index ef60d24..c5cb39c 100644 --- a/conf/distro/cip-core-buster.conf +++ b/conf/distro/cip-core-buster.conf @@ -12,7 +12,5 @@ require conf/distro/debian-buster.conf require cip-core-common.inc -DISTRO_APT_SOURCES = "conf/distro/debian-buster.list" - PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" diff --git a/conf/distro/cip-core-stretch.conf b/conf/distro/cip-core-stretch.conf index ad185dd..31900fa 100644 --- a/conf/distro/cip-core-stretch.conf +++ b/conf/distro/cip-core-stretch.conf @@ -12,7 +12,5 @@ require conf/distro/debian-stretch.conf require cip-core-common.inc -DISTRO_APT_SOURCES = "conf/distro/debian-stretch.list" - PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" From patchwork Wed Jul 7 12:16:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362495 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A81B0C07E95 for ; Wed, 7 Jul 2021 12:17:18 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E60761C9A for ; Wed, 7 Jul 2021 12:17:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E60761C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6604+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id YLPmYY4521723xArxPwOprJI; Wed, 07 Jul 2021 05:17:17 -0700 X-Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by mx.groups.io with SMTP id smtpd.web10.20225.1625660200142584593 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-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 167CGcj1018251 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:38 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEc020405 for ; Wed, 7 Jul 2021 14:16:38 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 6/9] Add bullseye image option Date: Wed, 7 Jul 2021 14:16:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: DE4R7pKA1QnbsGVwgatycAvMx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660237; bh=ffOMYRour0iJ0CDPoUlh4SHRaq1z2WYDl4K2LM+ELBQ=; h=Content-Type:Date:From:Reply-To:Subject:To; b=S44SpOCuGq0jmdqBkYz/fIQhzgORoGpKN5KuX4/Q1mPKg6zSR1zsqQp/N89H4Vdr0Y0 txR3VQLAxXGeXA74v2blZTwp3xqPLjxuhql++FVrIHyC9NsJqVyWTnRC2+KSdHIJ7TvBI bQ8WTJrYHZoKIVRKmyZBiDn89RswFENgpzs= From: Jan Kiszka This allows to build isar-cip-core for upcoming Debian 11. Default remains Debian 10 for now. Signed-off-by: Jan Kiszka --- conf/distro/cip-core-bullseye.conf | 16 ++++++++++++++++ kas/opt/bullseye.yml | 15 +++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 conf/distro/cip-core-bullseye.conf create mode 100644 kas/opt/bullseye.yml diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf new file mode 100644 index 0000000..38014b4 --- /dev/null +++ b/conf/distro/cip-core-bullseye.conf @@ -0,0 +1,16 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +require conf/distro/debian-bullseye.conf +require cip-core-common.inc + +PREFERRED_VERSION_linux-cip ?= "4.19.%" +PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" diff --git a/kas/opt/bullseye.yml b/kas/opt/bullseye.yml new file mode 100644 index 0000000..24a4c84 --- /dev/null +++ b/kas/opt/bullseye.yml @@ -0,0 +1,15 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +header: + version: 10 + +distro: cip-core-bullseye From patchwork Wed Jul 7 12:16:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58AE6C07E95 for ; Wed, 7 Jul 2021 12:17:10 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09A8B61CA8 for ; Wed, 7 Jul 2021 12:17:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09A8B61CA8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6603+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id IRV6YY4521723x0LxAZQn8Xz; Wed, 07 Jul 2021 05:17:09 -0700 X-Received: from lizzard.sbs.de (lizzard.sbs.de [194.138.37.39]) by mx.groups.io with SMTP id smtpd.web09.20219.1625660200027119963 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 167CGcH0029834 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:38 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEd020405 for ; Wed, 7 Jul 2021 14:16:38 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 7/9] ci: Add bullseye targets Date: Wed, 7 Jul 2021 14:16:34 +0200 Message-Id: <5ca9b4dd2058e37eeb4ab4b080273301b3cbe796.1625660195.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: 46bpmgfWS2fe3efKjKSWvRjJx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660229; bh=Ofn2eerxsVRYcBj1ZcfN50eWfCaX+VjE7ZkDEo3FWZE=; h=Content-Type:Date:From:Reply-To:Subject:To; b=NeFilDTW6MSKrdndOS8ed99/9p672kgpW4jTyUZtzYQbIotmM+jr2DnJ2KMGmiJ5eTV 6rt9qag3VdftXA/SgqmGB5kb0uRJVgdHM5+TKAlovXbEYciqssjq7VAC9r4HQ5fDlW23m iRjeMsRz1f6B01pkPLCU4d4fD4zuQVkulds= From: Jan Kiszka Build the physical targets for bullseye as well in order to test this early. Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a9ae22..161916f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: wic_targz: enable targz: disable dtb: none + bullseye: disable deploy: enable stages: @@ -34,6 +35,7 @@ default: - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi; - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi; - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi; + - if [ "${bullseye}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi; - kas build ${base_yaml} - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi @@ -154,6 +156,7 @@ build:qemu-arm-test: wic_targz: disable targz: enable +# secure boot images build:qemu-amd64-secure-boot: extends: - .build_base @@ -186,3 +189,35 @@ build:qemu-amd64-secure-boot-swu: wic_targz: disable targz: disable deploy: disable + +# bullseye images +build:simatic-ipc227e-bullseye: + extends: + - .build_base + variables: + target: simatic-ipc227e + bullseye: enable + +build:bbb-bullseye: + extends: + - .build_base + variables: + target: bbb + dtb: am335x-boneblack.dtb + bullseye: enable + +build:iwg20m-bullseye: + extends: + - .build_base + variables: + target: iwg20m + dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb + bullseye: enable + +build:hihope-rzg2m-bullseye: + extends: + - .build_base + variables: + target: hihope-rzg2m + dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + bullseye: enable From patchwork Wed Jul 7 12:16:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01AEDC11F67 for ; Wed, 7 Jul 2021 12:17:20 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8ABD661C9A for ; Wed, 7 Jul 2021 12:17:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8ABD661C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6605+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id DeINYY4521723xEI08ufAxui; Wed, 07 Jul 2021 05:17:19 -0700 X-Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by mx.groups.io with SMTP id smtpd.web09.20220.1625660200269770710 for ; Wed, 07 Jul 2021 05:16:40 -0700 X-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 167CGc53018256 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:38 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEe020405 for ; Wed, 7 Jul 2021 14:16:38 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 8/9] linux-cip: Update to latest releases Date: Wed, 7 Jul 2021 14:16:35 +0200 Message-Id: <3128e2e21ec0bf5667c1080ddd4752bf2428ec08.1625660195.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: zgvZGuOogL66UkW7rVUskCA5x4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660239; bh=pQCJH8Oq7ZOLAWeNElx58OrXtKgQKmE1KxUz3sywVD4=; h=Content-Type:Date:From:Reply-To:Subject:To; b=bcOfM+ybjZuJhB10ogJHgdDecYiIl0VXFybG+/IWVe0wYspfH+337YbkUHETaQelvcB hNQFjQIazaC3SwBMJNwMDa8jPinixImuhrCyNI9mFiCdG4vaeBgVILWh2DcsjWr7GhLCq D/AfEjCob+zIQxt5z+rqwkffNm1BcbVp+Fo= From: Jan Kiszka Signed-off-by: Jan Kiszka --- ...19.160-cip39-rt17.bb => linux-cip-rt_4.19.195-cip52-rt20.bb} | 2 +- ...4.4.244-cip51-rt32.bb => linux-cip-rt_4.4.262-cip55-rt34.bb} | 2 +- ...{linux-cip_4.19.165-cip41.bb => linux-cip_4.19.195-cip52.bb} | 2 +- .../{linux-cip_4.4.249-cip53.bb => linux-cip_4.4.272-cip58.bb} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename recipes-kernel/linux/{linux-cip-rt_4.19.160-cip39-rt17.bb => linux-cip-rt_4.19.195-cip52-rt20.bb} (68%) rename recipes-kernel/linux/{linux-cip-rt_4.4.244-cip51-rt32.bb => linux-cip-rt_4.4.262-cip55-rt34.bb} (68%) rename recipes-kernel/linux/{linux-cip_4.19.165-cip41.bb => linux-cip_4.19.195-cip52.bb} (68%) rename recipes-kernel/linux/{linux-cip_4.4.249-cip53.bb => linux-cip_4.4.272-cip58.bb} (68%) diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb b/recipes-kernel/linux/linux-cip-rt_4.19.195-cip52-rt20.bb similarity index 68% rename from recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb rename to recipes-kernel/linux/linux-cip-rt_4.19.195-cip52-rt20.bb index 3c0aea5..4c9a735 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.19.195-cip52-rt20.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460" +SRC_URI[sha256sum] = "fee95d77599f5a0321ae818f63bf595f5e3015e674f2f428503267b8471379fb" diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.244-cip51-rt32.bb b/recipes-kernel/linux/linux-cip-rt_4.4.262-cip55-rt34.bb similarity index 68% rename from recipes-kernel/linux/linux-cip-rt_4.4.244-cip51-rt32.bb rename to recipes-kernel/linux/linux-cip-rt_4.4.262-cip55-rt34.bb index 6679144..37f2018 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.4.244-cip51-rt32.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.4.262-cip55-rt34.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3" +SRC_URI[sha256sum] = "5f8c3fe1ec1cb82e12a6929945f29bfd7dd432a81ad9891cd7490e86d7d91d7a" diff --git a/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb b/recipes-kernel/linux/linux-cip_4.19.195-cip52.bb similarity index 68% rename from recipes-kernel/linux/linux-cip_4.19.165-cip41.bb rename to recipes-kernel/linux/linux-cip_4.19.195-cip52.bb index f19b4c3..05dc765 100644 --- a/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb +++ b/recipes-kernel/linux/linux-cip_4.19.195-cip52.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d" +SRC_URI[sha256sum] = "9eb4fb2a9b0065e3c8ac2a1045da7bc6377309dd7c01292985c3e978b8d61d8f" diff --git a/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb b/recipes-kernel/linux/linux-cip_4.4.272-cip58.bb similarity index 68% rename from recipes-kernel/linux/linux-cip_4.4.249-cip53.bb rename to recipes-kernel/linux/linux-cip_4.4.272-cip58.bb index 03b1a04..e883794 100644 --- a/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb +++ b/recipes-kernel/linux/linux-cip_4.4.272-cip58.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384" +SRC_URI[sha256sum] = "e8300f194bd99866d5d1b467475270f2739aaf1e87536097465f636d37437ff9" From patchwork Wed Jul 7 12:16:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12362491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8A5BC07E9C for ; Wed, 7 Jul 2021 12:17:15 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FE7761C9A for ; Wed, 7 Jul 2021 12:17:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FE7761C9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6606+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id ebZCYY4521723xS22KmdJqm7; Wed, 07 Jul 2021 05:17:15 -0700 X-Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx.groups.io with SMTP id smtpd.web10.20227.1625660200558273224 for ; Wed, 07 Jul 2021 05:16:41 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 167CGcRg014167 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Jul 2021 14:16:39 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 167CGaEf020405 for ; Wed, 7 Jul 2021 14:16:38 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Subject: [cip-dev] [isar-cip-core][PATCH 9/9] wic: Address y2038 warnings of latest Isar Date: Wed, 7 Jul 2021 14:16:36 +0200 Message-Id: <0d643236aa68d265bc0b7740655dbcf01cc1f8c5.1625660195.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: 7d4GLZH51PTwJtlAKaOmkc10x4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1625660235; bh=e8lYii8dCLrVwhCCFGH9xMXdtrnOzscKBxbPkxJVxXc=; h=Content-Type:Date:From:Reply-To:Subject:To; b=NpFrQusrW14np2UKhCWQzLO8Tm+uLy3UOuMkSlfxFB47YcWWMKlUT/Bup/nJ3cP8OcL Wv1Z24hIJYPumW7OevxjMtb4bIOUaMwopvqqhlL0h+ZXr2kuCHm3pCNygKm6wXclxZCh3 m5+l9VCM7iBM6DIr91a0bwUVAv97IaDiiwA= From: Jan Kiszka Set ext4 defaults that prevent generating y2038-affected filesystems. Signed-off-by: Jan Kiszka --- wic/bbb.wks | 2 +- wic/simatic-ipc227e.wks | 2 +- wic/swupdate-partition.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wic/bbb.wks b/wic/bbb.wks index 12930a3..17b85f1 100644 --- a/wic/bbb.wks +++ b/wic/bbb.wks @@ -9,6 +9,6 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/am335x_boneblack/MLO" --no-table --align 128 part --source rawcopy --sourceparams "file=/usr/lib/u-boot/am335x_boneblack/u-boot.img" --no-table --align 384 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform --align 1024 --active +part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active bootloader --append "rootwait console=ttyO,115200" diff --git a/wic/simatic-ipc227e.wks b/wic/simatic-ipc227e.wks index 5d335a1..d0081f7 100644 --- a/wic/simatic-ipc227e.wks +++ b/wic/simatic-ipc227e.wks @@ -8,6 +8,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024 --use-uuid +part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200" diff --git a/wic/swupdate-partition.inc b/wic/swupdate-partition.inc index 7bec9d7..6912542 100644 --- a/wic/swupdate-partition.inc +++ b/wic/swupdate-partition.inc @@ -1,2 +1,2 @@ -part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000001" --size 1000M --extra-space 128M --overhead-factor 1 --label systema --align 1024 --fstype=ext4 -part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000002" --size 1000M --extra-space 128M --overhead-factor 1 --label systemb --align 1024 --fstype=ext4 +part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000001" --size 1000M --extra-space 128M --overhead-factor 1 --label systema --align 1024 --fstype=ext4 --mkfs-extraopts "-T default" +part --source rootfs --uuid "fedcba98-7654-3210-cafe-5e0710000002" --size 1000M --extra-space 128M --overhead-factor 1 --label systemb --align 1024 --fstype=ext4 --mkfs-extraopts "-T default"