From patchwork Tue Apr 8 11:33:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4143 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 08 Apr 2025 13:36:50 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f63.google.com (mail-pj1-f63.google.com [209.85.216.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 538BamI1000611 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 8 Apr 2025 13:36:49 +0200 Received: by mail-pj1-f63.google.com with SMTP id 98e67ed59e1d1-2ff78dd28ecsf6555554a91.1 for ; Tue, 08 Apr 2025 04:36:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744112202; cv=pass; d=google.com; s=arc-20240605; b=ONeBFs+saaMVFIvxrbp/FkT+FxsUruu25cUDpCmE7BsftiyUmaabrDWt49KROfc8q/ 4FtdW3HceR7dJdC1WmS5UpEyA0QN6qSWoMHsXn9O4WOE3rUOzUHgNW/5uRVgrpkbSZJl et3eYCjIT/7DyY9Bvn5L85lyUmc/T6WOogOfPWu8ZXrmS+H/dpgUsSGpX3NUnhjGTi36 wAF4g+GtK3NmKoZegySw3lkVtGfD+e/ROmL9SBRmKY7ETnJVvfhgEv5Sz8z08paM41uX lvHFk8PaH276pr2URs4+fTWhHA4a9g0XKTvKjHPMBj9Wi4CWv5q0oWrOghNA+jC7SCat QnMQ== 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=2yAnseDkvurQ/yqX35neb3sBjoLlUyrCAujfIQ80MUM=; fh=mx1h2u7BTISP4KSf+Adaa28G4qto27SOpEp6A+uOAJY=; b=Gqku4b6IuW+rAkPjiA6ni7EfCM4ZEMw1L9aB4cugz+T1mKJoklJTk67U0prLhFrg1q SWjmZRdEb6uECwxbfY28KLhUZ4tWYCBThed2wu03A0cv2OPGGovIgzQsnmYVthdc4RYx pslC1N24t0Eej0a8ZAoAtjRGFun6bO9ykc+pdG/f9cZ7OEvVEh3SWJbm/uWVJEdouWfR 04pvGa6QH+32ggcKfQBEYu9nkZjXufYJP7WEVNMCUMam3gKUFw4Tn+zoEh9wb5lgSsWP YEL1PKE3biBDAdRHuigYZC7+2hiK52yplzX9g9/k4phIyJovhA/LpmOHTgIo8TrLfCdN z/jg==; 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=1744112202; x=1744717002; 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=2yAnseDkvurQ/yqX35neb3sBjoLlUyrCAujfIQ80MUM=; b=L+y/Zj/QCOtGjf3ybR0Un7BBSR9qayCgYR3nsI1B2Lg8jv6fYxft51xzQnC6lzOp+O A82+BpJErz7Bt7f0h8tR4JBnCbvPeOSANzUIhQGLIybfJ+UaWSPKIq1nFG6admB16Pi9 zIOlQFKL6c6rf6jy9b+Qg05O2T8VRg1BEEw8TGHmZKdQcby7FFfev2rncoylFp1VktW4 jlI74b9Z8c0rlp2q3UFcx6r0vSVd7eT4vsoZwOCOitw7ramj5xoTZIMJOUHSRLSZzulx Zs7rKW30Lj38YeZOOH5gJKWrJPJkg5NpD4MzwhmVmGhCxep0Rv+N2OewQ5yyLSLdi8DY wx0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744112202; x=1744717002; 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=2yAnseDkvurQ/yqX35neb3sBjoLlUyrCAujfIQ80MUM=; b=IEhMJPmF12Jxmshyit+2pS0G7JA3a3h33If5PUQBRz3X/rcz5iWAB/QPnDirmd81Dx 8PT1uHrUI5yY2w5Y+COCFNmlYKPWd8fEyDz1BEUlbjVbB6/PAXcWqiGPSbJflzapyMQL vU7JRrxEs8XyyVNvLOFKEu/GcQG7rfBvXwV/6sSbr1bIZuG7JLBVjeXt4suz3CziR4IF ewS4V4de0hgRX+XDtMni/XoOcqRsT7hRs9CJqI1s7XyupCbqHtWANDL2V3N8QROarM5F 9sZACWnVyUbcs1D+UO4epKTqVKpZJ4EuCw2xe7of5nLDoAuIvcYQpEars1FrBthlfd7W UNzQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVf9CJHd/rRESNSsGhOw4w8//R6IoA2/rzrkAyO/mRNYe4khRqN1FiypMARF0qkwwHnzTOsyk4=@isar-build.org X-Gm-Message-State: AOJu0Yyji5TXPGSaFxb0MUSE+v+tPthEf/bRFt74vMWQGI/08iA3B8Z3 1Wm3l8CXyWR9D9yiJXmJEWtA6gMzL6N9HR4IcJLbQJPJXFhx3iu+ X-Google-Smtp-Source: AGHT+IH2eeDzEZtE8vl0PI+MMB9xLR8tWxUMORvCfSO7Uh8KS2jyh/U0Kb/u2OLPPc1ZwfeRP+QYyQ== X-Received: by 2002:a17:90b:50c4:b0:2ff:6a5f:9b39 with SMTP id 98e67ed59e1d1-306a47f2ca5mr26379522a91.18.1744112202272; Tue, 08 Apr 2025 04:36:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAIE2DIIUJ2K3PhIFQ91iBtGVAZZ+2V6aGSRvb38GhmQQA== Received: by 2002:a17:902:e741:b0:229:4280:7a0a with SMTP id d9443c01a7336-2297643b4e5ls15297195ad.2.-pod-prod-06-us; Tue, 08 Apr 2025 04:36:40 -0700 (PDT) X-Received: by 2002:a17:902:c94e:b0:224:5a8:ba29 with SMTP id d9443c01a7336-22a8a0b38bdmr190689865ad.43.1744112200334; Tue, 08 Apr 2025 04:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744112200; cv=none; d=google.com; s=arc-20240605; b=kbDqFD+yCjroeWHfX4v1RVQ9h7P0T13vDPoB7OEfRLbDbS50hImgVEroR0mA5fOWIW HE/WmkGCT01KavUOBnj5eKrWld+w8DeoXuBaFXf17t19IL9ZeGp7BT/hU2JPCCOw0Pdd cdBEv+pmyveHo7Xl/cMbcTNfFz+QyE+fAoqceWzaauNXUXHiQsj1HHAa2GlTczIBGsFR tOhh5ncLSQA23uIjquRsXdeBsSXDkA2EdL6P3G4/ATg6Lzgg01FYCwPQus40TW0411Q7 bMZfr0tVu3+5w1IedOHwGY4OUV3PVWooD/ZOOItOdf9B5Tt6bIe7oQZR/8g1C99+aV72 9uuw== 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=SDYr5P5Jx+vZUajS+nbYXMfmX6ZPDM2xew2nBVdtaMqAMn8c8xSHorna+wKu3e+Ibj IIxwxZ7/KXq5Zc2AC7T/9czv4Ynfr9ehKA+jY7X8E2DEFCeB4oqHkQ20i3GzjDOMIDH9 qfgABDjw+KeDgASyPmI6QNbGHhcQZaPos/0j0vmq68KaQpiOeIKzk0tbSF2KUPq/L3D1 +lmzDOCmjL2MvhUz5JQXbikV479hu9oZlgHy6gnBLl8ZivD5IVLX8+GvUIb54YVxDsfO J0AheN0y9ass7XNpvamknBizoMw/6toGlh+KUkfk7x69FwpL15xuddc2ysg/rE4z38o6 5UYw==; 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 98e67ed59e1d1-3057daac13csi640329a91.0.2025.04.08.04.36.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 04:36:40 -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 538BaaVE000578 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 8 Apr 2025 13:36:36 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 1/2] u-boot-starfive-visionfive2: Fix build with swig 4.3.0 Date: Tue, 8 Apr 2025 14:33:38 +0300 Message-ID: <20250408113630.4460-2-ubely@ilbers.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408113630.4460-1-ubely@ilbers.de> References: <20250408113630.4460-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 Tue Apr 8 11:33:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4142 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 08 Apr 2025 13:36:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f63.google.com (mail-qv1-f63.google.com [209.85.219.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 538Bakdk000609 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 8 Apr 2025 13:36:47 +0200 Received: by mail-qv1-f63.google.com with SMTP id 6a1803df08f44-6eb2480028csf93592826d6.3 for ; Tue, 08 Apr 2025 04:36:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744112201; cv=pass; d=google.com; s=arc-20240605; b=AQDg6PafqGUK8oIYuaLf8sttICUuNCK+4IkZM7srnnYyxapAxIq1qRYDe77/ofaec9 w3z4r1HIZpMrUijf3nNVSEhoBnKtQTpsnZy9y3P+4l/k1qHgvB8JiKVzd0Pvkgk1S8mF Rn30ETlwH4ldBlo+/ZoAde64PljlElZwEYNn+BpDTNkp13G+LNh1Hacha/0cb2YltWL7 0yXzQext7XGpbiZmcGFiOFVxV/hzVuEUKCfB0RARPnpAX6YrHIl1tvxXPfSwcTZD5xNU eZwd2+1xVNvBndQKqrHdMKLB7ziV3qw0BUb1kDOESa0HaYh9dTFdOaeOfj8gRPy0Ik7B D/7g== 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=GYf583Lt+0fnIOV9vRItEXSpxCKuVAqW1nK6/UnO3lw=; fh=KGOn6QmLaY/FDHi5Kf8vh3AQnvN2C5Tv+WJ8mQwhQRE=; b=KqA9E2i2XSP9gF1CeF/pzkic9/+8KF0k3QYdQFHRs5NeDnlsAJ81FwCIPAcc0poZgZ wKsraHBG9aZmhr47EeeBYyqxD0drOhKdONu7uOjg+KFfeIDQ5/nN/6BKXSQbnsz5od4n /pOTtqgKI0JwXBafvDyKk1GN1u+ivLJNdkreFzGY5QKmx6nBQOiSUfxenYL/Zh24IXg2 Xvms3MMPEX8+oRXuEGl+hbUWaVk41qW2lvk9RWVlQQukhpNdll/SVK6fiY0SAsaNwvzj wkxGuoKT4SXSq7OGXUhJd2UWmSPbKFQiX6uxydyKQ1A/uITexJCYVtysqEgDUWLMs9kZ iiGQ==; 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=1744112201; x=1744717001; 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=GYf583Lt+0fnIOV9vRItEXSpxCKuVAqW1nK6/UnO3lw=; b=D4Qqx0E3cm7TqOp9vKqLk9pmLwfHI369F1sF/QwhvEgeHdEnBRkW6TLMv9zy4S/gqE 7mYntYlo+gMREwF74kZs+A9LdlEqm62kAGSkSCj9WUZ1usVBTc0VOjtQ8esj5PcF6R2c z96D7fYz1Kfzq4HaONPzqmHfxQvJjZhS0rfkdXTJv+uoLCGdBTus+S3XWs6YcmCUiFdo P19P0wDt5A1/L9twI+qYt7IrHEfhNc2niurE90YlfQXJS43nhwieCbTd8WuqF3z2v+9d ILPYgdU+Gvve31hdm48zxWTc+bF6Dgf5mDu6M8TVdxTGeQWnNodQpUpUHm9sRqYZ21ai P9XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744112201; x=1744717001; 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=GYf583Lt+0fnIOV9vRItEXSpxCKuVAqW1nK6/UnO3lw=; b=KG1cbo9Rftvt+24QWfEX5Cj5yM7Pfw0EjuIOimKyJ7QB2bA/CJJniisU+HDNCEb9+m VjZA1VwZcIuuFLiqE1RkRPBgu4ylAtExVtLZVKrYbVIIVPa6TJDzQgSR8A+6xWrzg1LH AXwblOvx/7G83SN+Lx4yhneUq2iSHeOZjhrEAiUx/9aP8A3P63ZICWknkgHMxyGa/IVm 5QYMm1yCoHXjMV7hnGNtD6qYKmrsDxAeG/lZn2KMkGriSo7DDRzvPWJO9RnKruwYkSff THAr3jlh9lTmeRGxkqMPlHdrnERKJ0V+7UMul71BAszxVJl4Sf7mLNifEKJ3ASZojK5Z EUUA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUqbUvD4tZv+C+ITXBHcVhsGw49DErlPz0SWGJlc4sJXUB20jrUmmB7h0lkiT3S/dgufPPRm4w=@isar-build.org X-Gm-Message-State: AOJu0Ywna9o1CoMCChsk9qSoDpHdgCufEFoT/SxHUBr+meLgnSbItVZx +wtNqibfStGIBABfroo85qYyJHRSCzoieI8VpF0nkyBWygg/sqtZ X-Google-Smtp-Source: AGHT+IHmFa67oAKU2sGtAkr9kri4btoiI+9G3jB6M5n7xiwilLSjGNxo1DFUN2kgTJDR44a79OOl+g== X-Received: by 2002:a05:6214:1c08:b0:6e4:3c52:d67e with SMTP id 6a1803df08f44-6f00df679f5mr229553746d6.18.1744112201054; Tue, 08 Apr 2025 04:36:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJFQ/AV4iEWM7NU5maYrPmPITydhliueQW5mLQdJCZJTg== Received: by 2002:a0c:c682:0:b0:6e8:ea1c:4db2 with SMTP id 6a1803df08f44-6ef0bd71bd4ls73189366d6.0.-pod-prod-05-us; Tue, 08 Apr 2025 04:36:40 -0700 (PDT) X-Received: by 2002:ad4:5f4a:0:b0:6ea:d69c:a22e with SMTP id 6a1803df08f44-6f01e7aab8bmr198231726d6.30.1744112199960; Tue, 08 Apr 2025 04:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744112199; cv=none; d=google.com; s=arc-20240605; b=VkmdCysIN5xoqUmA1oJ9ylpFD/8K7/V125oHIwdxlnIWTVx+gvFLAsv3jdPS78KX+I Ck3Mbbxz58mvtvNeeNxIt/tBH0DVYWLqLZ6Os6ycEgaoYPdhGJdODICxZQcO3FnVuF7f 00zkG07VOqRapuQEEPYsxKAE3QchexTMJ+wm2B9atWcZvvNqDHRIOtEirsFYPfSiYhE7 ZbjPkZjpFzzJnyS2bTrOERO+J6W6QKVcgPSORksO0NHi9RDVbdil+kxV0iMKLUXafXL6 I49SCPlgvegQdWTEkbmg5vF2FeLZLXv2ez4i3ryqlYsDgJ4GETOD5wOX7K3rmX6C/TBL vG0w== 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=YZdLlImFxeDxZ5YZB4xq+g/d/XxVJRWP6qqut18fl6s=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=GPHOKNeD5ADYxqLUXs/sipAr8E+hgr2RRI6kZzf+ijeFpkXzUfjeplWAznjgD8iqY1 shc8a0iBMVcME7KoIvmmVRWF41ETUIKFrGEimOLMIBd2CJdoWs90mzX0BSE7VwDC31Bz BLTXTHRbTngaixIUL3Zno9LHV2Qb+6zYKPw1z+m9GmUYjL0LS7DPLYf2GsepJmBGaJl/ KRqI7XbjKFDsWm5cQK78RDnOyJ/eBYycuB7PGHTsqM+VwAIQUkafF1QKJKd/5jIymexE 35Am2TTPNB8dfxhQnyQi/HSxew7jJYCKB2o3EBaBO9h3lnhIpXoHghfXinUmN9j7tnBs 13Ug==; 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 6a1803df08f44-6ef0ee75421si5543366d6.0.2025.04.08.04.36.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 04:36:39 -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 538BaaVF000578 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 8 Apr 2025 13:36:37 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 2/2] linux-starfive: Fix build with GNU make 4.4 Date: Tue, 8 Apr 2025 14:33:39 +0300 Message-ID: <20250408113630.4460-3-ubely@ilbers.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408113630.4460-1-ubely@ilbers.de> References: <20250408113630.4460-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 doesn't include the fix, so we are not updating SRC_REV here, just taking the patch from branch "JH7110_VIsionFive2_6.12.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"