From patchwork Fri Apr 11 10:15:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4164 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 11 Apr 2025 12:18:09 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53BAI8uW017173 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 12:18:08 +0200 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-43d0a037f97sf11601195e9.2 for ; Fri, 11 Apr 2025 03:18:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744366683; cv=pass; d=google.com; s=arc-20240605; b=RoO/O50q07QZURU+uhREChVcwa+WYUmRfXCbpjRLnGrc9HbbZ9iWApCds52yAz0mYE pPIr63Aip9z8CxTmEV7IZjXHIo9mln+m2Ov2J1WGNNJJYsdq2iH+0uw8s7WRJKDLnjXN 2vPjn0PzexdqI1LY+sbxKUL2m4RRQHWaptWvWQqGxTAKBfYXfF86C06M4M4J4X1xkkM5 t+ddg0e43MmQhHzCZzdbWIL/HjlbuzsebsFA7Xl+9C9LKBvx7POR+wNvwsOhkha2vTx/ 0Q+lWAr/zuUrQsi+UuEJMsbL/LK/6XEUd0o2B5/oXRawvBuoAvrqIM+T2RpOSQ4PDVPl wr2A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :sender:dkim-signature; bh=e5PdoY2YCxrv1O26Jz0pz2M2wn42sot4zL0/DQS3HWU=; fh=itg753hSVFPHrdz+cTFEcBsfwVDsFlCwwXSiGyqobak=; b=YMT6350+HZZSrakOnvtWS+w3cq5DEfI+l5iEn5FdDUQ10TeLCm+rqZ6PldejkfHdFL 6rbTVQpfsDV0PPotuSZASQrIdVsK8Sx8XfpxnPegJduoFT5ClZoAKS37dEXdQcXpjZbZ ZNsuB775bI+S7xE5Zulps6Z7kCFma5kWB6RAJb0/60ZOHiuZZkeXsIGQoDexV1ykrSXe +N/JCPLpYUCQZjPeqnvCznKaJfziDa3Byf8faMkbPCqgcr7WLKvc771jdZAmFEHwFw7j E33xboFPzdqBYhjJja3Qj7FCMVlKX7irOTucDsRgfvRZ+5zFWpBoedclEXUAdOTdnkZ5 dWWg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1744366683; x=1744971483; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=e5PdoY2YCxrv1O26Jz0pz2M2wn42sot4zL0/DQS3HWU=; b=eWF+M3Ok8oIqfMNKimu9MHyeVkFejBgCfoSvrakW+4FXj+lcswORJOEmuf3i6XFuT4 ECfjMfSKn8M8+we/VwGqQBIpMYCquZ3iN7mG47TLuS4/cJZT7jjXkB3z/RPoxfvRR7EI pghwIm8MPCZBntHwYZuHWZYeGmQe0gGpsA+ZAsa057VdOf4gQZvh9ymXo3oZWmvrpjpa K5prlu8/OsBnU5FB3KahGjy3+e+RrQfKjwAfH3anWc96uXiG6zdvAYRdW0PfgII4KyVQ zg4mWFnjyEBkZdP3X26/NWwIQnaazaVTs7mweWI6kNptO0LC2nzrRtnh1wyrkyS2fKAA RqDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744366683; x=1744971483; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=e5PdoY2YCxrv1O26Jz0pz2M2wn42sot4zL0/DQS3HWU=; b=ZOS8QEN6bjMJhFXOUFg8joLC7ypUvOhOL9K+kbpHQcE8WErJyDqDtMzd7VglyA04Fk b8c6/WpuICD5cpYdKifsFw5EqSfZS1FjyH1eDmsYby9UDmxzZ4FSKM+6kOQcW7oXnJpl s0Ae9HQK8VY6p7M/1AG0cUVpaZgBm4n8sfnj/DuU7h+zxnNJ13PqmCxsDJYVKr117SgG X6LqyyOYeHwt/0jPeM3X5hjxEP4SOrFj2vYJHCGsp14591UhoQyLbhPfti3wKHOqBhG8 oGqeRzVjwZ6XjUG9PyZSjJ7QK8NgMxowj+1ezXjV3KXAWLpUa4T0Q2nIXQkQE/Mn5Ce0 7qmQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUYZJy6SgslL+Y0nsTMSi6s9ke2UOjYgcV+Btcy22z6xGn7FIgz13gTQNSYVjjd4ZFrlY9fpwM=@isar-build.org X-Gm-Message-State: AOJu0YwMm8XJjVq7MaVOcD3n1j7RjXnN9CJ4i1s6P/pUmf5WmVYedz2z cJl/1LkYxM/D8jGNpFLB9HGBOl+ASq1Z05b/FJ5CNVktwy36TENK X-Google-Smtp-Source: AGHT+IElhitdCI39Wk8dGLYmdGbFx54xO57+wnEgf23u4xd6gZu2Q65+a/2G3rjm5JW2fc6B1OXn2Q== X-Received: by 2002:a05:6000:4211:b0:391:31f2:b998 with SMTP id ffacd0b85a97d-39ea51ec9ecmr1536253f8f.6.1744366682741; Fri, 11 Apr 2025 03:18:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJOKUuHIaMh0QnIRek4rv5GZHLUHCOR8KhaKrcxfF9sTQ== Received: by 2002:a05:600c:6d83:b0:43c:ed54:13bf with SMTP id 5b1f17b1804b1-43f2c572251ls1375405e9.2.-pod-prod-06-eu; Fri, 11 Apr 2025 03:17:59 -0700 (PDT) X-Received: by 2002:a05:600c:1d84:b0:43d:b3:f95 with SMTP id 5b1f17b1804b1-43f3a9af802mr17485375e9.28.1744366679530; Fri, 11 Apr 2025 03:17:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744366679; cv=none; d=google.com; s=arc-20240605; b=MXcFMnhtFmHmWdEPTz2tLRIbTZyF0SphZ8J8eoySGl2mAyqhC4NWPO4A4skwwCu10j nPPMlGRF7pzvrKJsRvxfTaUH0GVr9FvJfiVOy2yPW5Zpz5JMo7c72QsCOOg8fDsvqRd0 JI2dG5fEqUbiHzAejeGL+4EiHbXaSMTMaMZZkg0A4c9Y+rk9s4/+aGqJMqiZK/E6Th/g unvURDurhQ6srbhZHZsMIhD7j7KX5viG1liSuO+uEsI6PJQWKopOY8sHQIYpVak2+kua drR/4pnyAjgp4b8yLnUJ71vuzOQmQGauexv9GUdV4xCreHW5tbENbifM5SKan6OiQb0N Mi/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=RSbx5JwULgm4qKNdaO4vktvGM0/qdlsVU+mB7mP0ynI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=UdYwtk1RM67dLIry3h4wqZ+05jNh22b/ZgJgBwmBLXDpeKH6YkG+0d1RBy+GD4453B o+F4cfyOKIPeKtVUzyx+mg8rWCYqRY68zEuK4iMVrBrM//gdaN/vSefEFxTwGi9DkjMN WavQfY58Gg2OBNZaMDGxJ8qsq5t5ojkvgeZbVIG14+RxV0Z0fD7QdqA/eoptDvU6BATs s0E+JTnMh7XGtYp4QzzgrulXAmPOwlj0G+AfktbSd7e6QtFx27DtqDXPEy11ifuev1QQ Cwo0PpMICXtewo8l6j1Qh0fMw+2+9syCLqHN8EP1qqSnJ1d38a9fq46EMSKVRm9vgub9 qDUA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43f20a82897si263315e9.1.2025.04.11.03.17.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Apr 2025 03:17:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 53BAHwRt017154 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 12:17:58 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/2] u-boot-starfive-visionfive2: Fix build with swig 4.3.0 Date: Fri, 11 Apr 2025 13:15:37 +0300 Message-ID: <20250411101752.16954-2-ubely@ilbers.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411101752.16954-1-ubely@ilbers.de> References: <20250411101752.16954-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Fixes u-boot build failure on newer trixie that got updated swig-4.3.0 some time ago. ``` scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); | ^~~~~~~~~~~~~~~~~~~~~~~~ ``` --- ...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++ .../u-boot-starfive-visionfive2_2024.01.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch new file mode 100644 index 00000000..d919eb68 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch @@ -0,0 +1,60 @@ +From a63456b9191fae2fe49f4b121e025792022e3950 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Wed, 30 Oct 2024 06:07:16 +0100 +Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Swig has changed language specific AppendOutput functions. The helper +macro SWIG_AppendOutput remains unchanged. Use that instead +of SWIG_Python_AppendOutput, which would require an extra parameter +since swig 4.3.0. + +/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds +| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: +| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ +| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); +| | ^~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Markus Volk +Reported-by: Rudi Heitbaum +Link: https://github.com/dgibson/dtc/pull/154 +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 56cc5d48f4f..e4659489a96 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t; + fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); + buff = PyByteArray_FromStringAndSize( + (const char *)($1 + 1), fdt32_to_cpu($1->len)); +- resultobj = SWIG_Python_AppendOutput(resultobj, buff); ++ resultobj = SWIG_AppendOutput(resultobj, buff); + } + } + +@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t; + + %typemap(argout) int *depth { + PyObject *val = Py_BuildValue("i", *arg$argnum); +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + + %apply int *depth { int *depth }; +@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t; + if (PyTuple_GET_SIZE(resultobj) == 0) + resultobj = val; + else +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + } + +-- +2.49.0 + diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb index 9f819c3e..becd40da 100644 --- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb @@ -8,6 +8,7 @@ require recipes-bsp/u-boot/u-boot-custom.inc COMPATIBLE_MACHINE = "starfive-visionfive2" SRC_URI += "https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch \ file://starfive-visionfive2-rules.tmpl" SRC_URI[sha256sum] = "b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3" From patchwork Fri Apr 11 10:15:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4165 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 11 Apr 2025 12:18:10 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53BAI8KZ017179 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 12:18:09 +0200 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-43ced8c2eb7sf14918895e9.1 for ; Fri, 11 Apr 2025 03:18:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744366683; cv=pass; d=google.com; s=arc-20240605; b=SBKo8qm5TlUKKV324nT1A3kx47Mo0kBkp2HqZ9QRevun3SYFDjd7OlBAUVFmm0qfP6 bZ37dvw4gm0xikZTTc28uFFcZHeEEk+19SVz1amlO8JJ0XdC7SZ2b96F9n4ecqGxbF7j 8uLztn8buf1S4qDgm6YSME+vzIvmUNtQiCspR0okfQZpjHrtTT9vreSdbJqlXK8J0wng /4I3vTDq9HbStUwslM8m+pVvJP3wuEV4i/AGYc8wQ3FtJsO2/U8Tj6kgvHLbdlpXUKB9 5V/dQW+qIIkatoLDbla71oAnNlTm8j9XJPBH290UsQj4WQ+NhJ4/6BLAbjg/CHN+Lw1p g97Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=HqNX+t0eElNee9/R7janUCfs/MLQqMoxKSvH7nuNpt8=; fh=rQJ8U9BTQg7MKMRCy7kFELC7/RC6sN5Ocq+g9pQ7wFc=; b=TyfNW3XcYqrJ8ESZnHfLVxGIa3xmZxzOotS61KffesPTjOLpNYWCca7TSS1+fUxJv7 I1qPwsXG87f81HQXjOpaY4YMwh5PpdPU+AjaKDwAGnV4ol+3ZrGJ9INeCdqjyIJNj44q nd1O2tEn+a08a5MDn5yIochqSp9gAAg71Frm9mlDiSzizAQwQn3yJKmMlMeteZp6VzsG zg1Q9Tl0+j2qgdudIdyByl0/EvDwMGhDt+9+iB68J06aIFj9PiWvUbKe7brtqSExmhaO Ytoat2d/33/UsLAoP2lHmyAkalzLPYvvBAvmI5jxFAhbqCN0HgUoxHmkk9rpsofr4JlC VJAg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1744366683; x=1744971483; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=HqNX+t0eElNee9/R7janUCfs/MLQqMoxKSvH7nuNpt8=; b=mXjPQ8VSJ6THTO9tg5sSc2msYFbMx7mHy4Qq6MdhcMk5xQZ74PZXSgKLP1XdEUt2PV Fs9wzRLJ7Eufwbx6ekWhJ+Jtyi3ygE6S0LXqoo7P8oYB6cudnr8Ayu2gmJqTpc8ECAEp Hj/O2tlIlDRmDVMwhrjsnR5INp/cIKKOA32f+WzTtT9EtNlfctx+jKNubGCIzZTMUDO2 eNYmA1QT5qWM2+adQyYHK2+i/wVWySS1qbGO69TQzw+Nke5B0eAQOR3xSVxr2yciPFYI xRQsILgXmbFXvaZnQCJ+hr6oILm5i85lRT1bxfkKnoq7qmrzycFCeM6Wd46ETvNSIDSZ PPZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744366683; x=1744971483; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=HqNX+t0eElNee9/R7janUCfs/MLQqMoxKSvH7nuNpt8=; b=USKD4KN0D8So8TlhTSjDzQG0zkcmlp9AVxcXu71m5R02CATdcu3NC43j33Y41NLU7s 0nUPXX8E9JMZNmIKLdz+ldfyvd9ZCCDSuwK/sutzLMIjBuydaXvncxUZDLLJMxbDoBjm upRjnSmisQV5lvv67xicys7EWJsBr66JF5BlwU9sbwQi0RoeKieh1IwfzxPg/L6XMpMb yEvA0AryPtcxb0rUsA/xUPqEassJXucO2HbBUuPWAqm1qSCSKGCfPjJ+as2IuTwZFEA/ r+wVNGdt9wDjUXmf59e0JXuHWrTIyM2adqWVi7EDaxbXufyH0vb1oIS4e2T4UKEfCk8o 2Umw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWZn0iX4frrqCH3CJGWQq5NfIi0wGDnVJlSljuKLYd4/DtH73NPvfublcfm1YlQnH9zaMAeoIg=@isar-build.org X-Gm-Message-State: AOJu0YzyI2KJwSQADbEgEea3dcD6e8z5Myvit7JKse09NA84UkTpfPm5 Ts0vwooymuUTBrY3rvs55f4ASNXjZqeHmzoRLvWZYkXKPQcoR2si X-Google-Smtp-Source: AGHT+IFoKerEteOS4ugI7b112UdIljDqa5ZmL5E1OKiyjzCcha578N1DAFTthz8KuZZpRXiAisYvzA== X-Received: by 2002:a05:600c:a13:b0:43c:fbbf:7bf1 with SMTP id 5b1f17b1804b1-43f3a9bef0cmr19779075e9.30.1744366682835; Fri, 11 Apr 2025 03:18:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAK3u3oE1oG0bUiwHFMMc58w1hNUZwT209HDGAYz6T9ebw== Received: by 2002:a05:600c:5113:b0:43c:edda:8108 with SMTP id 5b1f17b1804b1-43f2c50efe9ls9395095e9.1.-pod-prod-07-eu; Fri, 11 Apr 2025 03:18:00 -0700 (PDT) X-Received: by 2002:a05:600c:3baa:b0:43c:e70d:450c with SMTP id 5b1f17b1804b1-43f3a9afc12mr16000985e9.22.1744366679777; Fri, 11 Apr 2025 03:17:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744366679; cv=none; d=google.com; s=arc-20240605; b=ZwW6iPrvDjkndgZ3+M4li1L6GW5z3o+EUGpDfKWsJd/69zRjSVZ9lajArdqjIacNgX yNl59FuTIodxL23SairAcfRWBsfn0tyQfaBVsvn0SQchXAKRwDBE9Ci2G5bPYFNxT7AH ouJIzV8MOegzr8MeHd2yOHiJLOUeMxjJixZvtqKxfMOyOIOWzh/w6+Ir+9mnUl2YsBS1 FIYFUJTm0F2cuTmrjyONLnCM3rF5vRpDYtwTOMUQJUn77zehDTJ0m5rct/DgA2ZffYnt 076HmmMKxTLgxteF9zNXQEIHbfgnpqL+EBxVTRqPZtTIKcsWOHGm9MDoucBMCHuJRriE sVRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=jtPNO7X08zEo8H8JfjKaovt6zRuUH3sBuVM97V3wpUM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=CHmZGUtfgkhhoK5kIZqX+ohwOKSuW52MAPDcgqjWwPO+JsuXla3C6HZzENnnhPcBRT dQRkLc1TB8bBmdId/8B+yzYYxFblZLoRP05r0RuiYCSjf463zDL94EQw84qVsGv2bfZ5 gR2aWoBOZ9XhP8WH0zkGJuilBRymf03QqfsrYBzwrfPHGry8Rc1a+c8k5VCxxl/U7832 u8MVv94X9g5SzpHl/dfAxIscR2JHlMskfUZ4cCgjRG8F+/oULy1BMlT2fj5lRYRWcJ0F Mnqzj5HW7jrPUIuFd8VsPBcJkW3HC6zHhkmt3Eq8Pc+RbuL72xpgrKN6yNKtrrwgFdWL NlnQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43f20a82897si263335e9.1.2025.04.11.03.17.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Apr 2025 03:17:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 53BAHwRu017154 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 12:17:59 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 2/2] linux-starfive: Fix build with GNU make 4.4 Date: Fri, 11 Apr 2025 13:15:38 +0300 Message-ID: <20250411101752.16954-3-ubely@ilbers.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411101752.16954-1-ubely@ilbers.de> References: <20250411101752.16954-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= After updating "make" in trixie, kernel build fails with errors like: ``` make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop. make[9]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/img/img-rogue] Error 2 make[9]: *** Waiting for unfinished jobs.... ``` Branch "JH7110_VisionFive2_devel" we are using still doesn't include required fix, so borrow it from branch "pinetab-6.6.y-devel". --- ...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++++++++++++ .../linux-starfive_6.6.20-visionfive2.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch diff --git a/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch new file mode 100644 index 00000000..b7e7a0e6 --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch @@ -0,0 +1,29 @@ +From 6b09bb490fb1a575a023c168a6db2d2470129885 Mon Sep 17 00:00:00 2001 +From: Icenowy Zheng +Date: Sat, 22 Jun 2024 22:03:02 +0800 +Subject: [PATCH] drm: img-rogue: fix build issue on GNU Make 4.4+ + +Signed-off-by: Icenowy Zheng +--- + drivers/gpu/drm/img/img-rogue/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/img/img-rogue/Makefile b/drivers/gpu/drm/img/img-rogue/Makefile +index ee37ef8cadbf..fe3bad2b77ea 100644 +--- a/drivers/gpu/drm/img/img-rogue/Makefile ++++ b/drivers/gpu/drm/img/img-rogue/Makefile +@@ -73,7 +73,11 @@ WINDOW_SYSTEM=nulldrmws + #include $(OUT)/config_kernel.mk + include $(srctree)/$(src)/config_kernel.mk + ++ifneq ($(and $(filter notintermediate, $(.FEATURES)),$(filter-out 4.4,$(MAKE_VERSION))),) ++.NOTINTERMEDIATE: ++else + .SECONDARY: ++endif + + define symlink-source-file + @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi +-- +2.49.0 + diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb index 80c2d3ff..e4433c5d 100644 --- a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb +++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb @@ -8,6 +8,7 @@ require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ https://github.com/starfive-tech/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-starfive-${SRCREV}.tar.gz \ file://0001-btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_se.patch \ + file://0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch \ file://starfive2_extra.cfg" SRCREV = "d0e7c0486d768a294f4f2b390d00dab8bee5d726" SRC_URI[sha256sum] = "86f1bb78a84222d4a3d22779e335023a228cd865df866fd08af6a7816eca3add"