From patchwork Wed May 22 07:02:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3110 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6568D3F9F8 for ; Wed, 22 May 2024 09:02:48 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-574ec615e9fsf378623a12.2 for ; Wed, 22 May 2024 00:02:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361368; cv=pass; d=google.com; s=arc-20160816; b=eLYIEm4U6z6iiyT7nam2WAfNjbUR2RDWVlSVxBaEch88Ag2wfggtd7EX1/xzKHCzox cf+meHNqLaBxGNNlsadXjzeaFCxwzE4F8az4ocORQKGZ4vNNrsQ6h/A9ROiGmvRf7DcI AsyFkicPjvjLA+zBkXgDusz0LWmEYLcprLstqXCZfg1Oy51jC84aQmbSEF96WQ7v43Ua ybUAXY8QnyDp5s0XffbMRpKLljrTqf2/YxeDUvzslNNus1a5X0p1ATK7V2N0drdkvi8+ 5Q1/3QR5nM3FCI23D6TqvZrlXA10UyXpRzWH7vQHwpxuJCjvJosedsQvhrOnm++ZSjgt 2M8g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; fh=MbfwS1E1qBja2p2JHdjptWPNVXygYx60yNWIcaw/l5s=; b=Ys8BHjJqeWQe+5rEc7UiOFzwFfq334HCGa9bR3Qpo9E+KpNFo1/dkbSc0Mhd9ygBTs 0kLtZYKONnx6oSgOtF0VdlZaAZk5+UXwgomc/Wd46uSOtzmKqCNsVi093XvaEjQN6pP1 EoSRIhXBl30AE5AONPjMcbzbBCc77GTYv3lKz08QqAmadGCeONxio0oS/gDdohjW//KH eNrzQV13hYVQ2eBWw7p2NWnxo6LZneSSefHMYEAHr/0yHm3eClrtsFmrgLRiJ4qLG86B joVUFPVuEVZi4NQJ3G/mpAQarKZ52cNy8GPHKEsp2WmJqwqmje4xbdWXv1pkaCp66WmK Vn4Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361368; x=1716966168; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; b=XnJAtb8s2C3YKhDP0O4QxuwLK4f+N3u5fuROLS4uokSAg1ooRqxPYesgWGfoXroEZo 0S369rXy5Zcy4btLIHDZ9QpYKsPykxMLmPgvwqWBIdbwC4+g4+4ZC74JLy3QYra7Nbvu TouRhaAcVc45Y538qrtQPOz1ukAW/oIEKz+6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361368; x=1716966168; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; b=mh537peh9eEKSn4xokiwI5uvFAo0obCnT2+JzKs/ljONJeWfhIDu2CqW0yjF95oYr9 WjgjHMnyZo1rWWJfIJiuF3ZEgt1K4AM/tC19TpfgSrZllM9RV/r06yqlC0k6eR6VgAC7 uS+vKfKlOA1xyryv5uUqhf16xc6QCcY97UwOEtO0q82AY73YBDviJkHTBiwaSroCWOEQ +3NPtbQDYcjg75uWsitFrIro28pp5D+DEE4KYkMAqed95B2ViPzUM0ZgdsLqcNrCLQO7 PZTKZuvHrD2KMgmzI5pxkz2RBCY+sNf1G2wNJ8bynV6kuonjwl9DjPYi4XdooV1+SOkM M3NA== X-Forwarded-Encrypted: i=2; AJvYcCUirX/ZTH+JVHPxlGYJg2P7uHwVEY22VOEfPeMEhoQbOh4hE9RZ2rLBqcNq3SxOHzTbbzfQVfoSH+UhNjVLCCeKEUnoAdiL87EkflgtIyrQeOGJ29SNZAenA7o8cA== X-Gm-Message-State: AOJu0Yyt+kz8lhvIJxpby8lSrzLP7FjSzV4gE4zQOcKfIbvGqOmw3fT7 kTH3qn7Zd8mGkZqF9r0K1G4wXLcV9YVD5oL00q90N//jVC47buloNvWnlhgLjYrv0w== X-Google-Smtp-Source: AGHT+IG3xw8dnlrrNgJF0HszobxrxMIzsvGjZFtFfOhge2n7HVyUWzAEpPBICxztVmPKAVnlEhDjfw== X-Received: by 2002:a50:a44e:0:b0:56f:e585:2388 with SMTP id 4fb4d7f45d1cf-57832c54dfcmr647087a12.36.1716361368015; Wed, 22 May 2024 00:02:48 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4009:b0:578:27b6:cf9 with SMTP id 4fb4d7f45d1cf-57827b625abls484641a12.2.-pod-prod-07-eu; Wed, 22 May 2024 00:02:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXu5ZeHipqvGmm2dPZxgd7vumL14vG7s9y+rfZKTRSfeLmqi4OLjwvoGjk4o4J3IEht423epOELNyPqPgcvT8t8t77PgV+2GTos7fr/OJg53C/a X-Received: by 2002:a50:f699:0:b0:568:1882:651f with SMTP id 4fb4d7f45d1cf-57832abc743mr595790a12.25.1716361366046; Wed, 22 May 2024 00:02:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361366; cv=none; d=google.com; s=arc-20160816; b=Uz57Ym+QCmfXhPEAOXU4iozBhhwEpsFbrgQBvGNfGK62aIgazoQyIPF5ao5pfwsvZm ByRlVqZcCtNRgIZSpOokZy0vf6N4lpAQuJsyI+BLSMaFrhmzDwmgXA1g97l1NxWrr3iB gVbTTGxjX1W7PyEbsblLvkJR4047jPNqvzop2alvwypuIq+7ri4JGzk6krVx3rQrSYcm ZahwARNgyHO7LWc6JYuyQ84dFZpJ2fJiRyfX433UauD6pOexJJJZQBuxo8u686JO8luv tO3Io+gF/ikYF9gJajxldUF/5NZur/zZeBq8uzEh0McAuYOyJcxWxSM1mBxePDGiwGEA X3Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UvkAYVneU80i5ut71j/6Of/HRF/qbYJDIQXPcUAdskM=; fh=2TiIHzJI1SXNhYDDRGpZU+N7/6/b6c2OGRCAXeNOU8o=; b=MAo/ME3FonHAKsidpq9edBW49lAlNx0STtE9ih2HP2b5WGQ53pkXTLR1XESM4WC1qI WGumcg2/smGAXbzzSWrrxAOsH2sYD9Taa2p5aAVww4sWNrWqAn6Ow/Dp7bjFB+/WGzQm q0xGBKmRL9Ox+kI3zxblfJ70TDN9ElKTwBFz5Np8ENt9/RKy1m2ND7CnpygtTYwQrTT1 pGWv8zTriY2Nn6V+Q4uTj5MjNIVfsoezw1kRNiaENATLD46QR1B/0IObt0Bze9RN48Mg Xfa5RVVj7zpAO+Juxd5B+JXJHj845iJxj8/xNHauwPBTgCJ51DDm1l7WS0goYseTH1fC 6dCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574f9bec535sor3592172a12.6.2024.05.22.00.02.45 for (Google Transport Security); Wed, 22 May 2024 00:02:46 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXAuY1qC7vESZgBMu2vCb+/Jsh+GvXZZBBwP9VJgAWfpI4pbdRynCXITiQLL0fvB3+0KOIccdACuzz3ptmmioLeNvnCx4YHVl2QPbDozjErCjk9 X-Received: by 2002:a50:9fc9:0:b0:56e:24a5:587a with SMTP id 4fb4d7f45d1cf-57832a44748mr719726a12.11.1716361365177; Wed, 22 May 2024 00:02:45 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:44 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 01/18] board/orangepi/orangepi-zero: make the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:20 +0200 Message-ID: <20240522070238.3282121-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the Linux kernel patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++++--------- ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++++---- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index ff0a1db223ea..ff350d68b4cc 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -1,4 +1,4 @@ -From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001 +From ddc295a04269437e5c726f63239689786354d44b Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 11:24:26 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable SPI NOR @@ -9,34 +9,37 @@ For more information see: - http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index 4e1a9050c6b4..cdf19821b1f3 100644 +index 6b74cc923e16..4012f8712cd7 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -161,3 +161,19 @@ - /* USB VBUS is always on */ - status = "okay"; - }; -+ -+&spi0 { +@@ -167,14 +167,18 @@ &ohci1 { + + &spi0 { + /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ +- status = "disabled"; + status = "okay"; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; + compatible = "mxicy,mx25l1606e", "winbond,w25q128"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition@00000000 { + reg = <0x00000000 0x200000>; /* 2Mb */ + }; -+ }; -+}; + }; + }; + -- -2.11.0 +2.43.0 diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index 04d43c344f29..61dc97fd8b4f 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -1,4 +1,4 @@ -From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001 +From 208b13119fc0f709935fc2fc13c0295b19edbbf5 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 15:36:51 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable spidev @@ -7,27 +7,28 @@ On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port. This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index cdf19821b1f3..7242aaecb14f 100644 +index 4012f8712cd7..3552eb312747 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -59,6 +59,7 @@ - serial0 = &uart0; +@@ -59,6 +59,7 @@ aliases { /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; ethernet1 = &xr819; + spi1 = &spi1; }; chosen { -@@ -177,3 +178,13 @@ - }; +@@ -182,6 +183,16 @@ partition@00000000 { }; }; -+ + +&spi1 { + status = "okay"; + @@ -37,6 +38,10 @@ index cdf19821b1f3..7242aaecb14f 100644 + spi-max-frequency = <10000000>; + }; +}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pa_pins>; -- -2.11.0 +2.43.0 From patchwork Wed May 22 07:02:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3111 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 30DBF40F8A for ; Wed, 22 May 2024 09:02:49 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57837716b64sf21632a12.2 for ; Wed, 22 May 2024 00:02:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361369; cv=pass; d=google.com; s=arc-20160816; b=XMdBWktoYcMTgMlms05sjt00WZN4pNURzX3I4x2u5WjjFYORJIOxVGpCbB2bgIwVou Luu5SFvgjzMrHu5+q5JlPUuPAE+PA9HKtSK3VZGn+lRC3SlUHetQ+9AOZ4/i6+WSwxAD os2mHErLSr5h74UoZFP3oHPH/7wstf6+3sApi5Km9cysEkdSqbktaGzc7she2vVHLpUD q2WieXbccqH16rOkJ5re4xpqASAEh9g19dqsptmY9Fga93STLGs5gbelky+o4Xzp9KV0 umRMo1UC65hD3oTcc3eClHdnRepErM56veHUcU5oGzqca91edleKWeFx0u7Zc1C+T0NU ka1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; fh=KKIwbp46dsesFdos2GpKdtwW/U7tCTKUrI7jzqsXyhs=; b=PCR1YEGs/A9HLgKmhwW+ZRZBf+98wG66bi3kD8BtUQDhIBv3kHbi3rJo3YNXE0HH0m 4E+XXkTU2WopXlcpxf8LYhTDJAB+5WNLfvWZEo7FgIlrEJHVPPPRl3rnYxWIGcSTzKQ/ feLGXWQHaC+cz1/6A+GNZ8OY9dkDxYiLV4Ke5I7Wao/2kXFxPYLT/KyLgYZ7OEj+vPNx hqokhIgA85MSl2evXq/a0nkc1wlsOPyfWAr8IXXenjrkxArrUpsnI/rZzZK4Rjg/Z/dg KFj8kV4hKur+4C3KXM0LdnXS4ndLEm808MSOA0jJNzKHOM15L0S2IFBCUOVSN+AS0OPA g+6g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361369; x=1716966169; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; b=ULTJ8TwBgm7Qylfhh2qI+IWgPWrsNrr0ZURiR4rBn4eXnu8LtqGzQfr2GHQJkRRQwc U+aU73fwevtRWcF7otrAAgDnzcwvIy51DSAN7uE21IiEV0IB3RZkTUvp3uuhSoYOHLd4 j1M4NISfNHiKNc58v4yN/jxibWygId424dyRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361369; x=1716966169; h=list-unsubscribe: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:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; b=Kr1yOA3AE+r52v9bDeMr3shUg7knXlpaFWSQMIEp8HHExiSYNVCKv1N3gZf40/EJE7 5t1ur/2MYDFM6QdIy8SMPdEui0vvcecs1gUPra9yctkhKM8UBP4kbdjnyrq9hQ4yA6md CESkOM+AjT3g4LhaoyKdxxSWsvMm1o/Qd/e8odkpA+11NZ4Vy2mgKApnO4NFe6vvIBdm rh2j8YOxoqkCVZL5qM0RouFQyWHFFdik+gRWDw6nRTpaO73f/ygxv/Czvge7KWAe1roa arbnq1fG+q5kpxBeGvI/G1gpK/0CDRVIzGUsEjvUxc0GrSOPgEl595ZqcqkJTePNEZdy hhnw== X-Forwarded-Encrypted: i=2; AJvYcCX4foaWD7iSNpGZ3NHI/J6zRqONXjdYf6kc18hC6D7Nl5gyquA1Sw7O7OMxPcjyUhod3XwCBdqJiMwct64OmpyDLAAHbQ7YkAMacS0AgwmNf/x3WoFcl/1K0jJNJw== X-Gm-Message-State: AOJu0YwH27JsfCi5U56zPDaJ5BC4Mb8sseFDcN9M4g63OwXicpBAdKSa /Od9yFahp/5tKD9y14RLNbkuwsZjKrBN1AjbKTgxRKL7yy377ZiSMidrOatW1TNurQ== X-Google-Smtp-Source: AGHT+IE2r0i7D9x5Yd2giQ+qRrIiAfyC3E1OTBar9HeHvrcZANPF8zGACirlgyMz5aPhw2jMkh5OrQ== X-Received: by 2002:a50:d74e:0:b0:573:55ca:8f15 with SMTP id 4fb4d7f45d1cf-57832c11a20mr811107a12.39.1716361368928; Wed, 22 May 2024 00:02:48 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:321f:b0:578:3557:291e with SMTP id 4fb4d7f45d1cf-5783557295els97041a12.0.-pod-prod-03-eu; Wed, 22 May 2024 00:02:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhuDLvu8eYEpz08f+q9WyTgHWjAEHTSoeJR9K7c4Ky6LKwS8uv2jQk/zEV9b951IwJeHYyGhZYZ6PpjKZ/AdCfJn9sq9R8oUbyxyJNOZUy8Osk X-Received: by 2002:a50:d606:0:b0:575:d74:338c with SMTP id 4fb4d7f45d1cf-578329dd6e9mr739527a12.10.1716361367315; Wed, 22 May 2024 00:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361367; cv=none; d=google.com; s=arc-20160816; b=BhgTbf98aaBD86eL05BjL6nh314DII7Mq51ju24GDSskBGsfw5hYSD6IMg2ms/zG43 Fpv6HhV1fHKn4jvI95O7iHBLMLY/4c13wWdEuaH9XocuzytTXpX3SxNsyS2pEcFq8kn9 SQouuVHvyDo3tl+JsXqNsKpRyPSp/Io9+rOmbC+K4aZO20sgJJYBbLdfvoGUqjlBmRbW hmYr3at7pXvZqlz2xyNW4pl4QFzh65QgItnXz0rnDdjRZt6wJzMGZ04XTOCcR3tzjtuF nSjZOTpMl/bDmIzNKKPoj/eYH+nWgVOmlw8mFRzzjYxG/XwLE+5uit+AmTnvOsA6MRb2 ZaXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=J8QxtZpzTcjGG+oRZ9JSw66OD0qcS8ljXwjBF2rY3Yg=; fh=fqm0n0PUZxcnl4xfmI+JngJ/63sdTu4zc4O9K7OkYJU=; b=LzEMc3RQI18QLuLzU5gzVSU7IDIPZKs6B/rqSevW0YTW7Lb5s4rB+hglrw+E0wPuAz R+kJmv40baRBw1sWyR2Im9thlgYA6kG/xwi/u8QSMwD3v4r8nfxIOF+AVIzOfamIh1rK +zpeSWFFDEaeIIXn2pPuf3YzcHuxcw2aPulUEQQinY5Oiy7nwKlYYromm1czhCpSCvM9 3In+a8zZrwP5f9OIpXd2IznMcycYMFeCU07ijyHP9CJhAbGkUvMnRUvIkUeAVgloA/A+ RkqzoHs8fnaP/T1ibQBRf4AzdiXQQ0yMeHhjoOtVKLePceBpPYjqmh0ne03H3gHtrBjq mIlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733ce2cff6sor1668205a12.2.2024.05.22.00.02.47 for (Google Transport Security); Wed, 22 May 2024 00:02:47 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCU1uK+SN9U4k8tw6/waUGoGkvlagT0qMRKHpWUHyZUeOFIK2exw7VcC7Z0v7h1/cxwmfi/zJz0vg5/b7/ORzP7Iq8Vo1WghgOOEyTOPL/cpOV80 X-Received: by 2002:a50:8e14:0:b0:56e:34e0:4699 with SMTP id 4fb4d7f45d1cf-57832be2ef7mr796154a12.30.1716361366902; Wed, 22 May 2024 00:02:46 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:46 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 02/18] board/pine64/rock64: make the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:21 +0200 Message-ID: <20240522070238.3282121-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the U-Boot patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...3328-needs-itb-image-to-boot-properly.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch index 2d35b78daaf2..7c8473603457 100644 --- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch +++ b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch @@ -1,4 +1,4 @@ -From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 +From d312c4e40bf816823bdcfd066dd2511b23e83c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Tue, 5 Feb 2019 22:08:54 +0100 Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly @@ -7,16 +7,18 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Łyszczek +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile -index 8086f3c93e..a6425b5b03 100644 +index 149f83994814..ebbdf2596b9b 100644 --- a/Makefile +++ b/Makefile -@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) - ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +@@ -923,6 +923,11 @@ ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy) + ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin endif +# rk3328 needs itb image to boot properly @@ -24,9 +26,9 @@ index 8086f3c93e..a6425b5b03 100644 +ALL-y += u-boot.itb +endif + - # enable combined SPL/u-boot/dtb rules for tegra - ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) - ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin + # Build a combined spl + u-boot image for sunxi + ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) + ALL-y += u-boot-sunxi-with-spl.bin -- -2.18.1 +2.43.0 From patchwork Wed May 22 07:02:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3112 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 19B263F9F8 for ; Wed, 22 May 2024 09:02:51 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59aedbd9a9sf43088466b.0 for ; Wed, 22 May 2024 00:02:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361370; cv=pass; d=google.com; s=arc-20160816; b=Rb7k7jY+5lwNEQ+ok0KeGcUiREwBiM+dfV/Ah8uQEp9xSMGOuBSU8jvd0dahkXnSZV zmqwp5lhJb9QL95kxoUcgtFOqBYfDTzHPRZOWPf8RSJJsDYsTAfGSsZw3k0rpWYLOri1 CwUrlYWuKq3YAqnFsafRzd2ahvqwb2a+LwO3x0tb2MBo+gb1hXC8BZrw833IigCgQzFO uu5OjQFQAixkQoC9Bvr83pws8x17QoPPSELFPvKX8aYRskrhPaaeHhi5hTzRC9hIqm6y +v7shhr4No5yaUVFNbFKFr++P7/ECbFrc6gU4P3EwhaJidFD5Ec23oto3mKzhOpocvCR n8tw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; fh=yZG0RhHXJdaMbQnYm6lZadh+2czcLaW+RfLHVQabyDc=; b=PbtvW9/d7EEYAP8n9oiwo0GOvLGnjH2K6e/jbp8mCUsdecZwO/eLckqM3DeayicBg4 WwjYvBLGI7IhvgUWFKPCPJp3ANlNbkYLsj7E07CI1GWkomU77gH+UlmasXR9XKLiGdKr PlapuI1FJunl67eLabUNG2McuAtNZrsoUZ+HYO2lP5xINTd27xOxs5yfpVY8OG08vd95 tdZQ3/0uyFcD3nki4faQ3xJqsEx/O9P9Q/BuP+HexYlDJ0egM462J+PQ/Ne0IWVHQ70X ODNiIT30OL67Q0Iyke3+d6WlgenFLR1FO4OxISXZt1ZL2gd5AZuaZ04Kv7Zm4um1xfrQ nKUQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aQAhkEyT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361370; x=1716966170; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; b=mGsN+qbxVgb9q8oWMz9sPJHw/XqI22gZlHF6UmPR3HP7BrmD+m59P0AzgzxgyMy6ge H+DQwgv0prp/wHi+vXSrb4HVQDL9Yj6WShJ4UVhEXrUcuQTTuyKmUhg0M0cyiPelO77P 6uEIzsvcmlrf4VU6ZVq5W+rp8VPQKF1MwXnes= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361370; x=1716966170; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; b=M9D0zWlGCZ73PS7sqX9XyOZVtSOZDHaDg0iEdjx/5A3ws2/ojGoCKtsb3g8y+YfmHh 4R8rbynI+GvBs1D/PO8IZ/0hUkBqWVkBNh/UzLQpQ3uJDy3H2xWeBv5onqL6M1mumtDm 3vRiAW8TOplXnAn3OJCfEZSpAA2qsJVQfTfnRtA13yaijBI2rdlIKtOMt4AFJxcGREup kwabpWK/2gNW+BiIZjQhWgmpQMVrC8NhtZSGyJaZV/ZDt41u7DSDibxdV0bk473z98Ms yuqA/xr8GuUSTXx4XJQpSAFO7ON+YLs/l1Gjuua9XOkR8RibzJI0/17Opi7UscSekK6t dFyA== X-Forwarded-Encrypted: i=2; AJvYcCX7h0kbGdqFZapMNedf8jq15pTDpFITbv67hncpHNwBvr/p63suWO5m0nVMljlVJ6MddeVGOeaLLgBtdoqvNWXbKk6klo4DKJyZVXHQvZYcFDacwturqNM8rE+SpA== X-Gm-Message-State: AOJu0Yz05//hESW+ZSd1vMDDzBJlm61/UaDvmuYNrz/Je0C/KEPQI0jd LJIkW9f0XSS1vdK2cQgx+ktMjLkE7kwfuBntg54agonlpOxcKPhFiEwp2mDNSxCqgg== X-Google-Smtp-Source: AGHT+IFzIKBoIN7wOk7jkgykjagdBIJpioC4MlGjC46vtiSTgFZ8HgPqaAM8dw2RQok9WBWruJ49Hg== X-Received: by 2002:a50:a6dc:0:b0:572:9b20:2929 with SMTP id 4fb4d7f45d1cf-57832c4ec00mr534704a12.37.1716361370791; Wed, 22 May 2024 00:02:50 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:e88:b0:574:f233:f00d with SMTP id 4fb4d7f45d1cf-574f233fa23ls536158a12.0.-pod-prod-09-eu; Wed, 22 May 2024 00:02:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJfMneTEGtlMSzYF7j0AK7ZcsRFoVWqkhbAKB12IKnRqmqglRq45GiRsQdn2M6PTVo0nIOzqVW0SoMeqoq0jWsKj/KKqwYCBd1PAPPkGxOyBy/ X-Received: by 2002:a50:a682:0:b0:56e:60d:9b16 with SMTP id 4fb4d7f45d1cf-578329ecf39mr642081a12.6.1716361368977; Wed, 22 May 2024 00:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361368; cv=none; d=google.com; s=arc-20160816; b=BwyJH1b++bamO18rqwTFITm8Lphx/x+KVs90G/eBCgubUPZK/k9u26F79Ls/wt2JRa gEdrYV6vYbN2+55IAyrNHsBgdAtKzgqsDZojSo49awauH5m3d7xRxUtHy5NdZ9BlsPot Brhu8qyFgek1RF93UN2165jzVux+XbhwcgUpUaLspeT1ZLDWJTSFMpViUoanZHKXU/rC 9LWTvMgK3BjcZdnSpKF3q7biPyn6GE2n4vh81GIBFJSlrpODd9jzbR/vElj6Sq1uZSm/ 3T8kHyE5WJNUl/FmI/aza2apzlOBIbjGklLr2CG7b/8gcvug5gghjQSTYkUPpiFaD3uN TXvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XxOzfEtNFxb7Y2jjlOwycso6YiCuLv/lueVKvE9abck=; fh=eHE4QPj746gcA4h7isT1dOZF07voA3UiK9fL8QCOz2U=; b=OPtLxzZCsL+6rYaqeWIOBx/JMJdvEqhapP1O1R90o7C+WXOXgyJQSvtpxEF+FZkZF0 fhYV8JrSImtFd8RHV60SmOYT/mhSo9r3J9dtGMxhH1yt0a+P2uPVp72e+EX2T5LITsPB GD/oGhqCaaCkOe7Jffw5AwM3tMkYVwyDoqEGOWTtU1buHQP4hwM+aXA+pfq44big8sKI YSJgMaCZ025gFmCwzlsX3HRTBbk6+KRyIz73Z4IhQ/7u8rSsm22w5gAaeJZElxu9lInv YQrVFS+C0Oo84Pzsgnl0jkpPFxuIhhzl9/tl6Jw9TMuygUtfpGtcx3GQJx1PdeMasiBz OaMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aQAhkEyT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-575089a3e46sor3130201a12.1.2024.05.22.00.02.48 for (Google Transport Security); Wed, 22 May 2024 00:02:48 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVGYQABKpqZkuH26o7Gm7pWY/N9mUL9fg0IPIZodp/ddTC/cn8t9DuaGNo3BcSV0mzFVNSmzTd6haux8Yu0UcoGSUpiW6tpF85jVgHmtvt3svyy X-Received: by 2002:a50:d6c9:0:b0:575:17ce:adc3 with SMTP id 4fb4d7f45d1cf-57832a69e33mr568007a12.22.1716361368607; Wed, 22 May 2024 00:02:48 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:48 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 03/18] boot/syslinux: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:22 +0200 Message-ID: <20240522070238.3282121-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aQAhkEyT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the syslinux patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../syslinux/0015-efi-main.c-include-efisetjmp.h.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch index 2fd61ecbc8fe..15adfc49f33c 100644 --- a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch +++ b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch @@ -1,4 +1,4 @@ -From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001 +From 26979f738518404b1d3dc9ecdcf4fa5811412c49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 24 Mar 2020 10:21:27 +0100 Subject: [PATCH] efi/main.c: include @@ -38,13 +38,15 @@ This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027 So we act as specified, and include from efi/main.c. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://www.syslinux.org/archives/2020-March/026621.html --- efi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/efi/main.c b/efi/main.c -index 6a748412..e924cfb1 100644 +index 71d31a5c1f13..7dc7bca7aeba 100644 --- a/efi/main.c +++ b/efi/main.c @@ -12,6 +12,7 @@ @@ -54,7 +56,7 @@ index 6a748412..e924cfb1 100644 +#include #include "fio.h" #include "version.h" - #include "efi_pxe.h" + -- -2.25.1 +2.43.0 From patchwork Wed May 22 07:02:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3113 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AF92840F8A for ; Wed, 22 May 2024 09:02:52 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-578282c81bcsf433744a12.2 for ; Wed, 22 May 2024 00:02:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361372; cv=pass; d=google.com; s=arc-20160816; b=KCQXoNyuK6/1VFdaFG2QKQotGfO9/rS+ijDt4P8NaP4hp7NqLS/h/CBytFUZolnGVF upeg2nPg700cyVGgNryHVw6K8VE3+gEfmtj1d6FF4k8vkEHj0s42bfRrLWx4Q89lVoJD BAzvAzmh/Mdguks+F+gnSNq4e8zk9l6eZzf/wyY1sAWA8YW3uyF0sJSKu0BoshO2RBlO MclzbxEx8/Xs48CeSSk5/lI1g6PUfCoFXBhaTsDYckts27mOCkxo6hYVwNwqiS2taNg/ Mt4iwpk8Fcwmxq6smoUy+TixJqMppPZGSvIwsxGyLh7rZPqFMzPGhijoCqq5xhkAEhXn Rapg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6rTuVsXbnes5nrMJ/EgQzIvxDar6pR0JiFZLYfVhgbA=; fh=J/q+kazcs7yPGDGErDbYNKv2d7mm57yEQ/U8RJ1abDg=; b=Q2gPHO2pPhz9UEisha9cp93a3HppTfQSBnD93HaqpbDO8AOW3XJT+emDMIO6Oo2OtS kbnXxEKJWLGUCMhY0cFbbcsZhSXHURNpeiF7eDWph3vvutFL9ShqxX203+c7lrNPo37a qBFfFeoi/G2taR9COzV+wQYn5WeyhyRA7l9PTkMZsPiUnOUSPBg/CubLrgIvcHENazgW NjopCYKBO7Yo24uGJHIYQTmqnr/7IMzEFdgAGLLE90Fb6eQ76zbUZyHrPCKr5ENRJJzJ eVx+WharXpHgaAFLWcxUGK6fRgIfDJRlVOGXakqET4qOgsF94sew9o2v/ePbcF7nlzae Wruw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=iR+By9Gj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361372; x=1716966172; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=6rTuVsXbnes5nrMJ/EgQzIvxDar6pR0JiFZLYfVhgbA=; b=QJ61d3jn/vdEtvzY1yYE0Bwnl8n1XJRFRb8ZY7mZh9YcIB5z9tdNiI1qxdytJskS0H KsAa0gtpD9frmiuNwkmYDPo2E+mug6g+Ja7wPqBXz61WUx5SohCJ9OFGwbMgYojvL0e9 eKOOfbCx6FEa8hjkSFcsEgVImC7cPt9WZ/ROU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361372; x=1716966172; h=list-unsubscribe: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:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6rTuVsXbnes5nrMJ/EgQzIvxDar6pR0JiFZLYfVhgbA=; b=GqCT/5jXVNqc+xD10XwgNg5JhmvijVXne7+Rcdz4OmD8VmP+G7+ivE+GYn8WYQnFuH h2wmwaXPUWXBPH3WCEtUbRW6yGg0Ad4zE0KX6Pna9EFGfsn11zrHW4ITlx5+Rc56Pu6X wkHwONfbejr80pFZts2mAjb8GewJAVtd+5cv3EUDSeu88si0+P9ePp9nsY0mXE4EWQZa D3dx/8zuhcCuCIvBNXQnJ51zIXY0Jdt4hgUgCgHaGTydKBjQIywEvJyhRfOhGQ4FtRVB PKR+rgbnutJOuLBYsXtfbfKxwHydolyn0j5hUnqgeC4zglH2uHwlikFiOMqnBYw/y3ha EZ3g== X-Forwarded-Encrypted: i=2; AJvYcCW5XB3XmCEZGIE3YXI+izusb9Wh5rc9IO0A+/41z+p0H6aT/Qov4lvmqVWLOJbjUjfEfiZJTmNwBCFhnSa0Z8iZZdJvqeAIumzd1TQrAJhcjm8PAsh3W8lTf72bng== X-Gm-Message-State: AOJu0Ywy6oDRFxE5WdHdPkwM6orP1DYJh/gy6HnFNZqcIDMJDZrejV0e 7hdmluq0AGHpSbm/AN7F8xtqJVoSrd7Jr3c/azB329sq/lkWmO5iG09UMbnKF1LQyg== X-Google-Smtp-Source: AGHT+IGitbqxpMV2cnIXvU5wF0BW7ES46RGfZXOIS0/ySt8D5Ct9Eg/TaO2vC444p1U9Wv5iAxYdAA== X-Received: by 2002:a50:8717:0:b0:574:f27a:b3ec with SMTP id 4fb4d7f45d1cf-578329fe18cmr1067706a12.16.1716361372466; Wed, 22 May 2024 00:02:52 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:e9d:b0:578:25bd:e528 with SMTP id 4fb4d7f45d1cf-57825bde7b9ls329139a12.1.-pod-prod-08-eu; Wed, 22 May 2024 00:02:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPtmRRqjf4Cu8KacA7bEyNnGhZp2UJTDQ4TBTGO7gnMogg8oOeM/3KF7WQQ5wRRVTM0ZJ47+JsP4mCwS6hAglhKxXAZK1oHVv/MUFU6W52Vlvx X-Received: by 2002:a50:9e25:0:b0:572:a731:dd1d with SMTP id 4fb4d7f45d1cf-57832a3e7f0mr1000712a12.25.1716361370961; Wed, 22 May 2024 00:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361370; cv=none; d=google.com; s=arc-20160816; b=T265KMb9guZHw/HaLvs+Oz7GNvpZpKB7FhgUFBAamblVPKNFGal1Np9xBaXBAwRBmw SbiaMur87xdZChrrPY3RUmdzUJlDjpYO22Mk+hbrc83iMGDbiZcG68Ha1W/4n9eUaJsM SJ0OmRHUR1frZTxJCnWH+pkYZUjrW8k8hBPIOd4TClGgc8630fsTni8PwMZxoDVCe9Yf E3X7ndMiWNFHhnPe51cDOw2RC97bbFPYFekbUxKjlbddIauoXU13EqAN9tielLHRGAzv M6KObPu8dS8wSC/ICs/B3oDnQpIB0W/ftmnI4/f6S4qIkdguOZ0TgtGWiFJdsTasTPD5 od8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZC+7BN3SYtiVf8WzgBwWyUmb3uS6MMYR6Bt9YkUNYHI=; fh=w1yE32sWJVesLB8opEIOohK+ws7EGDk8MpwGVRjhabw=; b=Q0BtkQOGmJhHW65vMx3KepTVE046mXT7Ckwt65OgeXr/7Uahe7wnk6LxaJfERgHXow MdzneQz59AuewY01d37xzN3GS9FryUVS3RkUgW7TNYHoYD6ANkKrDcovBgprtrZvSt1E 3up01KujQVb1xqaaKwr61yaIz4YMAKyzUkLnMIWiTKBDFzq/cpCqmuvR57NbZy9Xsje4 /p3bP2ywkz1r9o/QaZHPBYQLVLKhLqagXKJ2DZg9WZ/9PDDp3ghZKfOCrOHNno+HLbs0 cFITI/RzJwCOGIppJRC9bV1peMppJMz2+5ZTBwI2bKcT8qDm8Gra7kK9BPdUIprdrJsZ vRDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=iR+By9Gj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733c238177sor7172474a12.9.2024.05.22.00.02.50 for (Google Transport Security); Wed, 22 May 2024 00:02:50 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCV6XUAkzpwwikDVo/pUgi0ZWFe6QGXC23RFkOx2yQvTMCmPh1KQMJGB1c6TzZs+ghXuMVVajSC9SqRgIiqz2aT0w6jksIDa8JT3BFL+FX9q0Qgb X-Received: by 2002:a05:6402:11c6:b0:578:34f8:cc04 with SMTP id 4fb4d7f45d1cf-57834f8cc0amr949552a12.4.1716361370231; Wed, 22 May 2024 00:02:50 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:49 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 04/18] package/alsa-lib: update the patch to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:23 +0200 Message-ID: <20240522070238.3282121-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=iR+By9Gj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...01-Don-t-use-fork-on-noMMU-platforms.patch | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch index 0d2b479534a0..87add9ff5666 100644 --- a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch +++ b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -1,4 +1,4 @@ -From 41c029755502acf01ed634db437ac06d09be6c41 Mon Sep 17 00:00:00 2001 +From ffc567b790005850c561f9f6590b069b61f5ba20 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 13 Apr 2018 09:02:37 +0200 Subject: [PATCH] Don't use fork() on noMMU platforms @@ -12,18 +12,21 @@ Signed-off-by: Jörg Krause Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html [Bernd: update patch for 1.2.4 & 1.2.7] Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi + --- configure.ac | 2 ++ src/pcm/pcm_direct.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cce195ae..0c852434 100644 +index 7a152a4abd20..3cf88c37db56 100644 --- a/configure.ac +++ b/configure.ac -@@ -52,6 +52,8 @@ dnl Checks for library functions. - AC_CHECK_FUNCS([uselocale]) - AC_CHECK_FUNCS([eaccess]) +@@ -56,6 +56,8 @@ AC_CHECK_FUNCS([eaccess]) + dnl Enable largefile support + AC_SYS_LARGEFILE +AC_CHECK_FUNC([fork]) + @@ -31,10 +34,10 @@ index cce195ae..0c852434 100644 AC_SUBST(LIBTOOL_VERSION_INFO) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c -index 2b07eff9..4dc3ea26 100644 +index e53e59238119..cf94c7c1dbf0 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c -@@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) +@@ -442,13 +442,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) close(dmix->server_fd); return ret; } @@ -58,5 +61,5 @@ index 2b07eff9..4dc3ea26 100644 server_job(dmix); _exit(EXIT_SUCCESS); -- -2.14.3 +2.43.0 From patchwork Wed May 22 07:02:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3114 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 15A523F9F8 for ; Wed, 22 May 2024 09:02:54 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-578280daf12sf448669a12.1 for ; Wed, 22 May 2024 00:02:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361373; cv=pass; d=google.com; s=arc-20160816; b=uyHjU1JjAytqb7jzkldW5lw+hB7dtx3PB+XdOYoiGzCVLkLN+ZTZ47MMOJVLib6qNr AKImFncjCGbvZJjlRbinry826tHB+ReT834JydN9Sughbs2rEPKBFL/UKz0hepa2WgJB nyeMAY3060u6BxCnOYSetByAciOyTsUCFbxNDkvU5O9g+QZ0fcs+xhvxa1+PAlNHuJxg 8XWHuRHe08sIrl6IUcYvW0bHpWv35pGLDz+IrFnrdTef0CxGe+owI+k4F3zni/RiSMGe XOGv+QAK7pcp0KgSl5LuW/A+Zp6tIq63O6Yv23h4IDRni6HHY66vELSQNF/ldYmZ+f0e iVZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; fh=QELMMibWcDXhLTqzergJr39F0emyMKauiQLfsHrORO8=; b=02iqGQ1UQqUtMqtfKDBiLVvVMUcpzON/7ZSnWTLhvQf7+i9Yz6I2K7BnjYLf3EOjSM PAZOAcsQEjNeYw2J6cbLaPW9/cJ7lo7QDp8BGPgYWAjbHJYLvRkqbUT1AKQHfRWLzr8C 6vIT0sBIg405fNpQNx4qmXq1prgAID2U7Y0eRhOJ5RSDxPEJ27gRLaQWSHKQSL1ga+jV c7frN2XMp4gU3QDAJgQtfvEIIO3ScN/sWrmMUw90eThUbheZIR62WCVrkU8dYD8r+8bf tEo0TSMXSweK5/JpVVIiv/+FQbgZxiS6G6PHUtBuwnfkWytSpNNT2NTJkD/Gkw82YyQ4 acjg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361373; x=1716966173; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; b=bVpyW/q9sCMeUY2kX3VyJe4vCmFR+PxcDyzACRr1pyRQ/0ts0tebkbhvGb6WUu7i0w LBDik9KaGkj6P1cXBwTVa1+5yQtZv8FABNkWMxQD+skNx28J09w74blGFcPH1ek/zE9w l23v9iF8MUYOPM4qx8ykKl8HwpVxqI/2VV6qU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361373; x=1716966173; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; b=afZCqwPf1PspmIAICXXGzE6aX9yK4Q288uPozxshjr1WndyvGAGg0TAeuhZHvqW3cp sC4VZbeFwERCd6/L5/kiRP2yWWafoXIOFdfOB0E8S5TZ32bBThnv2DlathMQGr9mQ3Mv LisrDRvT5i0hOsmiSl73mvydW0AxeDxxaPrzAosJFDIq8p2ax35of9fCU8n1Z9s5liA0 YkmwynkGpyUHSbzsKc+h0JR/wucE5hLFlVb28uIht4QF29E0Gbg7S75GC7ZJDjxUTlMf x+PQ6v73cVkBoFJRM4Zg+loTVeZIwUpDoBwxckEFVS9iBhDNW49+16lqEpis/yTy5Jhx tmPg== X-Forwarded-Encrypted: i=2; AJvYcCUf2YQZ2m+x7qtRX2CqBoUhibJj3N+kXoqiJtXv8mRFMM3FZoXsGXJ7Q2K7P+txjHYoBpIMp2yVlummXMCGQeLvmE6RL8vDeOJ6O6/1OGHWlc3Jiupytrw2QdIbZg== X-Gm-Message-State: AOJu0YzfUwbXt9/ySxSlmVYUGKirrDBZGadV5MvVSOX/IpeT++IT8cp6 /fWCBppg13Cr+zCe49DP+aR1BCC2QpulhR2AYeGuXDUGv7XvnM97Zt0k9xWnd8DWYWV/tW2mRw= = X-Google-Smtp-Source: AGHT+IGSJybtWUmJt9/IljOnCHAZJSaIWhtkhLKuIuuBH8FCEyMfQ+e4ceVv4W6ra9XyOe9Kjw1FeA== X-Received: by 2002:a50:8a84:0:b0:574:ea9d:51f8 with SMTP id 4fb4d7f45d1cf-578329fe2c7mr1010910a12.18.1716361373723; Wed, 22 May 2024 00:02:53 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:e9d:b0:578:25bd:e528 with SMTP id 4fb4d7f45d1cf-57825bde7b9ls329150a12.1.-pod-prod-08-eu; Wed, 22 May 2024 00:02:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/0dvOedmNyzqIrKyfzJIYODKWvjHNVXXfmQDadeepB83bJSYxukqDLMt5HCjJUMYyVRMcQJ8ubhBxjyNELSu8chmBpcLwbbU820kzJxeXHaef X-Received: by 2002:a50:8d4e:0:b0:572:4e6b:958 with SMTP id 4fb4d7f45d1cf-578329c8c82mr1014124a12.2.1716361372223; Wed, 22 May 2024 00:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361372; cv=none; d=google.com; s=arc-20160816; b=tDCHXLKT3qMAz9rwWIlDBvimz0dO8fxanA2g5DMDS07kX2aB3a6eD/oiFKVDuInXWr m1g2kY8xZXVCn7nkUFuAxSeWFzbGITZrQN0UQl8l3uR5HymTAeyAn65UDhcn9rlVblId 0rJxAywGfWW6WVG276A+B/MAgVQknUIdXVK2WQEHDAS9ZZtsDCh9FyhQ593vzCpAxq7/ IWu7eRp2E+UFdv/W0aNTjnMidabBdp4rJ2MOCQBtJXMOaa6wHydMeLXA/ECuchM5HJFx WyqAInugYq0mupfSgRESMJSdnSuDGMXeZRq49/hnj42HtZuvHSW9AgsKr/QTYUm9mCbb L20Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=F3jUMTjQuVY3DEmL6gNZCYhAlpLJFtfL9KDS9J+O1pc=; fh=qMFfo3i6SRlY8oTZU/OgeNbv84NZDX/6itr0Zshw9tg=; b=dQpiMKh9ydp0WytI08X4TgWLV3qy5Avh3vT15G7zETMsACXFPOMamXUZEkPvBkJk93 D5eAK6t3bbotH5bKWCrDIZLxup5+PUFJZ4BSYljOaQR+pcSQIKvXlQqNGe0IpAenqY4Q OpZHXUW//unZSxwbBFO4THCzG4VMlDL5FS8fA7jjgydznVUfYdQiQoo885c1HVnB7vqm QBN5wCNBgHijvobyXPLxN6me0NFxaF5Bsa92ftCKTdmEYJdtIerguxzkRT1+4ATRsDAA smxb8NhRnsCq2/3tAdTKCSNkhi/mFQlESINg7nkGQSiKKWxbluGgbC9qkn77Z5QvPG2a efww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574f6bd0433sor3936392a12.2.2024.05.22.00.02.52 for (Google Transport Security); Wed, 22 May 2024 00:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVvknSTB0tut7msIWZb2nIN7vysoMyG5WDsYgxyAfLWlblNqnB8IXSd5Ryb3hktDylJwXP8mPTK2cDSD0wLesf4X4+T2LGTfeV/PRyMW+W4QkHJ X-Received: by 2002:a50:9e25:0:b0:572:a731:dd1d with SMTP id 4fb4d7f45d1cf-57832a3e7f0mr1000753a12.25.1716361371881; Wed, 22 May 2024 00:02:51 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:51 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 05/18] package/bzip2: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:24 +0200 Message-ID: <20240522070238.3282121-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- package/bzip2/0001-build-objects-twice.patch | 14 ++++++++------ package/bzip2/0002-improve-build-system.patch | 12 +++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch index 9bde0f6488c0..52b234f65a8e 100644 --- a/package/bzip2/0001-build-objects-twice.patch +++ b/package/bzip2/0001-build-objects-twice.patch @@ -8,14 +8,16 @@ and build the shared objects as *.sho instead of *.o. Then, we use these objects to create the shared library. Signed-off-by: Markos Chandras +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: bzip2-1.0.6/Makefile-libbz2_so =================================================================== --- bzip2-1.0.6.orig/Makefile-libbz2_so +++ bzip2-1.0.6/Makefile-libbz2_so -@@ -25,13 +25,13 @@ SHELL=/bin/sh - CC=gcc - override CFLAGS += -fpic -fPIC -Wall +@@ -26,13 +26,13 @@ CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -OBJS= blocksort.o \ - huffman.o \ @@ -33,10 +35,10 @@ Index: bzip2-1.0.6/Makefile-libbz2_so + bzlib.sho all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -@@ -45,17 +45,5 @@ install: + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +@@ -43,17 +43,5 @@ all: $(OBJS) clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch index 2d6e2cf900d2..11a856e49c96 100644 --- a/package/bzip2/0002-improve-build-system.patch +++ b/package/bzip2/0002-improve-build-system.patch @@ -20,12 +20,14 @@ This patch makes a number of improvements to the bzip2 build system: appropriate symbolic links. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -20,8 +20,7 @@ +@@ -20,8 +20,7 @@ AR=ar RANLIB=ranlib LDFLAGS= @@ -35,7 +37,7 @@ Index: b/Makefile # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -90,14 +89,14 @@ +@@ -90,14 +89,14 @@ install: bzip2 bzip2recover cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep @@ -66,9 +68,9 @@ Index: b/Makefile-libbz2_so -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +override CFLAGS += -fpic -fPIC -Wall - OBJS= blocksort.o \ - huffman.o \ -@@ -37,8 +36,11 @@ + OBJS= blocksort.sho \ + huffman.sho \ +@@ -37,8 +36,11 @@ OBJS= blocksort.sho \ all: $(OBJS) $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 From patchwork Wed May 22 07:02:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3115 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 74A523F9F8 for ; Wed, 22 May 2024 09:02:56 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-572f9681094sf249894a12.3 for ; Wed, 22 May 2024 00:02:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361376; cv=pass; d=google.com; s=arc-20160816; b=aPjC24VRkObT+4jbjTtvQXueC/zm/9D7N6A1og1zaDN74SuStyWa2VKYhJfkzCyPcG kmptfoZopiypPNWQhBRAc39wbBx2UsEPhjFUV72qJ5N/7BgS8ZrYw3DHUZgw5j/IQR54 kSpKrMUhpB9HpdoYnT3kkgY7iODqiSMeOxEt5qAdyMrldR7ZgNpWKHQ02stSpcd5HTcJ Y8HQYsIz5eyV5cefijinUYlgIe9DGcV7gzG3jsGqvaHugHiZULC6rTszTEWQx6hN223S 1GykZ3x0Cr/Eb4e3n1L5WE8tAhP+sbFIQygXo6vzVCi+PnWRE0WGLg86yArK4rDKZaRP mZ+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=SE6oVz00J/cZFmolrOttaDU9MkL/ePCKuRidixqCL2Y=; fh=Zvjb0pbaxo3gAEETR8xl44qErmTMnFXxGdN05CL2g/U=; b=Q3MOb9IFfTksBvT65PBYinmmuXeZINFZU563PGRCuSoKmfxm5hkCIN+wlC1VOqdvzC hTWSnrbRySK+Tr0lg+mTUb5Hy5RVZ6RWlFuzZt7Xkjx5iKKcfElk9qRf3t11zg7jSAR0 LrgufkaCwW54rogvnA2T5tIJ572898GteiMneHMEWk4qV1sR6XMVINw14lj6Dzy2rFW4 n7xp0M3TUSXxLsgymr58PQCFQ5pn2VqEEYGCjChduRyu4nenCGCbscuITlhWzE004p5y 0h3arNxl5m5q8Lt+eT6YX2N6UmL5BhqfAA/R6kskvscl8vhsM74netUZFYo524O0x6/h FjAg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="UeP2Tf/z"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361376; x=1716966176; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=SE6oVz00J/cZFmolrOttaDU9MkL/ePCKuRidixqCL2Y=; b=jgwfdT6L4923zxs5o+DpV//8gnaQ8Tq7TmfWZpV+azMAoTOz4M79nbpnnh6tG1TC4X 8umFYFtK/1D1JqwwPg1M5Gr79JQ7d9sX4VmisEHamONqyO/rR/syskB94oxVpHA5BZTy GHmyytq7JBt7u2Q6Bh4B25c6k7FvLYwQeM9Bc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361376; x=1716966176; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SE6oVz00J/cZFmolrOttaDU9MkL/ePCKuRidixqCL2Y=; b=NmKeXdD1JPFiWe2GcMGcYrz+81qc2NjPi7aC5yrMnx5wuJEtyRogcIQi0iQfrgw8bY 3MWsOPG4WO0+UnQAvGR+Fduo10pAE32qh3sAT/LL/ScDmQXkSiVrrY4NFrimhCFZ1sP5 T1wMeKEDMWIEF3GRBVmWoCVqwmqLCf0wZKIgzyYC+YnZgiSTNiSIOC3rlXHaR8CwXtiZ aO75OA6Pdgq1QLNKyHSiUCo8bR0iJPrx3wEKqN68tn/H8hBgK8anck7DnEcLOACzlKdJ /8lc8GQKUA0PFa7Q2VlS5LfuP6yU1fjaf/LSe9q0khe+asyN37o3YphwBoE0T7lr6Mtu R6Jw== X-Forwarded-Encrypted: i=2; AJvYcCWs8dfMH5fonKECqSP13ltz3YWBvE6zJr21gnIcxdo6MZw/ZZbWlvp/l1HO88wJP02UPIzlgOlAoqbY32E8cPRnPrAjmdIbm9Ltjm9xGZk6ww8W05+ygIoMTrYDTw== X-Gm-Message-State: AOJu0Ywdw/y2U1HOZN2c8E6EK9tDjPsucc0OZia5TRYWp/AAxbzn9oQ/ Mdngu0MdTQL8RjeCr+kx8sOt+D4JV1XobvHtu9KmtSLg/j7dqwRMAwMv92NI5Uvoow== X-Google-Smtp-Source: AGHT+IHKDx2D/EmCcYGs947v3BAoAFSIPIlQhIUGQVd/mNq/2E8butultNiNfor5s6MjVHPmWBVRWA== X-Received: by 2002:a50:d4d2:0:b0:56d:c928:ad76 with SMTP id 4fb4d7f45d1cf-57832c44a3dmr535190a12.26.1716361376193; Wed, 22 May 2024 00:02:56 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1f0d:b0:574:fea3:59df with SMTP id 4fb4d7f45d1cf-57832370182ls204368a12.1.-pod-prod-01-eu; Wed, 22 May 2024 00:02:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqV/NGFsGtFP8azkrh/2Ov1klYAqPnk8VNRTQPc1LNBAQwxEveqF1JGz/QsD15vXEY3qbMFGUgSEOSpkB1AUrQB2uVMdvSn85H611h8isAfCgl X-Received: by 2002:a50:9f25:0:b0:574:eace:b7bd with SMTP id 4fb4d7f45d1cf-57832a26892mr558802a12.11.1716361374546; Wed, 22 May 2024 00:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361374; cv=none; d=google.com; s=arc-20160816; b=nNtMYXiAfAztKWvuNZC165tXQJ132VfjxjvgOV/qJYTDBClFJdnag7kom0rVdaWL1Y 5/zzuin7pj8JUreFDnaOeKGYyVxZci726BJARHaOrg1b2qTCdcRfbK2E2jYGmJc6m8dM DowgqWvA2pgiYDsuizJbUQG2RaHdiScominob4csImQ4MimFNCZUJkdE3+M+GGnsrYbZ jcVa9WpQbwdt4TqcsTfOCMTkVVKddrTRZ1W5+YJTkVMjeuSDDGxgL/z4FREEisiP/aB8 74zOThZv5xQ4GzC/9+euYoiLWuJtu7XoQ5PtIFzCbd/qfwDSco7J9LwfJlJb8e20+sE5 UlIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3+/BJu4YjNdX7N+GBm37KsrjGTmH9lAcpWT3enHZbIo=; fh=5//H2Dvk3/h2PfYQX11Bs84LXw+nZFOqUkd4Et7Vo+M=; b=Mc2zzriG+kgwrzpyVpDXWXeL9v9HCiDBCetjBHgEyOvl0KPDJmlXfKXJwWMoS5tmAW 04Ro1w97MbzkpuQSLSVlI07212JSzywqUVjHs9wREKN0en84obc5kcYVbeMMZHAVmDCH T4Rj30ru/NJVhIF1mkPhccd+1Swr+DN84BGnNNgNNpAZXsMluaQWbXrIocM0oRIaIZw5 HzExAbYSgZnefLqLGW9nkId8WlzdPFOId6vekMGiDxVWWfukNkGux2l5JzLMmnWmLwEX 8Z4sDjC4vcwKBbogLnZRDa94PaHDLOHbynmbenJc24iitCuWN5cq0Ckq7yyf39ISD+Ak 0L2Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="UeP2Tf/z"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733bea7fb0sor6561755a12.3.2024.05.22.00.02.54 for (Google Transport Security); Wed, 22 May 2024 00:02:54 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVv5doEmODCpAeDFKK8avC9sOeU7WIBIV3x1/n34I63fO69IU1nW9WIk9VN+gygCjjzzdaubyIbnqpRrcY4SGy29wdfqZT9UUyrVOojqWVLreVp X-Received: by 2002:a05:6402:5158:b0:578:3358:aa02 with SMTP id 4fb4d7f45d1cf-5783358bcc6mr486064a12.2.1716361373670; Wed, 22 May 2024 00:02:53 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:53 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 06/18] package/elfutils: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:25 +0200 Message-ID: <20240522070238.3282121-7-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="UeP2Tf/z"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...lly-make-Werror-conditional-to-BUILD_WERROR.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch index 565a3c1bbb04..f35c2d48aad1 100644 --- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -1,4 +1,4 @@ -From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 +From 064b74d5e19847794072781405eafe8dfbfca331 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 29 May 2017 23:24:42 +0300 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR @@ -13,26 +13,28 @@ cc1: all warnings being treated as errors [Vincent: tweak patch for 0.166] [Bernd: rebased patch for 0.177 & 0.189] +[Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls +Signed-off-by: Dario Binacchi --- config/eu.am | 1 - 1 file changed, 1 deletion(-) diff --git a/config/eu.am b/config/eu.am -index c2cc349ce876..99b368e09060 100644 +index e6c241f9d88a..cad1baa27a5f 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ + $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- -2.17.1 +2.43.0 From patchwork Wed May 22 07:02:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3116 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6EA083F9F8 for ; Wed, 22 May 2024 09:02:58 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5729d8798a4sf450776a12.0 for ; Wed, 22 May 2024 00:02:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361378; cv=pass; d=google.com; s=arc-20160816; b=HBEdtpAjzAvJnojS6v4vfqKLelyXSkMi/9q3dv0EASzwSAyR3OBoqnKqwx+mu0Uop4 E/2D0ux3EhnlDEnC2MVFOLLaUej03Dlb27cMq49sTW1PhdRV7C8AOWARbBfmzFUPwS/P mub9vsqZslM8Kokk/bZK7Wq3FM8JliMUKtAXUE5BNfFPTmrWhPUg4HUJ3kP0Xh34zKIt aPPwGjCDADhpaYLuNRlsgPJOlegPE/zqHEIDD9pwmZB3UEUlF9PpFuGCmz6A5VHdCe/c IPgjbKvHQvSmIFax01XXB88Q3uDjF9/CSwwegzGvwKCoInCux4T6ge5bpYzQHg53Z0+Y mmcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; fh=EcjFIrzLS6ReRVobNKt7v7FRuSS8sauzZngnJgIPhK4=; b=LDTIpKA4o+fc60tJBA4meZqUGTbkd49d7nJSgNwh33AjLYVVHyukdisQQOUbnEvL3W WcFKcOWNBgqBwDHFw2sPbDKHvWIjlhB/4Kq9B8da3HSgxx0si2bqz5KWdJJgcU/uZ23g OnagafEWSy247fm/BVZ/WLiN77afc2tsm2LAVI1OQ4UzURk3etTRy+qusMhv1K/z6Seb uiMfKWTF9HT3GTw+jDUjx0rvIxZyet8+iThU2An2aT01rgBAmfYWxGeRrDvWc57bn3rS vspUYpSiSKZwhEvEFZ3KQdC/MIdmBZ0qtjOzWYbzw4rHp6KXbFi+rL4d+NabDTQ153k7 FvYg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=muWJO33+; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361378; x=1716966178; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; b=e9gJ2BYOUfaeztKHW45wOkfttSAdzbN+ywSfteuSnqEB5Dz58mPdt9npGHnFzTUsHg vS5HPUCRxGYRN5uLnZWe8hTm+dlr+Y5xLM85CFuE4r9QwHsff1gy6Ioq94KDzkPdNeui 1JfittRS0Vcaprs0JEIXmEgIGvUe3LytB0ilQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361378; x=1716966178; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hn71CiltGqhk2NdhJTm5iyIg7DgjBGLH7kbwmFG6kGA=; b=BvsFKl5lr8pDXK+NMpe7xw76vndUvCsN4nYnnkVBuyglyPRdLofEmY1q7gwWIwAdRy Bz00UM9tTfP6F9Lf0RRzpO3HtPE3gLj0Kiv2dSFIFK/sDoTFGa4tnHCtwOtRwQVumm60 pqxFCatfr+WCPHL6O/ZgQ4ewH6tt6aYGa7xGdJTejl6o86fWQQ4UJcKG/hytuDj/X0kx PaMmj03D4bNfaG52+V2Hi+OUJRiJtFi04BRMoGA6jEEgfD5rpV1cPKT8zlJOKdjMWErm 2s7St6bDDKPH5BfRL3zGRBsBPEL3+RLE3/5jPskMwqxfo0fUcbWDbxYBr1FdTxEUEVRa F+rQ== X-Forwarded-Encrypted: i=2; AJvYcCUJhKxolgw21v+Zebcosi2jXTgUre1eiHRleSCpFOgclmC3kAW10gLl+aR1chpdHD8dJFokBESqZ8BfgyDv13x4NjInqRgpcFLvQ7GPyE5lGwhk3KAAdOwD1D8+HQ== X-Gm-Message-State: AOJu0YwHPZmdtg+mr5/Om7vt2SwGJj+2LLvu3PwOaBUY9T++d1nHWZKb M9ceb08HBu/e+nPj4ZluV7buppF27OtRnXMv/U8j/+Zmhp7MnUsr58N1/bZ5F8RGTQ== X-Google-Smtp-Source: AGHT+IE2ulzaX+l0hXSVp1Ov80j8PlZwlwrPUIUgID1JpYiH7WrKJo7s7ebaKaVUwKGrj/qaWQbMKQ== X-Received: by 2002:a05:6402:26c5:b0:578:3356:e7b5 with SMTP id 4fb4d7f45d1cf-5783356ee21mr771811a12.2.1716361377883; Wed, 22 May 2024 00:02:57 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:2424:b0:572:6ddc:bb0f with SMTP id 4fb4d7f45d1cf-573332d9f22ls391031a12.1.-pod-prod-03-eu; Wed, 22 May 2024 00:02:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRRo6Xd6j532FosSimDEi2wUWV8pi9FTYdQvc8q8EOYrUs+jlOg+uIHvKZB4vgj+3kLbYuoA4O3IuitbNwn8869wSIj96RhdbaO7fd8qAluLJO X-Received: by 2002:a50:f60c:0:b0:572:9474:5959 with SMTP id 4fb4d7f45d1cf-578329a2962mr693304a12.8.1716361375872; Wed, 22 May 2024 00:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361375; cv=none; d=google.com; s=arc-20160816; b=tJAzxbLLb611DNb4ESlF8tYVQin6j7wKOEHN6+of4AscCtMDyft9DrxLRr8ps/11jM p98GbE/i2Sf7sZfZmZo1w4QYiSjCyBsOC45xl+24boqfB7HJih4PBGNGQfBPUlzTJqvo yFf+U6Jl3URqbrMh+Ru+M0YtoFvWlr39xe+6EYOkLdXlPoUH2LXn3rltI3zRT8fzXYn3 eL6gpvoHfuwj+TO0Hv1CWEpyNqUpUqQTKQpQEcXqDEWKdCCoPEjUgLVV5EbcPRaTuJHL vDwu/ghJST648s4K83xFBkiPa12uIj9NvVlbu4G3AYvA5z+Z7i9cNK4nSVU19Hv3IoHM PMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Xy4QsZm2SYUeuV6G19FalMhtlljLNyJh35rn7tGLDys=; fh=PXen9sccNYesltfJ0o7bto4K+dkvZwFy2A8TsPG4RCM=; b=HjuJQJdkBowQ1uzqPWy5CnlcHmeAz/ySAAuasYXyLh/oC1y360VveW73McUXt+cTk9 KFjt8y46i2+SemD+dpvLlcaEC+UAsHXDB8YYDI3RDsQNMgtKMsMx/rK5gTlb9cxbU9eB 1xXEsXZ5x3GFS5FiWkUGGtHHa0ZCv0kUyGfpufs/8My2S0pWCRRJmoHUpI8XYacASgv5 AqcyQkN+zrkip7YI3Eq9H64h74n0YeJwlRoUiqoelMD+s56I7K828Vz+6nbeIHYkduDg y5WAmKXkEMHlhNRiM7jmqBAx5k9qVyZH+k5guR/ZzV46ueEoW3YaJ41OevR2aL5Y0pPD 4kjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=muWJO33+; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733c2d563fsor6953073a12.12.2024.05.22.00.02.55 for (Google Transport Security); Wed, 22 May 2024 00:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWBb8VbrfpvNCMGWXiZ7U1/P9EWXU0ZdA5hgtAqc7JWW13TE75UFOUj58glDNO5VxViLTKrVEMIDo4/w4j2GWvXbkpLRWfgI643NozYFCFZvKjR X-Received: by 2002:a50:c09a:0:b0:572:6f3d:7208 with SMTP id 4fb4d7f45d1cf-57832be63eamr762700a12.29.1716361375525; Wed, 22 May 2024 00:02:55 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:55 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 07/18] package/ffmpeg: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:26 +0200 Message-ID: <20240522070238.3282121-8-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=muWJO33+; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../ffmpeg/0003-libavutil-Fix-mips-build.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index ee2d1db8bdf8..a52d7fc347b4 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -1,4 +1,4 @@ -From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001 +From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Jun 2021 08:54:53 +0200 Subject: [PATCH] libavutil: Fix mips build @@ -11,16 +11,18 @@ Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure | 2 ++ libavutil/mips/cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 6bfd98b384..773a7d516c 100755 +index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure -@@ -2191,6 +2191,7 @@ HEADERS_LIST=" +@@ -2227,6 +2227,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa - check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa + check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h +check_headers sys/auxv.h @@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 100755 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c -index 59619d54de..19196de50b 100644 +index 59619d54dee3..19196de50b59 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -19,7 +19,7 @@ @@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644 return cpu_flags_cpucfg(); else -- -2.29.2 +2.34.1 From patchwork Wed May 22 07:02:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3117 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8BDFE40F8A for ; Wed, 22 May 2024 09:02:59 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-572baf39435sf560824a12.1 for ; Wed, 22 May 2024 00:02:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361379; cv=pass; d=google.com; s=arc-20160816; b=wOTUtaJhL9ZN9F/YuMaLKLEmBJPrbYZ/jnTCDqkxQDddCxhiPgzIQXfU3j0pOff8rK opPukHc9yUOssTNyFHq/XkIFTPL6slV6t8he5N8sbxItwbg5v6PSspqq7gHoM+HQrumo W7HLJz0xcn+q78udnPPUUZY0+2DH/h0Fda5zfVC+SvW9eQnjsdsllL232mug8wocJRqd pzz/XttqOhOtunzyqTTGUWJkou2+QMJ9V9apZ+T+PQEd0/Je5rCOfsT4F0KjGcQlSxkw ve1/Swpv7kFrdmnVsG3vQ950cV0oNe3gahuN4MTqUTlj99bqBSAV/A2bgQLbHIQ496wH /hxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; fh=xX0dL/qwAFtsXKOD4amIr8Z98pesZAdBetMs23TBH6k=; b=bSkj8oBoiC9+ymrDmWmJjun+3o1/GtIcgVny0X0pTsLbQpOzF5rMs4krtQOjLP/ai9 s7wG8doG/90v0VI2MZsYDLePAZdRsmWkH/8VvTdpyFc9OB0tXZXkHfn59LZyphN+NSEY EKaBL5Dd3r4l0YZ/UOd1TG8kF87DHYYKaYQJQ0IdCCiSC7cPt/Ykk9gB3jBsQwJHfeGC FbCkHUJ1rWjMRvbHUdZ1TvO2RTeAWwt0Fpu/X4AwVBw3I/hES1PY4H6bMunNt36i5iOd QlN4ZzihFciBArL+yGCTni6XPT/D0E6118qFkwqNTsgqyCrtMCTu/wumg5eCk62jxwEb lL7g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AiQAM6I5; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361379; x=1716966179; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; b=AeJEmZoyBFU7nkOmzHWYMxZ2FcQ9aPIonRnAoo2RsgSrDmN5pXvbNuMzuzcqhtiTXn +0GKzyFOb65YSEnHsA2pmNMPUb7d14uKOd+EuzncC1GievFaUPl+szXD1dmJ8uQ0g6uK 5W8rQcmnCTgstWkLLKDu/ckbo9pzgZixACMHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361379; x=1716966179; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; b=XNjyAPn0dmWz9REii2l4HW6u0N1uXml+07bxPW4u+qP9YrZoRC0erkSOZVkVtOoLI5 dA9nxpVxeJWxb4KbSVgFph3a9GtexiI8eaQaWPPwiu2JbeVPT4Vaceb3FJp/AolLkWZF 4lHir98dZ3wYR3x7+d8ZoKNrvVKWjUBP6gZb1caqW4rn2lnAXy2YJNa6lEW0JuwXcrU4 lpTb9UouWBVk0Sb6pNAc2zC9tNLcCbLO6vKZk3m9SzFb1ksXbVwZNjXi8lxoYl+gNpGx 4tZcGl6wDMELP/hfUiYwzXPGVi76GSQRFQ4PKjVpTh7ipujxm5JYKUR7dIso/2UCLZ6C 0Zdw== X-Forwarded-Encrypted: i=2; AJvYcCUqzOvgNfbffjfnC+NoXHA/gVgScfBAQZNouPh+9aa60sBo2dvALWwHbFYZepIZk3h1q3++DnuPyF6IMQYzDilqz+B5BHZQqVtf2RDnA4Y+27vMrkcfJ2gwSeaZ3Q== X-Gm-Message-State: AOJu0YxsEusjn6xFwQIkP0LFN5kMf8KKs+p7W56WrZH2MYq+GIqF2P/O QFW8uB3w70HXhQKm8Xv1gSHJmcbaVzB8LMzlal6bh71dM6q6/uzg8ozTAbEuwgo15avQMAjXiQ= = X-Google-Smtp-Source: AGHT+IHHPI45KsLCAfdSdx6n8H7kmWtoxmf2S0zmkwRdc6O4kx17GaRWCIc0xT8ThxcOeTuNczGVTw== X-Received: by 2002:a50:8d11:0:b0:574:ebf6:e37b with SMTP id 4fb4d7f45d1cf-5752b4748e1mr9576552a12.12.1716361379196; Wed, 22 May 2024 00:02:59 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399505a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:02:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpHvn9ebm5IhKIDJWJq3+bUmlSd+Qn9wNdz0XxpZSL9LaL0/tMDC2il872yrNZQTN/OnUM8zZvqfYRItUjy5+ub4Ayz3dUmzVtrW4if9CL3SdV X-Received: by 2002:a50:8d5e:0:b0:572:2fdf:b965 with SMTP id 4fb4d7f45d1cf-5752b432b79mr10831486a12.7.1716361377498; Wed, 22 May 2024 00:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361377; cv=none; d=google.com; s=arc-20160816; b=XiB7uG2vLeZMaVOTzbNHSh4IdTi1RA3tqBt6ezqDXsHj4nSBjRkODklQPP9saxVOfy 1YyKdvE/GEmhAbW9GrYandfsbExArUgEbWa+sY1v0wGRb7LGIbfpAXBUdwmTDk1PFXel Cmc2qirS37Nod2jgHaNLgUEeX7iP2CK3K3MjFOvMZbTn6x6neOTHD10TeEfn6lAnumVu ROgo5sByFFIjJk5aks/jhrNwWZj2fnIUwe1vQWH8OxqnvDyrKTIgTxzlcrI+ck1ynTmm RSDfPM9JHtvm/doPLtZDrD0AN23sw5KqDMcpy3uYIoQbagBGkFyPbFnftZMh+CQbTK+F cn3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OHcUaBiXvjNpQjCcFcxDYSeACdn61ui6MlAbPKkbqrE=; fh=7gJjabwGg/GarOZdfA9jN0xxUCC6mAI6m3IdjgrNkHs=; b=gms6KUYY/J6/DLKrZEU7VhcWu6GahgczmlGWnF8ycRV8UPkaJAHcOMMLDlVb9aTXJZ /wGdTPS/YdlF6rAKXLzfpQ6QBt86/TfVcD+k50gPCV7o3LeZNy4WD+mtQ8fBX6goQZ9T m7i8W5KxO0pFsuSOI0Hh09ReGbGUDmV8tqbxeg79BUC1kEs8xn5qaqUptGMhTpavI/uf xS+F/bo3rhpbJGfdXVFFi6zQjaIaH9em+9qcwulCxbu42PA5OmQX04RdXvilOw61xRIx M6+sKbP2qcCiVUDwX8m7yQvwL9NdqlX+eZxNTf0mgorBTaqpQ4fG7pnidCLZ49iN35Cr iYTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AiQAM6I5; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574ebfeaf6fsor6200414a12.5.2024.05.22.00.02.57 for (Google Transport Security); Wed, 22 May 2024 00:02:57 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWK0YPHXO83vHgOFWEGbwjybdTMUNDBOAxarsswIJmAXCXCTXIl8ipA8mBPytuZG9FyiMziOUO1MMbfcUT31HiPJ076lTmt1eYOKObnf0+yIAM3 X-Received: by 2002:a05:6402:22b9:b0:578:23a4:3c2a with SMTP id 4fb4d7f45d1cf-57823a43c5dmr3297217a12.0.1716361377180; Wed, 22 May 2024 00:02:57 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:56 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 08/18] package/giflib: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:27 +0200 Message-ID: <20240522070238.3282121-9-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AiQAM6I5; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...dd-targets-to-manage-static-building.patch | 18 +++++++++-------- ...veral-defects-found-by-Coverity-scan.patch | 20 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index ba8d426bea11..31d7542e60c9 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -1,4 +1,4 @@ -From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001 +From 409af8210f2256eed4d2c73083aa75975f03424b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Jul 2019 12:20:38 +0200 Subject: [PATCH] Makefile: add targets to manage static building @@ -8,16 +8,18 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index b2bf6de..111f52f 100644 +index 87966a96cd4f..4a93aace54b8 100644 --- a/Makefile +++ b/Makefile -@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) +@@ -87,13 +87,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) endif @@ -40,7 +42,7 @@ index b2bf6de..111f52f 100644 $(LIBGIFSO): $(OBJECTS) $(HEADERS) ifeq ($(UNAME), Darwin) -@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) +@@ -116,7 +123,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: @@ -48,8 +50,8 @@ index b2bf6de..111f52f 100644 + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o rm -f $(LIBGIFSOVER) rm -f $(LIBGIFSOMAJOR) - rm -fr doc/*.[17] *.html doc/staging -@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) + rm -fr doc/*.1 *.html doc/staging +@@ -141,12 +148,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -64,8 +66,8 @@ index b2bf6de..111f52f 100644 ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" - $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" -- 2.43.0 diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch index f6816d07530a..77f21b402e95 100644 --- a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -1,4 +1,4 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From 7c3bce4add77944e5b479ef5da81ae7fd71a7e95 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 5 Dec 2023 16:38:48 -0700 Subject: [PATCH] Fix several defects found by Coverity scan @@ -10,15 +10,17 @@ Signed-off-by: Sandro Mani Signed-off-by: Adam Duskett [Fabrice: updated for 5.2.2] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + gif2rgb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 +index d51226d65d3d..50c43ae44ee2 100644 --- a/gif2rgb.c +++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, /* Open stdout for the output file: */ if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { PrintGifError(Error); @@ -27,8 +29,8 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == +@@ -173,6 +175,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == GIF_ERROR) { PrintGifError(Error); + free(OutputBuffer); @@ -36,7 +38,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -182,6 +186,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, for (i = 0; i < Height; i++) { if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { @@ -45,7 +47,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } GifQprintf("\b\b\b\b%-4d", Height - i - 1); -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -191,6 +197,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { PrintGifError(Error); From patchwork Wed May 22 07:02:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3118 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 606833F9F8 for ; Wed, 22 May 2024 09:03:01 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-574f2799c18sf285620a12.0 for ; Wed, 22 May 2024 00:03:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361381; cv=pass; d=google.com; s=arc-20160816; b=SpTkqbZS9uDWe2LVKgIse5W0wGWiLhzOWrj9eeu/YXNiCty2vdqylGhW080UUWu5AX TyvCXk1VmwEuj1cLgASCTcys5VVpVX/VjtLqSYmD9j/5tw0ctkJRlraiKHghEYUMFz22 H3zHNkt69w+JUT3Ew5z4ZWW8l4Tl6mMRjc6fcUuTY9/wCTZledIgdej1WSGYP0YjaFTz GySBziTPhPbscQoB7lVJt0aWQH5QqWCFG9vqqsHJ4/UeaJ36Ek+XZGLjmfT8EcT7ttqD BRqYPOVDn54RhcXsMSqd5EyMaMbrnkTI/7ucGbTSAOLs9/Xcq28mlPSdMeuUxXnjkMKJ +7MQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tDIZd+2jgygs6NKQp/SdHV9VqnzDziP6cL+MSXmjJNQ=; fh=XFLjm3PaQQjbdHvylUTp3fP4VpQPsF14qkIRj7uref8=; b=NBTSLyYPg8paM+qOLCyTbjOw8L/uzOLnxhLSBA/93sGsyLw3rB8ls6f2FFW+q1amCF b2+elAFqJrdhxnX6zwbLQM3VvzP0QJQctFJA3GF/SkNrr4DDEroGqnBZWfGLeyowzGkn Tot7LkFO6MBpnMSMDhc1PCMqCGpVV7Ua3k0uVIcglq1O6FXgUIFMgU6OZPS1mqG3qE22 z9gWjPYpxsWkoDYnTkir3G2QNccryXA99uegyWKlkkHUy2PV2bA+DEQkDyk8pURWmz1v WqADFrn7K2kP8YIDh9SWmZkVcjShDEociXSdOfcJpwLi/47OyqcrY+UqGZUwUlv0XZO9 Qu9w==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PplqJhBD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361381; x=1716966181; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tDIZd+2jgygs6NKQp/SdHV9VqnzDziP6cL+MSXmjJNQ=; b=ZrmCrC1knP6iR1xFKxuZLOSNahM2/8KB/TC98GUCnQu6uR3f+5tB3S+CDKJiZg/vZn nL5U/pu+4H8somTw+FcP142/Jz/NStOUmvWlzH/KGWJ1ZZ289z6z8eUE5dXSQDTNGgIg icsd6A5+mojnhWx7gQ378D91uHp/CJGjnkBU8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361381; x=1716966181; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tDIZd+2jgygs6NKQp/SdHV9VqnzDziP6cL+MSXmjJNQ=; b=WCHlN3oWV320k0hg+mQ+YnxweNBT+W63IF9MWIAxjsZUlb9IUnKzX6eeIvtNbzQ4al cHr0glWjJ0UNTdmmMvJl+8GNaZbon0K/2M4d57JVQWRoqfyb37aHU21cfpFls551U4mO YEYbCVjOn8fo+0H07824DRWGSDLOuXR22/1lCJ69tkUJJyk2ZRDbMNJI6oQl2xmT1pVD Vzu4535R8braJcSBO1r8HY3P0UIP/a/5bh6gn4HFeEKbdGuX9IR88T5C1DgstzN8d/ZT yJnNjhm05SVonxLumGMy4VneG50QB3fW0diU2e9xVmto1yNnUiafw2y+hU7M7K0Kx0Mn NR/Q== X-Forwarded-Encrypted: i=2; AJvYcCW+XtWzEFTTE/3jp/ph7ArKagIQT4Bfdsnf13Vv0/ddgu4IEcWHSE014/r27v/8S3miCeEnqMx6LpsjhcgnGWG3pVATB8fDNFqxx3DzHNMMq26UqewvpRIK58W46w== X-Gm-Message-State: AOJu0YywnwjpiD3kfcIMbnf/fJwJ78UdL0gseKgeoZCE7PjtrHmMCJli 2lQuPjV+qMtTQnBPaGOKB9oBTMuF/4QxoiDFrTmO1foUq56lgKmq70pkgcQsc1fU4g== X-Google-Smtp-Source: AGHT+IFE8hanVDRaM9rn1iMDAgVfDrT5MOgHuuOgliQLORDOTGo06Z1WckI5HnZcWWeRhQ5y1Q/f5A== X-Received: by 2002:a50:c049:0:b0:574:ecc4:6b4e with SMTP id 4fb4d7f45d1cf-57832a4ca84mr803155a12.18.1716361381073; Wed, 22 May 2024 00:03:01 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:320f:b0:578:3499:fc12 with SMTP id 4fb4d7f45d1cf-5783499fcdals53931a12.2.-pod-prod-05-eu; Wed, 22 May 2024 00:02:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfZnBBjWYVLyrSLOzQYc6HpNlPq8892FczuhfjXSWMiGO84S1HxZbB9NPNk6VEDdRunLO6t7auwEUJDBxJ6mrm3rTpivBgC1BUNU1OZNm2YpI4 X-Received: by 2002:a50:9302:0:b0:572:9dc3:ce38 with SMTP id 4fb4d7f45d1cf-57832a81350mr763201a12.19.1716361379217; Wed, 22 May 2024 00:02:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361379; cv=none; d=google.com; s=arc-20160816; b=j/u5PMVnUTL/kIytIaU0iZOGKVQuYTcewWxfXQNmElHIIpJSFT+f/JETZsU3sNOpoc nO6VyW/dIZibihEgqr2050clPixjLFb2ohX1j+qoiiyJlEd3z1jIIIYcPSydFyUi7DnV DyylqQUpZdig4UeeO0oRiitay0l20g5MwZ2/3En4nYHfjQRN37R14hRjfTUnzFHIQI3e r2R3P+ImMwFuPt0guXGzBQIyL03H8Wvy1uXCDXR21g+VGXS7ElBgNX/3ZHxwv/LT6+gZ hkz845zFruR7GwdCXhFt9QnD8CnwRhToYEfThZJgIB14DdvvLwzLayq5Ng0BsUZaUb1G 0aQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=utvnmglmgmSzdarlYtYnxejlDZopVmdJkuJT1/OqgMQ=; fh=QRtjAassVkOGaDY/3Ttfe5vN4okaSdbvNlKcdySTweQ=; b=OJpjpBczqD4mms+sNXkXtGaoaP7ICGTJdRnsE6bUd8zh/eyOLjQqe4Pl9apkjLRvXk TcpyUb+akurlGgdV2iXmwmLzVR+EWr4IjQZkDwm3VWVb18EPExrOlKGg48cymAZJPOBD 4dYqB1AqPjP9TZ57XvXKU4vxrAWyirH06qPLHgFcSLlodNC8RHigAyqg2pvxTrnowdhA lNYfDZRNpZxuZ/iDQaEW0m3d2cv6vbiT1pkcq1NIrMj5HgAX35qRJV0xI9+dYNj3WnJo ZstT0Vi6hFhrOghI4khI8tUJmi0GsFHLtpBC4GL554IzeVmId7QbDE5PU0Nnmq4Vz+hX gBKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PplqJhBD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733c2cdd1asor3318047a12.11.2024.05.22.00.02.59 for (Google Transport Security); Wed, 22 May 2024 00:02:59 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVw4eoHLbT4XvMbjpv3EhoYtCvWHLxOrOxoNxnu+v7SWMrwUziFv3i5REqRqfvdc2IhBg4e6jXkWrrqeYTxXDoZqH4ckrQW4nVYJ6l38716WW3D X-Received: by 2002:a05:6402:358b:b0:578:3420:4ed6 with SMTP id 4fb4d7f45d1cf-578342052d6mr715397a12.1.1716361378773; Wed, 22 May 2024 00:02:58 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:58 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 09/18] package/libabseil-cpp: update the patch to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:28 +0200 Message-ID: <20240522070238.3282121-10-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PplqJhBD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../0001-force-position-independent-code.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libabseil-cpp/0001-force-position-independent-code.patch b/package/libabseil-cpp/0001-force-position-independent-code.patch index 6bf46bf0cb1b..a6ca9c0f0e9e 100644 --- a/package/libabseil-cpp/0001-force-position-independent-code.patch +++ b/package/libabseil-cpp/0001-force-position-independent-code.patch @@ -1,4 +1,4 @@ -From d170b19e500d85381369e379771be8d7816bcc92 Mon Sep 17 00:00:00 2001 +From 832765d12879fabf799dd80af6e8fee9cd298934 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 21 Jul 2020 13:08:50 -0700 Subject: [PATCH] force position independent code @@ -16,17 +16,19 @@ cause relocation errors when shared libraries link against the built static libraries. Signed-off-by: Adam Duskett +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- CMake/AbseilHelpers.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 86ff9eb..bdb7a89 100644 +index 3bd33ce8718d..7f269bd20c21 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -209,6 +209,8 @@ function(absl_cc_library) - set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) - set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) +@@ -292,6 +292,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") + target_compile_features(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE}) + endif() + # Without this setting, other programs such as GRPC will fail when linking. + set_property(TARGET ${_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -34,5 +36,5 @@ index 86ff9eb..bdb7a89 100644 # to have properly named lib files. This is a no-op when we are not being # installed. -- -2.26.2 +2.43.0 From patchwork Wed May 22 07:02:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3119 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id CA5BB3F9F8 for ; Wed, 22 May 2024 09:03:03 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57824f3e6absf519085a12.1 for ; Wed, 22 May 2024 00:03:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361383; cv=pass; d=google.com; s=arc-20160816; b=qXrplUE8is8PQde3o/SsIvdAUKrqMqgr6aC6w3BnXxJDQA1pnMi5RbVhS1teUETMPu n0cmjMI0aA0ydw4u7zyg8FEzFFTRN8JXxtQ3oI98/egMko3Ysj2DByBsVGflcnESKg7G K//g/23yQFb6Ir4ZuU5Os2pqUx438myalval1/joSvfUJG98mdjFRaH9dvXkgSNi7sDS zQ8pQbM6OEd/VRGcKjB5bno22CjU5oTd0wIkDphz7cLZjM24etb2QI13/j7rQ8J4gFUC gEQKtcyABqWiRX/e/ZAYb+0K5DCtqtrE028lYFfb7Gu+/BpqBaRSKSU8RlopIvavEkH6 MNXw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; fh=D5NAzZlbUAFjW9wm+oXDpjZwUK7nZOXxnBKT9ubWyNY=; b=NMOwEnjt1QCd1kD6jpSq2WSIDj3ZalNLFm4Oit34QEyQcIvcMIgAf7X9meACWeg9wo qNzhko1tZ4o3yQnZ5XfcYFyGqfWxPbXTDFOFp2nwis26b1pOPvhEYDN2wxlOBOjETvSA 9L44FNChMOLxBzpKXGxwQNjq1V+YrEncuu2+3zfMla4KLbzVTrC1gJwDzAnbbzADWKiF dzlCg002pFUkx/Agxs4rV6v15C1YO2VkbYubztEaZwPX0gAmSMUAHMe44h2XgyVfiLnr x9nIB7hx7s8o75SkfCN5xvGy8gzJJE/rMTLaSpGryuYxkAxCAzE44iBulZ+iGLEONopA ZL4g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361383; x=1716966183; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; b=r5oBEnSqYip5uYaLPPTOUqYnS1RdNNpmZeoqr15pZmSqjM0Tw0IgSkCsrv+cZn5uX1 chSZ3ExTtzdd+FwsfivYLmdKoihQPbRo0rnbzuoB5LxflLvd8dMRTL6W6QtY6ySa2M0F NSmzp0/sk8u3+5nor1g2UhuptjauSjxed17vY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361383; x=1716966183; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; b=EoqVe5TFC0XBZTeP6wk8IRbFsKOy4Pl8ADQAIq5yJJDww9FcdlpJXXlLENq/GW6t7s +nKu/9AcMf+4yCb75+Gwl9tnpxegKTrilct4RncGE6PuKCr34GHd19uth8Tdy7sYfgin ORVHsFurWCkBhRFWjota8q6ExL1GMUSOGwlAXHXoF8SmwfazRO0ax/CVFtSun9v4byHY HkYJcGV4IGzMGcav3oZscVlqJXlZiGY3arjtuAeQgOe6T4G1pcVQZzo/xfhf3jnWRp14 wjPlxhInROxyqdA0pskY+cpbv5hc9laY9UpTEdhpOBM8y2hhbRTG1QmOtdQu4nri8vC9 Txzg== X-Forwarded-Encrypted: i=2; AJvYcCW/tQfTomUlX9+B8Ac0NPrbH2MGt/hq8/ucVkcKPLGzArbhQddEqtGU0ZrruKrtv82pEYdFdIo4AFTYzGCsG9YTgMZ/QSmSBbQbzADgx0ZZhwU4o1qX2v7on2n5ow== X-Gm-Message-State: AOJu0YwfsQ8OxsYDOgPaA1ZNNlcoviXggUogS06WbERGiI4AhvaBNjaQ yQnv8fglDnBIzH9eCaHp+oG0Ya2oGGGPlrRvSOaGQUayzjdd6x8yHzw+bD6taoLGOA== X-Google-Smtp-Source: AGHT+IExMIX7MS+AWWAeX1LCnUGH7Srz78b6Xv+rX4Inc3ddAg3CaoZR1tGrCqb2IWEJEhG7nvmLqQ== X-Received: by 2002:a50:bb0e:0:b0:574:f38a:289 with SMTP id 4fb4d7f45d1cf-57831180cd6mr800062a12.20.1716361382880; Wed, 22 May 2024 00:03:02 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399599a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:03:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvA6etZlRHxKVFE8kt2F9XmYo39E2idzxeT57tSFT1B3Ls4oGjQBfbLO7XW8zbrKpF0XIUS8+aFP6wMCI+kq4v2BVg0MAIQDCf1D7QwNMjNO2n X-Received: by 2002:a50:d54c:0:b0:572:3b3c:754f with SMTP id 4fb4d7f45d1cf-57830ffcf17mr1040568a12.4.1716361381318; Wed, 22 May 2024 00:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361381; cv=none; d=google.com; s=arc-20160816; b=IxUi/R0khbzcrQW002psDXnaVXe62gU0RqLfZ6DTauNDGG+IqviPzx+n9xIWWVZi7Y hL9rL7qRwMS6cYFleWpb0GtVKR4zQ2ZBUvG7J6rkjgNpnB18nPgGlzGIeAJpwTA6OHF+ baNYpkgswSEEmKyNedq4HAvSnMxQfoiND7uDvZlKhI7Kh1yohQgUb0aHp9J2boF0YjkW KH0wxOeFIJVnUCHciMJ5tZDoJ3D5vy/kjwpqnwZQ7zAtE2WflSWyQLVyg47r/fFD6dUc afWFXeLEIrXiJE4gKp9VLF4o3ZGnYYjyVyL4Tw3YG4MdAwFwDU2Sj1xIFMRpd4Hwc+VR kXxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rs0p4Tth8J3OSee/3C0gBi/pc/ucbnya7jKIqqamahw=; fh=A0YAPWOD3lX6nEInbqQjE47xr51aU/Kq+lNOfSVO9bI=; b=bhxn5ii664VFVxewkXuBD7TJnI6GXeJMsa7ni+96or2HlePIXBwI9FL//nIsrZW1zj r1uWB1xScY+Fyu7sBC4zUVK77I3IfmOelCZ6QlzLo8Lc0sF0MkyRSxIUqwYqQDLh7xQr grvJO4VXeZaYGUnD5li8w0UaznYDq/m/0WLF3lg2fL6apfraO+6xICY07WOPjrCrUICg VXWzgr5dkVrZaNNp1rYgJPTKua6C5bepf1/EGG+WnQPLAwqd3Y2HATLdKcCD8oqrKU4i F0tolspzdvYbwX/df15osqFAd8ZaNaAMrMR/wgZct3mXKjxONDIbVFc3HY5icjkkO+8R jQVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733bb3c2f9sor11505682a12.4.2024.05.22.00.03.01 for (Google Transport Security); Wed, 22 May 2024 00:03:01 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWjnyRfkEIKerzpzMFzIfNRkAQbk6Npp0K3jG65mWjQ5KKDZeQr3c2FTwgm9s2sUXtjrwaxPHU8qwxqjHkLB/JzwGk4xHpG/d7LnrDtfpyWZFIV X-Received: by 2002:a50:954e:0:b0:574:f83d:b282 with SMTP id 4fb4d7f45d1cf-5752b3f847cmr10534532a12.2.1716361380413; Wed, 22 May 2024 00:03:00 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:00 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 10/18] package/libglib2: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:29 +0200 Message-ID: <20240522070238.3282121-11-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...dd-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index fb9905724278..8f87671167f0 100644 --- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -1,4 +1,4 @@ -From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001 +From 03e9cae3f3a7e2bbd5110f1ce2739601571bc024 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 18:01:05 +0100 Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc @@ -14,6 +14,8 @@ Fixes: - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: Never submitted --- gio/meson.build | 1 + @@ -21,22 +23,22 @@ Upstream: Never submitted 2 files changed, 2 insertions(+) diff --git a/gio/meson.build b/gio/meson.build -index 29473d26b..112d4ada9 100644 +index 462606f3b56c..e6b736167b8d 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -841,6 +841,7 @@ pkg.generate(libgio, +@@ -880,6 +880,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), + 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build -index f78f32969..6c5486699 100644 +index da76fc005e46..cde2edb197c7 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -384,6 +384,7 @@ pkg.generate(libglib, +@@ -441,6 +441,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -45,5 +47,5 @@ index f78f32969..6c5486699 100644 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -- -2.33.0 +2.43.0 From patchwork Wed May 22 07:02:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3120 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 43C7640F8A for ; Wed, 22 May 2024 09:03:04 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-57824f3e6absf519091a12.1 for ; Wed, 22 May 2024 00:03:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361384; cv=pass; d=google.com; s=arc-20160816; b=Mbw8FWk0CckjBSNG9gQMn/YoVjX7yMIoHxzhj/vg7LJKoigl+tXaoFisPyBS2wyAMb 18CA4idTGA+rxg0GNns75P//Mk33GNT6JYtPTn0QDXcNjvnYGPpnpdBEeMx9YjgoI+Zb bNRdkj+tdWq01qE7/g1/dKQYEruJopL393R2gE570dqoImuzkVnBfNpJZ4GJv+TXn2ga 4NQMpdUD4BAnpIxfa0Q5khqf01IkrZ8utWhPPMNKen98cL4eeJT4JSvzAfOWMrMaikun STWCjnhZ2GXThyv+vU9c5LCD+7WgbAlw0Bu5D3788FHHgWLaQhVUNNcY0K5tDeMOGV/5 zdtQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=oVVPYjGC7B0Ek59k1CRCgYwwplbsF4csQIxbHpLZKcs=; fh=8jlgK+zvRK6wBTAYXK/qHL6SjHNXox0oeimxZfE2L5k=; b=a74bKN/slEpQDr/3qKUMxrz7TVULh9QI0ggDSJQn1biJnZshrKYCfenRI/4mLKxXrL T0Tddmo60FCD4Qlcr5yLjsRWJ1H8BVbuX+4sprU2EgRQ09XqJRVlwWFLJbs9dyzaRTw9 tFub+1YBWnB4C7uYzkctHiuHamqdPNHQh0t5b8m4j8L+wrR2ao98I6TafNxJcujYbY0s vKYGbUecUCwIwmEZ0xJsHAeYsCgOgqumvgvYoW7l+RaFS2TTReg70fEa03BJLDJS99Es gpDnF21POZrR0/lXv8vEU0S4WX8Y9ni9p96qXyhmWr6GSY9ND/i2Ahrhc08N8tRnzfPw dIBQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mDKwsQYr; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361384; x=1716966184; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=oVVPYjGC7B0Ek59k1CRCgYwwplbsF4csQIxbHpLZKcs=; b=EqGKPOyM5daamOPI5YKMLH7Nfa22h8TOiXrTVcG8cw8qC0fp6bJW1m7rtgqc3F3yJK pVEprzI84mW/tAKO2jPNas6es0+w3F93+faskm960a8rWwwmpJEmOHAUCGkPmvXJRu7k sZ0nlPl1/efBbnQrkABH2IwgRdWzVWrkTc5No= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361384; x=1716966184; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oVVPYjGC7B0Ek59k1CRCgYwwplbsF4csQIxbHpLZKcs=; b=WJhK2rRMLMfC4qulHSYDGj+KJWu8I2CDzmw5F/c5duG7UH6d/LZtf7bFwfD1Y2hz9P NBWK5aonodybh1eT6LxbySYJ9ROWqoECsicUIB9vAJmid8S37WJiS0l4Z5yicbXOQlkP PeGZya69bNaGp922MVD0M0zbIDRPbD4KaiAigN6ilqSl8nK/uE/QgpPdjhvpEiB1vqUI YkQbyu/XBqAfHDkwFoo/Z7zsAZLk6nLDEMW8vtwEi7oZEtoCdMnjVGUz6EHlm5cR/RWD eFAcXbCc0xiREkMhbfzZNQrKqG/vOpehsA/PRp4xnKo+Rbfo7fJA65oHS3/j8b2mqqWi bXMw== X-Forwarded-Encrypted: i=2; AJvYcCW5sOtUq9vhBooOj/rZzsoA0DE6M98T8VGm330aNh1ISjtxTB3/7P2zNHKJyDdL9CSWh1TlCsobfr0UVroPCQ8xP5CYnI1yhWbBO1QhSqf6F9rUVdFcpNR5LNpNyw== X-Gm-Message-State: AOJu0YwOEXY2GLD6OIBZMYQodkwLn7qHDGB2nF1CxbRZVnLR4Zq40u/V XK1T2cMt3np8W5tQM1XsVUuPdMLkzaZWe/uUCVWwpsFDA+7y2fIXKp+xxeKN/5Ih1w== X-Google-Smtp-Source: AGHT+IHhjvOYni0hLBKMHWfk0QWTf8HBzfWxFEOe0tCxSrSgk0kjEfQuFH35EcZcq3XgMG7oyF4Gfg== X-Received: by 2002:a50:ccd9:0:b0:574:ecf3:f7d1 with SMTP id 4fb4d7f45d1cf-57830ce38e3mr1116379a12.0.1716361384069; Wed, 22 May 2024 00:03:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:3710:b0:574:f706:7c59 with SMTP id 4fb4d7f45d1cf-57831b56d0els198344a12.1.-pod-prod-00-eu; Wed, 22 May 2024 00:03:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFbPCIibN643b3DwtN3zrpzaRUEpJAGML7nnonuRwhEks7yvMQnzhFi4sdQQ9JTLOgXmww85OdigtzODDFiQso1hWn7fDKEo5ymn2NHe6A5Mjh X-Received: by 2002:a50:cd19:0:b0:572:a049:c797 with SMTP id 4fb4d7f45d1cf-5783107a1bfmr961139a12.12.1716361382393; Wed, 22 May 2024 00:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361382; cv=none; d=google.com; s=arc-20160816; b=CSYND0EfkjR7cFU4b6hMQGloNf36xIxHtQKuRIIy1nw7J6CIFLYX+ZY8mzyjohXrMv i+ZnHIJnKqKZwGOqwVpfTtEL8QvhE4W0XNWrB89Ek6xKK84cnym4Kxz63qhtTn94DLZF tI5r5LI40g/fcP/1FwLLdOk6fU18aApmDZIs71P5xVduem43R+n8nZKfL/3+AifBHQTu RxWfc2caPYfOgiP36AgSAQFmhEZKcHvRFm8+Vjl/CMovF1AkcBVnNFI3nCKF+RdNBTkE pw/MvwWXcTbkq53EowBtpsctL5ZHc0xPiRkEqIKow86rgE3b1ZFWBi/yuDuC9obj+6ig BJqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Knzh50U2AgYswLEttwi3n/maA4bbST6NeArnVRxdWHw=; fh=r7Ez8KsFl1Dve281Ei3B1CvuPUxuM9adKcbLPzh1uwA=; b=S43etdxfa/CC2X6X/eT3G5ybBGeBiR5r/92NxhmLdiUHMd5O1lOT9c0GsbHimd9265 7NVj9ZjdZwRLzMxyc0HNkNiINZc4qk+81SxMsfAzvF7J2I+nxEuUjhJ1sQ72HofPyyY8 ZmCKAj7NQuTGtbYpLAlujTc/tBUQG0nQJcQ3GkqoSpkviFYDm7ny6Wem80uOhV+sLGau hVr56QaHPOey8s5S03R+WZSZm0jcFf+jwWJ1bRw9aXzamEVJa9HpOGNhrlU3WgSoauw1 e3MQAS5spnRjWTB4bfCrtiOngTcLt6CfE2FMjAoxbJBQ1URLawbDt/DbpWNx1ebeC3dV qk1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mDKwsQYr; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733ba9635esor11559039a12.1.2024.05.22.00.03.02 for (Google Transport Security); Wed, 22 May 2024 00:03:02 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCV1YbIrKYHnzoijZtt2RK6b2ttpXRmPoKhsOn1PwaGfGjoWG5gGoA4KV+3V8cuaSHFlJ5NoZIg2YRth21phKQmz1G6gZwJ8kvwMTWb4Wj80syie X-Received: by 2002:a50:9f45:0:b0:56b:d013:a67e with SMTP id 4fb4d7f45d1cf-5783117a404mr1003518a12.18.1716361382083; Wed, 22 May 2024 00:03:02 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:01 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 11/18] package/libnl: update the patch to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:30 +0200 Message-ID: <20240522070238.3282121-12-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mDKwsQYr; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch index 57d1c8747dea..4c833cfb22bc 100644 --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch @@ -1,4 +1,4 @@ -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001 +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Mar 2017 08:52:20 +0200 Subject: [PATCH] Add musl workaround to the libc-compat.h copy @@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch. Signed-off-by: Baruch Siach ---- -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper -musl fix must go to the kernel first. +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- include/linux-private/linux/libc-compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h -index 9bed5b6ae4d9..e2562a819464 100644 +index a1599911e7a9..f6df7193b8b4 100644 --- a/include/linux-private/linux/libc-compat.h +++ b/include/linux-private/linux/libc-compat.h -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ -#if defined(__GLIBC__) +#if 1 - /* Coordinate with glibc netinet/in.h header. */ - #if defined(_NETINET_IN_H) + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) -- -2.11.0 +2.43.0 From patchwork Wed May 22 07:02:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3121 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8C8693F9F8 for ; Wed, 22 May 2024 09:03:07 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-574ebea4810sf721323a12.0 for ; Wed, 22 May 2024 00:03:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361387; cv=pass; d=google.com; s=arc-20160816; b=pAmHQEpu/+rgMRcLcjxSW2eiD8m3M4Jqw0dUADt0YlDy/PMNZXpI50WrcBQqvmhkNw nef1HxpWTSEIP8St+OC0XwGMbnpbj/EPoNvY2a8muoOrom+zbdveDSkIBFcuEM0Y5C2O gF3flDc/DG0/8YF+Dbq3EKeZNNnOxMd6rxI2V1g1UZfhnkAgJOpZ2Fj3QK44XIBOMfgO 9i+jNq2hWAKSf0QftEp1G7+nYADkaDvGEXV5IR9DhjfnbOTb80agyPU+9LPsLRJXv6gR BQyGhYzJAXR2DpO44u8gxwRsW6MUWl/FPSk29KKVWPR/e277kG5cjBUTAm+GjmZTdLC4 7KRA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; fh=C5uVPTSb4KXGbcfgDGCezeen5apvleb0eYUaRmwSMJ0=; b=wfp6K+sXCjvNz6BViMN4jcdPpceY66rfnvYqeEBTltPIH+Sc2U9hXlZMorY5iaV14l d+rRWCaDoNyBXZfH4/yy/hQy3zFJsQ2pP46fgUQJQNCWLQj0MqG9XQt6ADPfNGs2PdfU V8SLWGzmpz2UFmhTpvzqaq/+Kjxx7XRc0m17bXDiOoFyjjME8XbIjO0VvSLdS+cSxxfd ohoTg0reoFkXRkHs5cwIOhh6TRiEzJc6klCayY4zb37TcPpPHRfO/MyCQa4bmSm4WK5c 7Rwsk27e9yDolqqe1exRtUvniX6dvYhoNwvlyaxdD9cBIhexGPp6AlHRiLWs/yuuBeTn +vcg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUX3oFS7; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361387; x=1716966187; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; b=CYcauwDVbc/Vw0tA2EG/OkhE0eEaBbzW7nhwl0TPDDXUWQfb3yfr0XKoBN7Q2fAwAX 5XQs6ppDKekrhOVCtNlEMV1IJGPvJ5kHkdvv5IiXlmRXQu3lDrJs12e6UzTEBK5YSBm0 dDo0touvsTlMmTusV8491TK5VO2MGQyUOLocU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361387; x=1716966187; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; b=QmE/pfVgbtJyats5fS94tiLgfepGekrW6yFMRGFcO9I9kvnNUrvIRhY/cuEvG5fkxS 4SrvQs2z6eOc4V+yc7qohFpQ+KFpmA98JDUceLsI37u1OEd1aRbBOu9lzj4BHOlaewEQ 3QeaGsZtXjgX3CV+UNMCAVyNMsEGPTzZjlxQt1grBkK5d89oX16xcy8nvXHmjCpMXNmI Qj45w+d2fgYwpzXfCsukPtEWlemFuWsc/yClJ++0E37/vxItLYUjm47w62YStTrQr7kJ TyIbgvBwPDppoBvR3IubFwK8fYDqXfNknPfEUFGzczVq/Qs0CG4vc5DETYOh5oJ9137f pC8g== X-Forwarded-Encrypted: i=2; AJvYcCVCV3Zs8qgAg9r89sFjZ5bDaiMWD2mKVOpOwHkHEVGwrAiS60yIEXSlt98cuQVqu/aVEmKfbhauPn4EPsRyeAsUA69qRqppaPNP37sJwO3ROXIGKck4r2TUx5emdQ== X-Gm-Message-State: AOJu0YxtCc+eDbJ6+MtU54KgFrAn600Y+9abpLeSlDXlXIT3yL357X6Y wu7PHItQv8DR0Oxmdx4h+nUuDD94ei/qjuVcWWvrREwgF2mCWApzcAqMEIlSfDlNtg== X-Google-Smtp-Source: AGHT+IEZwjg1uLHsIxouQzimrCIIu32fdtZXKBbcxQFQdVF2gjv5VhaQdo+tvjJyCkpCHsr2gN8acw== X-Received: by 2002:a50:b403:0:b0:572:3eaa:a637 with SMTP id 4fb4d7f45d1cf-57830ff935bmr1008589a12.2.1716361387300; Wed, 22 May 2024 00:03:07 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399661a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:03:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWjdXxQyhKDgN1vH/yjJzOoIhVyMbeTz/beJdWAbhNp2KS+bE0GOZfSRYQIUyR8scRhb1HUj4DvTQb9iWpVgFYquLQF4NeI7oP3bNh7sqCXNyP0 X-Received: by 2002:a50:f688:0:b0:572:b83e:e062 with SMTP id 4fb4d7f45d1cf-5752b3f8af6mr10240297a12.3.1716361384274; Wed, 22 May 2024 00:03:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361384; cv=none; d=google.com; s=arc-20160816; b=J9CmLPECmpYc3nIQgIyGN+FTlXGM24T4cD0FrjZe1pGPPHFGXfPNe3tKLkZ2amMU41 Co3VPoS3n7eG8iPjldMdWCYYHGkGxOEjObZWaj3p6+FfCBTliXGJP3cEUIwGJXEbCLNZ P84++eRgrfKkF65c3LCSQJjv3QJwWevWzaMTxrIWaEyMhFC1xYDC0MWmE5w7CE7inn2H rwt+dbZmfV7wyUq3Y4xnTkfe70yloabuSDywHlE86WU37ILO16al8MxVMNsGTrYzwIXy L55Q57ZRpeKZM0L0eKaIzvM4UnI5szfS4TYwnoDMq80QrOHUr5guCHeLVmmiAZJGS5cd zQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rhiNHItkijNRPeVxpSDRlbAOxb5bR9vieWyhJ5y9ntw=; fh=0HzXXd9ikwqzrwpDW5QeKP7ZwAWycbCHzfbccnOo2Iw=; b=Du8YVPjjj0u1gSAy3sLjPTWe7pWU0qo96Vc6GnJZAbrCHczy+6OSOYfryACmJknbX9 tDjCCGWKoNKqdpaQNY1PRggDLvYrZ3htr027+sd3nsaqf8QrTbiEs/kpgFlBIrcbIu2g 0zs6BZcrUB9ZVnN+X2ZKDK/U077SqHzGZkSWgI4oYc13wxy0j8/ltBNmkK2j5bhWm252 waPfQNLOriS44SgVXnHx2NU39JWckhkROMS0gWQ9RD3ufnCuxT1JMhKycffdcxIgy2bK g2FwAaKEWWlmt9zLcYIsSEzweuaIB4iOF1AZEqS8bYtyqDHcNUbickU5P72ClZvl116D TNUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUX3oFS7; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733baba2efsor11241452a12.2.2024.05.22.00.03.04 for (Google Transport Security); Wed, 22 May 2024 00:03:04 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUGBChW4aMfbpXTwDQZdHVrQ066M61ia0fNNjgwyJbf4eqWTNeve7AD4rF/Fq9HdmyE4pzczbWuKu05sbc+Hn4F8YcPMv/WfNDTJXxbXONpLnjJ X-Received: by 2002:a50:c18a:0:b0:572:7d77:179d with SMTP id 4fb4d7f45d1cf-5752b43230fmr9196600a12.5.1716361383901; Wed, 22 May 2024 00:03:03 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:03 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 12/18] package/libopenssl: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:31 +0200 Message-ID: <20240522070238.3282121-13-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUX3oFS7; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../0003-Revert-Fix-static-builds.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch index 149ad54fc53f..b4b78c97fc49 100644 --- a/package/libopenssl/0003-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0003-Revert-Fix-static-builds.patch @@ -1,4 +1,4 @@ -From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001 +From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 19:30:40 +0200 Subject: [PATCH] Revert "Fix -static builds" @@ -8,17 +8,19 @@ This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d. Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure -index 2c17f4186b..94cab4c3c4 100755 +index 2a5e58805c3b..0e8c1ce5cc74 100755 --- a/Configure +++ b/Configure -@@ -1377,10 +1377,6 @@ foreach (keys %useradd) { - # At this point, we can forget everything about %user and %useradd, - # because it's now all been merged into the corresponding $config entry +@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) { + unless file_name_is_absolute($config{prefix}); + } -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { - disable('static', 'pic', 'threads'); @@ -27,7 +29,7 @@ index 2c17f4186b..94cab4c3c4 100755 # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; -@@ -1671,6 +1667,10 @@ if ($strict_warnings) +@@ -1764,6 +1760,10 @@ if ($strict_warnings) } } @@ -39,5 +41,5 @@ index 2c17f4186b..94cab4c3c4 100755 ? @strict_warnings_collection : ( $_ ) } -- -2.39.2 +2.43.0 From patchwork Wed May 22 07:02:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3122 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9C05A40F8A for ; Wed, 22 May 2024 09:03:07 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-57824f3e6absf519122a12.1 for ; Wed, 22 May 2024 00:03:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361387; cv=pass; d=google.com; s=arc-20160816; b=OSgJJ0uw/jqmfejfuwclqVih9EjWmQlaznucqQBfyCwqyyhbAJ451wu0H2693pD0Yx WBqozjRRHzuGeEbKjHurjzu4z1kGD186kKA4V1u6T9Uwt62/hDLBpIrnRk1cXl5wGVU0 /sDkCjIDFDdygZbp090isSN/MCXwPpz7/K366Ya8JI2XN6wYjdXk0UG2b7CsKxkMqhqK KhmB/S3438+7udtbzhm4kxV5JvhU/AqBTMMrjtyHmhrxWDI3kI1MZelEnIbzQa9MHAHo d6kTxCxCOVPet2yTwuNEWqYUO3ciBcLoziwcMU+5FuL20eFvUUPTUzvCdZTLXMwgLAqQ 3ZYA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=HH2PD8QEQMCTEPG7REbmMKP+kaV39Jpa/TYa56z1sx8=; fh=cZbQ32BlytEB37Q4XMTs+32CRkpbkTrbWlXm2Bze8Rc=; b=WCrWfS/+BOJ8ltyMoNnvDKMsxCFVJPB5C+ruvXXVHEwOxHDMKwNltGI54ld0NtpTEQ BHAzd5oIkllqoHWUvnb4WunwRBM+YhgFxgqxsW5Z6ff1/aMfInnW4rv0iNLMuriUKDfA Yiwpo+0hWYBKC1b1gVoMVDod1HqgLapqJMDlX53kEfyQOxudk+3CJx4iOA4J+LAp6/Pj GOU9nbh288lNFkb+KWPkSx870fENRzhNCNSj/6B/ibUHTpc8OKMC3GzImATB4dLhJdrY MVIg+XVRDpX+v1yx/H3q6TYem38wHeq4XygE/uyzJvlq/GrsyQPamtw124Rm90ihCULB XkFg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nAtq5le4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361387; x=1716966187; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=HH2PD8QEQMCTEPG7REbmMKP+kaV39Jpa/TYa56z1sx8=; b=QjkmWCwCgzWIhuMankbv8lTRvLxiSqW+dvZ/V1IydWd01/PIl6wQGARLKNt/5l5WkK 481AsPN+/09Y0qr5T/IVfeSYJMHehmbtHytSG6MB6034puUVvXeYujtRI/+F2zNVk3lC j1gp23OYSyBntNqaxRYlA796FgU5ZEpPsspWU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361387; x=1716966187; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HH2PD8QEQMCTEPG7REbmMKP+kaV39Jpa/TYa56z1sx8=; b=kFyrKTgZjfda12OWKn76eEYwXPAIDEpk0U4WZN7THCRyTjamFxoZzivtZLL0l1zyjO nGO49bg2KY/UL0Za21gF/r7sSwVEaTu/Qt4rVF1kfLv95vGvglDv7HLCtJRgEeQ9Gv7P vRqkXC11LQfhNgRgn2yrRrn+sEVhPGaM8uEZJvSJi/kBsr0u9Tgd7iejXPsCfDpFLbxT cJ8Pe5AZoG7koLbrL/9AugHYcuJSekd/wZwEMB6zb4BFrgSeTFi0mEJNAwHAwIUHhTyO xweIwtU6zaP+cjbrzMJCK+N2BMpmPdaQlxgp+6SITj4eMGrAagnZqG4XIKXI8TBozkWo GrRw== X-Forwarded-Encrypted: i=2; AJvYcCV/yBDpYh96wFypGJq8wreiXvOQZbPSISm9Ey0mhqIgar4y7rofaQ2XWOGES8+HwrZEThX4QfrWsYR58N0XS6pAyixV6g4VvAIV2hmS9azxP+KAnrOOjtofDKd63Q== X-Gm-Message-State: AOJu0YyH/d6HsjlpU0vWX78s5xC5t5PBTL2qFDcAQSznu3Kny5NR7E+c hd8Ogkg6yv7bGOQBGaxgN8bXNKMo4qzibuhUsKT60YsYcS6iyN3OyHQt530gINXfuQ== X-Google-Smtp-Source: AGHT+IGQW47oY4kPMfGNWwdqHtgl6bwoUb8bViiMfzgSndr6RZNjH3RFQsWnVfttmB2rBefx6Qn7DQ== X-Received: by 2002:a50:9992:0:b0:578:302b:af43 with SMTP id 4fb4d7f45d1cf-57831177a72mr970804a12.17.1716361387400; Wed, 22 May 2024 00:03:07 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399693a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:03:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFoDHo6mSvhnc529VHPwngtPcSj8nojJgM8xrRODNmMQgbqkLrNcCKbzW3fWtdznI6ciOCV+p6/ksXSG82wLIAWNMrYOQMMg9/z5eyAqE+nE0Y X-Received: by 2002:a50:bb0e:0:b0:574:f38a:289 with SMTP id 4fb4d7f45d1cf-57831180cd6mr800145a12.20.1716361385865; Wed, 22 May 2024 00:03:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361385; cv=none; d=google.com; s=arc-20160816; b=xKJAEQHOklTX6isnrbCj2N2kRIfIu09Uj9Ew+gwk4Pa59BbksPCj9g66U2lx0SXAcu 4uVgTnjHNCA3/OFFz0ruTKwmk1KVvsJuBQn5mUZvSL3s1xvkm/gtgCq4T8LH41Wmz+Sh zKpghxjOYxpaWmT183rNQk+vcw6lUb1NoYD/AcaJi1T/0ceT+OPT6M2Mawqnx62DAeOM JMHQEo938J54Ml44Daj0J8nbgiXnGcYPOu9YYXEm1mdZodXifMTZ6qgCMQwYUl75u55A boevxN50n+G18T/SalTQ9Xg9ZskzciOl4/NyZVYUKQG99yqMTlzIO5tXU8+cva+WXZAB fFxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=WGNEwYTft0D3HpQQwO14RkZiYIu0tASwNYFUJ8S7qXs=; fh=BiyqsCbiN9o3mDOxba4V2PPm4KINzBbCsXJhPi7JQhw=; b=tVx0yPRRDNe4UjKjZ3oEnNJ0sBbY6h9dSkSsY1XSVRyA/7abP23qxKpbh1+cCa0Pbg iojtmhyvz2g8XTomfk7QJ2YXxH9Kj9RlHXrpXIYtgdTzqyNoOV0xqcIjRMnqSxAZI206 RVBvw4+tXlF0MZcW9ZvA57jiA2srlJEaXV9M/KRqO+ApPDu2LK72kTIpW7rtvIUNZXn2 nXfJ4I2nl3XU11x/hPXYXHe92oeDO3x05jTl0FDKVNPUPUHuBoZgfg74uAipcTE1BmJX pQo0JUdv2Mz1/BDvqffRjsFK20yaPYz22bxiD+VTMSLWjSs7leQI7ow0VUO7CFWaF3d4 8fcw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nAtq5le4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574fed52155sor2509652a12.0.2024.05.22.00.03.05 for (Google Transport Security); Wed, 22 May 2024 00:03:05 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWB+wTQZeeIVe6yHF9i1Y93Zc0ETEsGyt8Lc1IhpRwu8S+8mH3/98O7VNNsn0w7y6XbcI8FUbFVtjbbQ2HMy4jD9E3zTDQStg5ciwsqIedpUNq6 X-Received: by 2002:a50:8ad0:0:b0:574:c3e4:1fa3 with SMTP id 4fb4d7f45d1cf-5752b4e5ee6mr8574178a12.20.1716361385526; Wed, 22 May 2024 00:03:05 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:05 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 13/18] package/openocd: update the patch to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:32 +0200 Message-ID: <20240522070238.3282121-14-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nAtq5le4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../0001-configure-enable-build-on-uclinux.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/openocd/0001-configure-enable-build-on-uclinux.patch b/package/openocd/0001-configure-enable-build-on-uclinux.patch index 2f2d3208405f..d5f1e3295823 100644 --- a/package/openocd/0001-configure-enable-build-on-uclinux.patch +++ b/package/openocd/0001-configure-enable-build-on-uclinux.patch @@ -1,19 +1,21 @@ -From 11ea78c4d253bb90296e2dd8c3f7fbf59ba397b6 Mon Sep 17 00:00:00 2001 +From 86dd032d77166b7ed59d08c99fbe47b8b7667406 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2017 06:30:31 +0200 Subject: [PATCH] configure: enable build on uclinux Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index c680bda7..1a7980a0 100644 +index eee42d4240f8..b0445f92e0b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -327,7 +327,7 @@ AC_ARG_ENABLE([sysfsgpio], - [build_sysfsgpio=$enableval], [build_sysfsgpio=no]) +@@ -342,7 +342,7 @@ AC_ARG_ENABLE([xlnx_pcie_xvc], + [build_xlnx_pcie_xvc=$enableval], [build_xlnx_pcie_xvc=no]) AS_CASE([$host_os], - [linux*], [], @@ -22,5 +24,5 @@ index c680bda7..1a7980a0 100644 AS_IF([test "x$build_sysfsgpio" = "xyes"], [ AC_MSG_ERROR([sysfsgpio is only available on linux]) -- -2.11.0 +2.43.0 From patchwork Wed May 22 07:02:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3123 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6B74F3F9F8 for ; Wed, 22 May 2024 09:03:11 +0200 (CEST) Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2e1d4a03597sf87004611fa.0 for ; Wed, 22 May 2024 00:03:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361390; cv=pass; d=google.com; s=arc-20160816; b=RRgSvqp3wqkvkjS67KUu40orpSEdNuCQSixNgb1VUGVOIjU2lBerPdU0TYeR5Hk3oe Ykai1XfzkbHJy6CWWzTH0tWA8pVUDD7DlyjtPRmtvjnlKRDgMo+oan+BduYhCJIMG8Hz XONPkDMpKX4eUy01CGn48GW0DERpHGkbXxVjxNHz2/Yx76SVyShfng/DWLUiO17SyXfT TbZV003gCXJ84UmyalHdl9S3WshwkoHR4y8DUdhOq0Gxedf/O4mik1jNLHhpxlSPrz/f nIbulJNAvlHrR3acnw4MQKWerBp95AnRCaS5W2i7yA2y5U3a0ntCWaalyOcF2BCZrWTD Jidg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4Y7mRDl5jf9+5IP2Y43KhJMQvQ62LXMN2NIXjTJs33g=; fh=U9OMW+HtP+jdA+IabPdByWw+90Lv+A+sjkMyi/dd3BQ=; b=RxHlbJ27Wwbu7CQ5SSvPIL+3sHxu+pXpsmd7Pu8SvUXGz4ywENCJ7GCgp8bDW/zVZa cs03bvXal7oG1PI67uju011qWptBqwj8ojOgkUHcI30t0UhSyesy3tpt6ms6nldXmjzS RphCg8GN6M6+d8NFXyFkN9vhT+6vCrO+fLhjXFa4Jx4slpBBXHDAqaC+ppFcyJGmvPuW DHyw8CQx9xp/IYjmiZvrNvVaHUHzivVryTyUC3SOdNDsIa6zFH6DOyZ8zbMGaZwhOFWM MkS7ub9Md+ErLMdfwoE3OBGaFEjXST1X+/M5sJedURu388IRqoPlQ0bQEOVRO5tGy0oW ffmQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d7LhdQCj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361390; x=1716966190; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4Y7mRDl5jf9+5IP2Y43KhJMQvQ62LXMN2NIXjTJs33g=; b=GIt5gz5OdMJrQBfVevrjl7Pf3nLyOcn+tLoccUsds0KmNUqzwIvn+OY1gQFMisxwQf gR7RpmqVliCs4heIoOzeZHwydL33fKG6FO7l/fKdLxkOtpiV16dYp9LV/QRQPWlPJ47Z CQ6U7KE2lO8cSPbX+Z9DLj/1KlUunHPNZLSw8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361390; x=1716966190; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4Y7mRDl5jf9+5IP2Y43KhJMQvQ62LXMN2NIXjTJs33g=; b=wCUjrwKSGJ0rhqH9aCwDjsivcXxBat5c5Q8ZxF8BuzuASaNIbSxI7T4qn4+OwkYIrG K8cU+EuhClsRmyqiYL4+KikB8wtc2e1w/26o7fqPX+lfVU9tWv/oaQAe0Sflm0PAUg/D ekSjeNRUSwmuYxxODmR4G6t1fFOr4SxnZ81wm5lnUI3DVO0k0ym5fhzTK1HWRGzLRt0f TIU/NW09DBvqwFqvZjQL/A56OtQZZU/0Vd88kvBicA5YxLp6v/0hUzMtikh5AWAUQEby 5k418q2rp7nFzH7iB+XzdMdNZfJbJEYzRJJNTv10jEUm+MpRfcRCGm02fAYix4oIC5jK YBMQ== X-Forwarded-Encrypted: i=2; AJvYcCVovTkfs1FO98USniFye2oD3IB21Pu0ZQBa7b/X1r0UiKEWLRe2HVTvIpI8jVZwy8DPJF/8wnTXji9NK16BZ/LGFu2zT2VcHaApvdJ56MF/+TuJkQjkM6pVH0QUYw== X-Gm-Message-State: AOJu0Yzlpg36fHld/blthMbfklelUVDpcoLgW+Hhcuo7SL3hcobkle3z OTGpMau5HJw72Gaq7RsKijujozyENUHlXQ5kBx5bSMoguDffyMEKctPVTtu1lPg6PA== X-Google-Smtp-Source: AGHT+IFRwYiA0SJxiJ9z9BTKIgL4+Bx+g++d2lgkEKbwWV6beCzxekZn4auoRex2d9ui5sEpt83Kvw== X-Received: by 2002:a05:651c:1728:b0:2e2:be7a:e497 with SMTP id 38308e7fff4ca-2e94965289fmr5068641fa.49.1716361390726; Wed, 22 May 2024 00:03:10 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a2e:7211:0:b0:2de:4938:4f10 with SMTP id 38308e7fff4ca-2e4b5a1a3aels2596191fa.0.-pod-prod-09-eu; Wed, 22 May 2024 00:03:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpG5lNnIGjrHHaYnOlJ08Cl6HBpK20qmEsG7RzMvKqTF+nF3+S80i7V94oMrJ+OC5rlNrhf2RWOmpWaFYafJXWNBhU0WzG3cjhqIbRaxUcW9Iz X-Received: by 2002:a19:5f0b:0:b0:51e:1bed:13a8 with SMTP id 2adb3069b0e04-526bf9222bemr475855e87.29.1716361388533; Wed, 22 May 2024 00:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361388; cv=none; d=google.com; s=arc-20160816; b=l2FlJAy6V9vCfHC2VAjxK+/i8RhhbT1a0JApKx+THQZYMJVjWCwCofUkD26GRaSjzc i5Wcgg2rTK94dEu/fD6iuugpaiTtpZ0BwJkHp9tqyAMtetveAhzhkJYze6KCasFjUVMI EaEuhNVJQqFYWdIbRLAo4/GscA/7GHKvwseaUespS1MWC8NrClQhqK+Rlq4v548cceVt 5lG1gaG1Y4xEt0bUJd0mP2sBGvi2+2wHCvYY7Lh3YAUFlF2W2z40osAvm6ZZHUIwLUc4 L9NFOs01iA2U77tHGQ2RDDX+1gL/pcHDKEr6+okkn5/pNY0g0sDiVMF9XjneXfEbvsoB YdGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=MgfWGgiQajxxZIbFh0WrrBQ7eWIro5sUJL90CTsJ53I=; fh=8lxrQO4msa4hVxTVq+mimIRtuPpf+q43SDX0uxGZd5Q=; b=KkwWLrBVcUF0fLG7gUsROEaFkOdDdP+MmcRy/E9SOZ5/Ca6NOTNpQfxTafhTr/ohit us3R9odA0W9hRGdpHSQs11lObm+UsSKtxS4/dDGxdowAINFh2zDe4oAigNB/mppW67gq pTe7KxTNpQr5Ep3/h8pRqrA/LzEWsGbnbHyIMbKqK+xJt5/MVTfRkpU0MhtPMtZ4QPlj DZH1kcN4IPFGhcB5HBj0h0xfsXyv2H1GqKKNybIu3aw1WMDbqutTKe8Y8GNzRYqB+lyN tBx2hkWJ9QznbSpl7mkKfMdz5wccu5VJvxMyfwYi2UNGVp3/xW8GBOmPhM71F0MqCaJ/ 3+Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d7LhdQCj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a5a1797bdb1sor682579766b.6.2024.05.22.00.03.08 for (Google Transport Security); Wed, 22 May 2024 00:03:08 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWUNNeMc6Yn++JfcPhAT2l/vKdGtmSMDOV4aTm/808qupQsJdLHc+5/cQpCC1iNnwrxXTcubnNBRedW31DWWJSE4kWkhLHX0J4zwGJonehXtWkw X-Received: by 2002:a50:a40e:0:b0:572:71b3:3c4d with SMTP id 4fb4d7f45d1cf-57832c3c679mr568402a12.34.1716361387204; Wed, 22 May 2024 00:03:07 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:06 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 14/18] package/patchelf: update the patch to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:33 +0200 Message-ID: <20240522070238.3282121-15-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d7LhdQCj; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...ke-the-rpath-relative-under-a-specif.patch | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch index 8710bfb629af..c29fac7d9fb7 100644 --- a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch +++ b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch @@ -1,4 +1,4 @@ -From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001 +From 6e8915572db65cf63b7a82f9b24af6f9cad92ba7 Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Mon, 20 Feb 2017 16:29:24 +0100 Subject: [PATCH] Add option to make the rpath relative under a specified root @@ -43,15 +43,17 @@ pending. Signed-off-by: Wolfgang Grandegger [Fabrice: update for 0.13] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 175 insertions(+), 21 deletions(-) + src/patchelf.cc | 199 +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 171 insertions(+), 28 deletions(-) diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1d9a772..35b4a33 100644 +index fd1e7b7b61c3..f3b7ba8867bf 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc -@@ -46,6 +46,10 @@ static bool debugMode = false; +@@ -45,6 +45,10 @@ static bool debugMode = false; static bool forceRPath = false; @@ -62,8 +64,8 @@ index 1d9a772..35b4a33 100644 static std::vector fileNames; static std::string outputFileName; static bool alwaysWrite = false; -@@ -77,6 +81,49 @@ static unsigned int getPageSize(){ - return pageSize; +@@ -81,6 +85,49 @@ static bool hasAllowedPrefix(const std::string & s, const std::vector class ElfFile -@@ -183,9 +230,13 @@ public: +@@ -197,9 +244,13 @@ public: - void setInterpreter(const string & newInterpreter); + void setInterpreter(const std::string & newInterpreter); - typedef enum { rpPrint, rpShrink, rpSet, rpAdd, rpRemove } RPathOp; + typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpAdd, rpRemove} RPathOp; -+ + +- void modifyRPath(RPathOp op, const std::vector & allowedRpathPrefixes, std::string newRPath); + bool libFoundInRPath(const std::string & dirName, + const std::vector neededLibs, + std::vector & neededLibFound); - -- void modifyRPath(RPathOp op, const std::vector & allowedRpathPrefixes, std::string newRPath); ++ + void modifyRPath(RPathOp op, std::string rootDir, const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName); - void addNeeded(set libs); + void addNeeded(const std::set & libs); -@@ -1041,8 +1092,28 @@ static void concatToRPath(string & rpath, const string & path) +@@ -1267,8 +1318,28 @@ static void concatToRPath(std::string & rpath, const std::string & path) template @@ -157,9 +159,9 @@ index 1d9a772..35b4a33 100644 +void ElfFile::modifyRPath(RPathOp op, std::string rootDir, + const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName) { - Elf_Shdr & shdrDynamic = findSection(".dynamic"); + auto shdrDynamic = findSection(".dynamic"); -@@ -1096,6 +1167,11 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) +@@ -1314,6 +1385,11 @@ void ElfFile::modifyRPath(RPathOp op, return; } @@ -171,7 +173,7 @@ index 1d9a772..35b4a33 100644 if (op == rpShrink && !rpath) { debug("no RPATH to shrink\n"); return; -@@ -1120,31 +1196,80 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) +@@ -1343,31 +1419,80 @@ void ElfFile::modifyRPath(RPathOp op, continue; } @@ -271,7 +273,7 @@ index 1d9a772..35b4a33 100644 if (op == rpRemove) { if (!rpath) { debug("no RPATH to delete\n"); -@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false; +@@ -1736,7 +1861,9 @@ static bool removeRPath = false; static bool setRPath = false; static bool addRPath = false; static bool printRPath = false; @@ -281,7 +283,7 @@ index 1d9a772..35b4a33 100644 static std::set neededLibsToRemove; static std::map neededLibsToReplace; static std::set neededLibsToAdd; -@@ -1438,16 +1570,18 @@ static void patchElf2(ElfFile & elfFile) +@@ -1760,16 +1887,18 @@ static void patchElf2(ElfFile && elfFile, const FileContents & fileContents, con elfFile.setInterpreter(newInterpreter); if (printRPath) @@ -305,7 +307,7 @@ index 1d9a772..35b4a33 100644 if (printNeeded) elfFile.printNeededLibs(); -@@ -1508,6 +1642,9 @@ void showHelp(const string & progName) +@@ -1821,6 +1950,9 @@ void showHelp(const std::string & progName) [--remove-rpath]\n\ [--shrink-rpath]\n\ [--allowed-rpath-prefixes PREFIXES]\t\tWith '--shrink-rpath', reject rpath entries not starting with the allowed prefix\n\ @@ -315,8 +317,8 @@ index 1d9a772..35b4a33 100644 [--print-rpath]\n\ [--force-rpath]\n\ [--add-needed LIBRARY]\n\ -@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv) - setRPath = true; +@@ -1889,6 +2021,17 @@ int mainWrapped(int argc, char * * argv) + addRPath = true; newRPath = argv[i]; } + else if (arg == "--make-rpath-relative") { @@ -334,5 +336,5 @@ index 1d9a772..35b4a33 100644 printRPath = true; } -- -1.9.1 +2.43.0 From patchwork Wed May 22 07:02:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3124 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 70AD740F8A for ; Wed, 22 May 2024 09:03:12 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5725f45da8esf259036a12.0 for ; Wed, 22 May 2024 00:03:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361392; cv=pass; d=google.com; s=arc-20160816; b=DvFSnQFzfPlg+yvYsu224M7wq3sEEDabMhZcab1+WbkuqPQjyX6VCwHgG9+qffDWny m1W517TCak3rLEQlAcApE7HM3iAnZpqh2v/F6bV/D0ARuWeaRtsmcoc3kafz9Z5lAmE5 fi3r6pbHCHASTdSpykzGDzzwKJO3NbNksD7cp7NDsZgqZqJmTQgyfG6jrten70IVHRP8 +Le29XItc5xGpSzAIcAeo8d8m3uyarK+gyA6kIGpb11XHwGMWV7DN5Hpi+iWrx1X6aJY X2sV87t8PZXT/BIaAY1IxA1aarzlaAn98iJ6Df0J/saBrIHK8LY7BfyPE53SMAL+nSOY I6iw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lZJpXprowisnFqVeSZCuOeBMS9DdPsrYt8vZt8J/J0k=; fh=iaP0u1HSnGTieaQ707Z5BuZ8+OX4jykttv1Tm9uRsFo=; b=YqoC4xQCaBh1zaEqKWGNpY8kniWvn8mXKlmDGTT+PO2KUE47hT/F9ODiEd5WtIRAcq EoV21JkvjCCa/8Ye7NVe1RV257Fv1Pn7dqcxVwoASb4y4BDuq7LoZUMZbUTTFKXZCke6 gsYp349ULkYKXygVUyLbUVBRiQYBAliQWT0lAc1B33qZqbI4fhX930vj+7p7/6/LRnkd 4owvtECCYIrmK1n+rM3G8OuyiD2Zq2fZ1x1r1VyWCnJJYHZcV7aYziHnf1Hb5QbtgH4c 2ezBFxsDsG2+EjI2USlQRrf1lcXOxy3sb+jWfKEmukj2C2o5Lms4yo4wECiLkGRkVX03 iPgQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="BAb/IJqJ"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361392; x=1716966192; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=lZJpXprowisnFqVeSZCuOeBMS9DdPsrYt8vZt8J/J0k=; b=VtfI878xh5fEdlc+f9K2G+gD9vKFfeQmdojR5cM3KdGC8NmenqwQV2W2QBBbBODIol i7sfSKd1QuE93XJFNGXuHp1/TDphMR2gNSHEDQLyE6q9R9hXpSqwKwHCiRytKAN0he+U dncNWCqnNnGOuWpDjZJnuKJlU5UExZJFgBqMo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361392; x=1716966192; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lZJpXprowisnFqVeSZCuOeBMS9DdPsrYt8vZt8J/J0k=; b=j1goqWpRvvidpRpobsCuzrSkBdpluLFSJaaXRt64wlOznmFgZiZFjc+xX3hn6//Sm+ 9seF+Vbn6LcjPbIrqp2v7aNajZ2vkZd2APNQkPYq1dElL0YybbnPxioi2C7Eb1w9jZ3I sC7zqyhpxz59qpO9SCXDz9DDmcADl6N0g+UhfDhHMZ3gKa/ta9w15yIE6Y7X4v6FR+b3 9YI8cJym54hsU6tnS4TSOBGMSy4idp6jRhXsicxwENW2kcfx9yPd6utaydOvDfg3uyDD TRexYwb4RciW1dMxqVbgw8/UOW22HTaM2T+qpxZhAV8iyDnT5ts2e/3u4NF0TqUecN1u e2VA== X-Forwarded-Encrypted: i=2; AJvYcCX25pFdUyv0B9dUz3XPTqtd4HkO6oR918mv0wDthTiX4AekjjssIweU/jCuQVa5tHD+1v9aMCeI9kb5hRS5T1GIy52/70hjmwuPEPPJ3bur30hDiVuaWlCJk9LVNw== X-Gm-Message-State: AOJu0YxJLp5CmbHOvGhlOEgoSMRHaEFyjXVPc6PjjXAQE2YXGNHSapQT m/FMNdeMqPqjOCyZ3xWP3ANTMiAJJJu0BaBGkuY3T21d1UO+rTw+YAsI1pAATEJaPX0T0UWG9w= = X-Google-Smtp-Source: AGHT+IHf0wbCeWOxPnk/VJ28h/hZujE9s+uoRZVYq0vbwlYZ4D8cMh0wyRo7mnu774lxxR3qNMpjVg== X-Received: by 2002:a50:d74e:0:b0:56e:99e:1fac with SMTP id 4fb4d7f45d1cf-57832c4b0a0mr646593a12.39.1716361392091; Wed, 22 May 2024 00:03:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:2411:b0:572:51d0:44ba with SMTP id 4fb4d7f45d1cf-57333248b02ls609345a12.1.-pod-prod-09-eu; Wed, 22 May 2024 00:03:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfnQLjjZll0Jzm1Rl8GwW6nRgFNEtIBHPbO0DtWnVLTYL11nAVgRJ03wkYMUIRm1omeJ0XPUyM5ysCGR72iIlKJLkC/A5ddoIcxzL6p7GQxmkP X-Received: by 2002:a50:9547:0:b0:56d:fbea:40ae with SMTP id 4fb4d7f45d1cf-57832a6e765mr585625a12.23.1716361390173; Wed, 22 May 2024 00:03:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361390; cv=none; d=google.com; s=arc-20160816; b=cHcFAMaRZUZm3zqbYyj0ADitcFKKlDeEN3VbVo0nBDUg6ZpHB0xDl5oerPZo3X+BTT PKvzgJrQUQilbIZhZgZbDSksGvrsegL/tu8fe4XCUaVnbVZDUbEWlHfWK+3AYhMxNwPN XESiizlwVZ5rghi1VY4TP1AWD+U2bStxNZ9uRPXkCT3Nk+oqOlC20PAt7kupMrDFTKiz Ff/dNRPrjIf2Tu1HGQh79q2S2VFkanzxJCga6L4LsiCfODWuuhONGN903uzsaF46KlqK t6w1kywYS4IUnrZM6Un21bgOWlQSiBl2s6hViMpfr4tS3llCf+zTbKaO0dQovFYUtzFJ 7kmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=YtlGqCkSErYYPEtJoO6dOo1np4fXZEwijJdOwwF6QEY=; fh=v52CPTSrcI9MGoaTFBn432QLMt88TBo/yaRhDp8+MqU=; b=kLhMn39RMxqpHmo+Fjz4hjeaBxmAFGZdteue++5W2JJXsLdyG9RC/LYNekQzZRo/R3 22WqJcKnZdH1LiV49SAfQIn4n1iOx2CC6gg6yBlREtdbuKZmsnzh5Oj9feETwSDPdBIj XBX9EXk/6c+DgI722Sy4y6H2NHDlExuG7+n5SfN6CGBRBiiasIzaEPp89nTAe8CHGz4e 7lK/9M3dNYCO9udpb5M/N29bQUCA02ocvuhUz/b/f4BDrBcGVZg9MCAFZS6RQFNCyGjC Co87rTQ5sS4adWZCYmVK8XZ2xtE97cFZ2ALAdW1p6DzWOG/pq+ufOSbmwJ1Kasm5dv4+ sckg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="BAb/IJqJ"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-575089a3e46sor3130549a12.1.2024.05.22.00.03.10 for (Google Transport Security); Wed, 22 May 2024 00:03:10 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXf9nCZqIzSwzMeUbFgOWAUcXUkPdvq/iSMAt8OYidSwWL5QQpubxQHZ3GRr9PjWLkT2g/RF+5nqJoeso8vsaebdz5gYkdlVpVff8fMacoZ4wiO X-Received: by 2002:a50:c310:0:b0:572:7b08:d49d with SMTP id 4fb4d7f45d1cf-57832c5890amr526072a12.41.1716361389854; Wed, 22 May 2024 00:03:09 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:09 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 15/18] package/qemu: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:34 +0200 Message-ID: <20240522070238.3282121-16-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="BAb/IJqJ"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch index b7e41d6f232c..f9e523a62786 100644 --- a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -1,4 +1,4 @@ -From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001 +From d6fea3c321c7eb18e6dd151f5d4b0cc46b77bcc0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 30 Apr 2024 09:40:55 +0200 Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is @@ -14,18 +14,19 @@ find at the following link. Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html Suggested-by: Paolo Bonzini Signed-off-by: Dario Binacchi +[Dario: make the patch to be applied with fuzz factor 0] Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/ --- tests/fp/meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index cbc17392d678..cd052667e940 100644 +index 114b4b483ea7..0e1237be54ed 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], - suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90) + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 180) -executable( - 'fp-bench', @@ -45,5 +46,5 @@ index cbc17392d678..cd052667e940 100644 fptestlog2 = executable( 'fp-test-log2', -- -2.43.0 +2.34.1 From patchwork Wed May 22 07:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3125 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 03EEB3F9F8 for ; Wed, 22 May 2024 09:03:14 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-56e645a8762sf496062a12.3 for ; Wed, 22 May 2024 00:03:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361394; cv=pass; d=google.com; s=arc-20160816; b=FW9e33nx6zI8gP2/E4eg1qAX9OJ3W/LsNS1Ok8v8RPJSVjYmJCVcXs/ynUjAnN/l62 E+HrmzJMoyp8fJpE8Kc8Xe3qKuv1W+JX/Hrm1p0CIuXT4WCUOBmKlQqotoH/YHZHXf1w L4fz+SATnTi1JgfYA4D6CzK0zoDrJFXzBkDVvn7t9BWfgiPk5upI6FTTA/m4uUXEb9Xv exL3CHbyssx2rPqVu3ge5Rf77PZRmcjQ8DkFGMHSDg/f6EFpSWEOCbLmbIdDftSq3uiy ABOKXEBd9iKHsFTSfBs9mzTtpKvv0cAuISopM6G+u91jMKcTMv8wmnnLjuMquQOyzJhK qCUA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; fh=g2Qjuvx4x9M5EMEdGaFsGJtkjjTaqWeTNgtfgLt4gzk=; b=dHC/VutWPb46nkc9ktaz7ii1aWT/z4sBl2Dp+JUglT8CufmT5FWwMOWhDSGbELfPUJ qyoYLFOLMH/OfyDA/4i5JhEAhjv9vk5IiQ6vKr6h3++ww2HYJigtLnx2pkmp/kiyqX3D IqFin06l1/wmC07ZD1QmYAH/qQJIs4ccrfFDPEU8bwxfW9lELi2Axw3if5HjPb6tjgcW T1wwZvrZGkWXOc6vvnoMzq0A12MB3mI/u6p8sNV78H1/87OqfU73k9UCIBztjLQwF0Tu P1ZomRGm0NaaaQXIRZx76cLc/Jtds6rTPX29NBtxNI2hL2DyDL6VV369QAdLw1SQz9Vd BR6Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JL2zD6oA; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361394; x=1716966194; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; b=Jr+6EO0aN9PeIBuPp0B9eBLsBQc9nkdLJRqzY8vb5SSCI4Lq7UTvAyElI7jOSqsqjl bv/qRXSqPAa3hO0E17L7snH0OlVgbvLRqtYpBHFxGRHvhMRVjLjEBqut3ojLzQTFe/Jw Eeyk+ui3MMOn2ulSBjTaKOVx4yzSmwnMPCoyo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361394; x=1716966194; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; b=wmIyWYsnGvbG0yH1+ek2aHsg+uuKp7rKjZstOumL6f4y07KG2UpLTzBxAdsICERoxl TuKigIs5pWyMRgtBQIv12hb6ZmccYHN9yPemujpoQTl+Gf3w/2hllac6hzBGWHcGJWJJ bts3riXTBjarjSkRrw1SxFDF4+zJvVdSTzIQdti32l3qcjfGa6FXIeGS0spgv9ED9xNj ekC1A3WOB0SOjDSq1rBlUoIKJdcFeSbiCJX4RucHE4swwUpU1vkrBMD/3QnyrWGEJeqz fpNx/Bwa/thmZCN4ARdF0R5dxxhcTFo5nvQRkJjnO3wkJHd8PfhpjTbEfwU0iYQuK5Bq rrfg== X-Forwarded-Encrypted: i=2; AJvYcCWIe8bpbaQwuLyz0Yw98CxnczU345K2IdVZI+5+Wtak4AnkevBeirVRFtGrGf3gLbsOMKoNhI7sCAIx6RUu2jZi+jsgvtKJNraivcciv829mMPJ+9t903QcC8bhqQ== X-Gm-Message-State: AOJu0YwDeC3kIAVO3UfwxFULi6vewPqBtdQxhJyqlYoOVuVpg296C8au hqsvuGcsDQNykbdpO4wEhyuRV46u91ZGNwMxuUE7s6tJVWNBcegBAEOS8woWj4Iz7w== X-Google-Smtp-Source: AGHT+IETkdip4PLYWcM8XoM0sc7YNQPqWwO7HxvZiXWrw3hE7t0kA/H5P2nqvCQjVImuEuq0Hn7GKA== X-Received: by 2002:a50:9e2e:0:b0:572:7c99:a280 with SMTP id 4fb4d7f45d1cf-578329e295cmr754611a12.15.1716361393561; Wed, 22 May 2024 00:03:13 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:2424:b0:572:6ddc:bb0f with SMTP id 4fb4d7f45d1cf-573332d9f22ls391306a12.1.-pod-prod-03-eu; Wed, 22 May 2024 00:03:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIZF5RtDllIhWsefgFa2jRtlQLS9hoIPhqPzxeU/tNkUOkyG4Xc3LB4VysfrmQE11c1jxVyhFeyU3V0jJeQK2EECCT0+IOXDe1tj7IIAvfSTh/ X-Received: by 2002:aa7:c788:0:b0:578:33f1:dafb with SMTP id 4fb4d7f45d1cf-57833f1defemr588079a12.4.1716361391996; Wed, 22 May 2024 00:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361391; cv=none; d=google.com; s=arc-20160816; b=WF/4tY1dTADMmdb4wPTOC3kiaNXnpbiM3O3gQR+ftA1deNE92vYrqP4xN4KbyRAYaj Hsl6VFNhRKrirbOAK+Yh5g0DJPE31WUga0pO9E6VKAxGvv2QFs6H0ZCuAD9Z6G0S26Tp ah9Hd9jY21/tYBUcWv7rqtRKEPhVKgRLA+tJua2MztiTx8YDU8eQ44pkYVmJxMsAwLmp Yp0lwWdaJuSUMgbg0DrFtSeFS/RmbXfo9R015JAjo5QFUHc7by2Ckvf6tLmIK7Y5Qtfn CSEJbNUwPpeOg8W9fK66Q8e0QsIOyBwhVL5ZolELzXxtT8KP6BZ2SjEb9X6Gz9+u8eVA ZniA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ei6QerQpjg4oD86F8bttymmIhDiYrWLAh9bDB1tVqDM=; fh=JLCaPy3fP+DnHMJnez9wioUlAxs0QwRa5cp1jlqXvWY=; b=gsg9h5f/R2Hu//QAuep5g+PRnCWDy36QrgPU8qlTSBMGCtzDvi0Vyisyff+MYXyDtq LVzlgBpZF6yLhTpKDnGz8ZCkcLMzjVOGSvya3Rfs+S6rw0klliapgGU0/wFuiAH1S2w1 mz5Rx0wVe7Qcu0WUPXVphyUtWInrmwTQrBdOHpHsCAV0a5M78SY+eyfiwkDuLLjxVR/w eBuw5Ii4WhDAPM/oO/xWMnH2tz7vBtEaxPeyzi9FH+OJr3hgE3DlFU8c/ldXL55jFQaI C/jTOEDV5XHOUC5/SDjb9/uYUcJXCJZWef6SqmPWg39F+r93935o1pMZK7cgxbefqUuO uJnQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JL2zD6oA; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733bead3d4sor7277637a12.3.2024.05.22.00.03.11 for (Google Transport Security); Wed, 22 May 2024 00:03:11 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVMlzan3R16oARZ1bkJm7toqg/+c9ffArHdNOgpO7yKquL+n60CUn6/Nf/PXALflEVaeKdh3tBXJ8+wpdopjJ9NKhu1WNTCN0UnHkp/Ydz3sqfm X-Received: by 2002:aa7:c788:0:b0:578:33f1:dafb with SMTP id 4fb4d7f45d1cf-57833f1defemr588060a12.4.1716361391490; Wed, 22 May 2024 00:03:11 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:11 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 16/18] package/qt5/qt5base: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:35 +0200 Message-ID: <20240522070238.3282121-17-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JL2zD6oA; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../qt5base/0006-Fix-build-on-riscv32.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch index 5561acb9ae04..ff24fbff8305 100644 --- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch +++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch @@ -1,7 +1,7 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From 25a0057e8d7afaab3492e03efb3f85581f1cf9b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 +Subject: [PATCH] Fix build on riscv32 riscv32 fails to build because __NR_futex is not defined on this architecture: @@ -21,15 +21,17 @@ Reviewed-by: Thiago Macieira [Retrieved from: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/corelib/thread/qfutex_p.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 +index f287b752d75f..fd7d09ac8572 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE +@@ -81,6 +81,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 @@ -38,9 +40,9 @@ index 40482b6fc1..037207a5c0 100644 +# define __NR_futex __NR_futex_time64 +# endif + - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } + # if __has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__) + # include + inline void _q_tsan_acquire(void *addr, void *addr2) -- -cgit v1.2.1 +2.43.0 From patchwork Wed May 22 07:02:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3126 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 80FA740F8A for ; Wed, 22 May 2024 09:03:15 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5781e39a015sf401923a12.2 for ; Wed, 22 May 2024 00:03:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361395; cv=pass; d=google.com; s=arc-20160816; b=rsZ7+3Xy0e6ISiE3b18JbD4Kuv1CyeBEV3CEoAZalv6G7DpSaJLb9XMM4oHHKdsNyn HD43D0U6Yr821bqbOrDv++3BzyANFLQLInxKzDlKVuCEySfNpve4GGuKla2dCe4ySJKp XJIph98iI1yCj6e8fxOGk/jVTQZuwUigxID7uqNym0XZP1U+n3vNvAyNAzk9iFcO0woY jhI2wdAJ8LVTnb62VkG72GlNcI7qpZjhMPE0lpMqA9aV5m4Umj3SrrnhTqbAYfV0nGOp hdUEskPRBg4mG21XKTbcxOpr1S0KAhPxQcUeOPF0jaaI8CWTU9MzpGzHnywj+tXje+mu 33pQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lUd/DZ8ZFuWNrx1SFv1pquV27Zw0Ag2dG5mu9q+H9rs=; fh=Mx/1U4cXvGCYYJ2ltRQejsPTHMLOlrmVw1Izk7kV4xw=; b=ogsAkkNk5oxgUtumh0wxKCS/D0ZtwifM5KJtut/c9ET4KBcH0QXRy4bkO5oZkCIt+7 G68TRkoZPkR947+xxCNlBQ+x752XZ3C740HpabHCEM1ZqaX+/QzgM2fex1sATrHz4F0T W69lexzfdCwg67B8uQh29cugtWPL7LLGHRDBAH5On1J7kG3r2owa7HcfSfenYkffk40l W797L6Wh8rfDJq5nOXOhWrbgnCObnegwrtUPVBOSUdggKRFY/tY5ystp9Nv2TbF5oyOq Uk+CKXMFo6HfFJfGLEeKup6i8L9iJ2f8HaamNDI5vBo8xd7wdJg4LnBdox0uEbgNlDBK AjFg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eP2ookY4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361395; x=1716966195; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=lUd/DZ8ZFuWNrx1SFv1pquV27Zw0Ag2dG5mu9q+H9rs=; b=fTUuLOE6ikBAZdTU96L+bofEx0a/HE+24wVrUzyt8TI0Z+VZkS53gaR3fvXST9L+4Z d2Yz0UvdyuJI7hzm8kWdkvKw++TcsM6Yg5gHOsF1oVKxnQc9DSytL0Wnug2cx/xUOxyc e/SLJ/ChpP8JN8mKE76jqzIrdeoHSbJjTevgI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361395; x=1716966195; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lUd/DZ8ZFuWNrx1SFv1pquV27Zw0Ag2dG5mu9q+H9rs=; b=glEDeAO0Xz6WMjaL7GX4uoaJ2PmlSSlrdlW9zJ4N5cFahzepoOyxok4DlRPpaDqVd8 pHZq/575b0t0d53wcdSYWI/q7JAC4whZGWecHzZ4I8DPow412/tUG9FkCLQlFyqzCf3F ElvDtJGGh6UKFngfqCVZkq6YqgbD5ZY31QAiyzU60jpq2fbjVYH0R41pJHmnEWB/GhW5 MUX/meYBdSEMIgaNw0/MdyiKAvLAPMBGjjOzD08NGSHFfC0WtLAGP3w39dXa779jJqTi KHMEwJ0bHGauH6bnojgHeC2l0lnQbQ2p44cK/JfjpwXEd7Qik/Td9KCdH20C/j7wYxXG I0WQ== X-Forwarded-Encrypted: i=2; AJvYcCU2eFhLbpZGrAbEYZW0zHYuPthETahhcHCRA4TorKnGYLQqovvWfiU/mwqmsBtabZkFSGcs49IGU0OCfjeKF4JnlfF05YhUirMjpDNGs1rtEf7T7TWKbE2TrrWbJQ== X-Gm-Message-State: AOJu0YxcZ4rrRsLTXHSiRyH7an3SD5BWJOQa39Bahr0Mn8ihTa9ucyqt cZU1OHKgcyNqJnHXHAI9/BPSE2g+6oOm8M5EYKgGi7UwVMigHv4l+mSIDzs51/J7Dg== X-Google-Smtp-Source: AGHT+IGvMueGm2St9jGe7FM+49XvuxFGnUd/o6H6vKHcKiaDMUP1JBXYKbvP59Cc61gAc39IkweTOg== X-Received: by 2002:a50:8d0d:0:b0:56f:e71b:74e3 with SMTP id 4fb4d7f45d1cf-57832c8d797mr664621a12.39.1716361395244; Wed, 22 May 2024 00:03:15 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:3228:b0:572:5cf0:971c with SMTP id 4fb4d7f45d1cf-578285897c8ls403238a12.1.-pod-prod-04-eu; Wed, 22 May 2024 00:03:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmQKHqBtD6IWxE2YoE+6CilgnKa0e1IUFcHEgOohfBt7ldxAchw0Gqy3H1TLs9CA7bJcM1cLADLrSFbLjKnmhaJHP4fuQusdwsRIcbOaAfUypq X-Received: by 2002:a05:6402:35c2:b0:578:341f:86b8 with SMTP id 4fb4d7f45d1cf-578341f8744mr552194a12.38.1716361393587; Wed, 22 May 2024 00:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361393; cv=none; d=google.com; s=arc-20160816; b=WDPaWUb/qwF4B6sHJtVUAYebBaLtlDxs9+OodUt/5vJALK7m29z971nd9KRE4gY5aE yF9koouUZmFLKxUgn1WcenYrFLQ+hacdJK7xQ1GDUh8PeORH9b55EuGS1TSft7AXwrGK otMUp+5vdoexnT8Rl93x6/S9XzUxslJPnMSnkqzYvO/vfmLeYqYQebEjJs0nClNkufVO RnxTPQ7OINFRUcV2CVViikcmackhFT6+LkAdv+5haqgY4XEhMvdEiXacL07SbPl+ETih RKpIF9N0ELZOmpVBmw/x2PuG0kn8NPLitH1JnpOfDP6mpZWZhhHlXtxo3tbseM5sIXDw Mq8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Lkt3OF7B9EwuhGCRNfvrayxVwa/19F0EY27ZYZTwD/0=; fh=o8CjuRWWTibgWgTUJIYWY6+mn6ARQP6XRE+zF4iTq0Y=; b=lquwFxGGqvoufKzFLrzy/G9xSDEJrMMp0vCRsAxe4iyDDnAWnUd+6Dp6xf4ZeNLkth KOxt7YVqPC4gO1FqrGiZBni5AIh+/ZqIUD3ehIf32sIOvlaAn2+QM+xnN5jykeHxIsxu KPspY0r57PH2B4+OCY+LOa4UPaA/87JP0O4xGjwQ0rvy8eOKQI53yurDSvwiY/TA5gOQ E0aIKKJpHMgNH6dhvjZTzhmYLcL4nkCwqlpGhZ8geozQtiStJZLhFkBjQCNHfX2RtfAx Hv45tp/9PhZnu9oai/oEC7y/82K6cp+GEAO7vXF6+602IDUdiZ3llAwlLtqBoKyWlO8n y1zA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eP2ookY4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733bea6cfcsor6921030a12.3.2024.05.22.00.03.13 for (Google Transport Security); Wed, 22 May 2024 00:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVHmto6JM27UX46lVPRjMhR065yw0elP1Tdyrh/VCpm8mL2hMCHb3ny5b2J2xbL0Z6JElCJYuVwPH+MNDYBXvN7EzKjPcyMq/RGS2luwp3x9kHN X-Received: by 2002:a50:cc95:0:b0:572:7d75:a715 with SMTP id 4fb4d7f45d1cf-57832c5b30cmr599333a12.28.1716361393177; Wed, 22 May 2024 00:03:13 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:12 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 17/18] package/vboot-utils: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:36 +0200 Message-ID: <20240522070238.3282121-18-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eP2ookY4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../0005-include-sys-sysmacros.h-for-major.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch index 5d76428eb69c..3ab201fc3a2d 100644 --- a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch +++ b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch @@ -1,4 +1,4 @@ -From 435fbcee218b37a87368e2b22fa33366875d458c Mon Sep 17 00:00:00 2001 +From 0495287f062a0cef989e02e0aee4f4329ab155b0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Apr 2016 13:58:49 -0400 Subject: [PATCH] include sys/sysmacros.h for major() @@ -17,13 +17,15 @@ Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger Reviewed-by: Bill Richardson Signed-off-by: Giulio Benetti +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- cgpt/cgpt_wrapper.c | 1 + futility/dump_kernel_config_lib.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index dcfaab9c..1716cdde 100644 +index 4d07aadac72d..6fbfb235ba7b 100644 --- a/cgpt/cgpt_wrapper.c +++ b/cgpt/cgpt_wrapper.c @@ -18,6 +18,7 @@ @@ -35,17 +37,17 @@ index dcfaab9c..1716cdde 100644 #include diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c -index 4fe990c3..abf37ae1 100644 +index c2d59433ba71..448a2f6a831f 100644 --- a/futility/dump_kernel_config_lib.c +++ b/futility/dump_kernel_config_lib.c @@ -10,6 +10,7 @@ - #include #include + #include #include +#include #include #include -- -2.17.1 +2.43.0 From patchwork Wed May 22 07:02:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3127 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5320040F8B for ; Wed, 22 May 2024 09:03:17 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-578282c81bcsf434033a12.2 for ; Wed, 22 May 2024 00:03:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361397; cv=pass; d=google.com; s=arc-20160816; b=EqiHg7H1jbmgDkmwiYKPbYDprGWE8DJPXN+zFRsFjl+i4Leh34/MZKraaKHdRy5B6f LFC8FNgWfIu94wiTP0UAl2RG6y3CmJ3bzP9H5wMCE5en7pIahSwGXiAa0MQS29PplUqx GcoqEf6IAoEY3klLXkYfwW2gtmPDwJNgRVNnbH/5NVaUcnKVAm53j3VeFw0d735gWOnG g9OKzde0Gxvo3Vc5htjOZsQP6MLnBmRpYYUdAipMFo4cA0/BObzKGpEg+aOhWF3pqYFF n+vvRTUM5cvodRah2DgaxuRhN0fg0iOk1rACtipl0L8Q8k3tSEuVfMj8NCkBw2X/M7tQ 6XuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=REl3ei1Vat7BHpA5phgnmd2V3W+HURghpuwQ3I7yc+s=; fh=DdYkuV+L42GcOL0/EgiVUIrX315qblZ/U3E7UETIIFY=; b=gGCUENxvAyQjlqvB7xmThxCFYpoiwxUvvfk18f9Q4Nrl4t69JY/wfkBEeyp6Hs4LZP s2fUhmNJCPRmkOT5d+0o57rHw4JV931+gkCOXtJpm4Z77+AvOtOyPFdputuMLItpAvXI V39vO7qLSjN5tGKxESj8MqDVAw5/i09M4gD/xEIX1I+6Em+dZ/Lz9nhKBM2wur+VrgwN /qIi+0RJSp1HouI2ary8Mj7WOcyNiPj991+sU8GgW0mBrtdAAtUVOOrMIwpDP15RzhXn TJEjtkpqROnqkbwuYXRvvUHbYCHUcOjs/Ursd8m+q37cXOkxGrZ/ldxC1wmmIeSHTkc1 S5Pw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PLek2E1b; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361397; x=1716966197; darn=patchwork.amarulasolutions.com; h=list-unsubscribe: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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=REl3ei1Vat7BHpA5phgnmd2V3W+HURghpuwQ3I7yc+s=; b=FB5d9P/2nQ6AbARlCHjF68yqH/5XstXa/HaZB2xTxuWpSJQ4tauVADZ5Aqi1JjXTZC 3+gafdsFFlJ8/UUqKXcFa3ubqOMDZcQPEOPlUqVX+L7f7r6dAui8i3Zvxgnov0B6vXp4 WogqahUPBwPFQcoVmpS/moS1BcAf3SBGcKI/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361397; x=1716966197; h=list-unsubscribe: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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=REl3ei1Vat7BHpA5phgnmd2V3W+HURghpuwQ3I7yc+s=; b=tJSd8FWCpVrIxqZ9FDtBmJB6RwRbtowRPhGCGpHGHCLekUwZVts5+lNp5K8ISuOjix MCRbf9CLGiHu1D2rwtV/nibDFoe3drTpTfMbYo9cZBMnuseDvYncYLxrQD861vT6qpjw 5JhKUF+Dna6rxdSwNe/PPdOXLj1ocGZSh1Xh4VRr1eu1RmoQr2cLIAnQIGiG696Ro0FE vRpkl4AxPB9Sty32dc4wcVOEu9To9lhPGM8iZF7dhmhzfnnZX4GqhVVwmtdYguQ0DreG pFrW2MuL0YkSozsAK4boVPBALOIKjsVEgmGtEoj3tV1PbtU7yox8wl2jOIiTx3tCEnXh +dkg== X-Forwarded-Encrypted: i=2; AJvYcCWzgA+0t/2f1XTh5yKuniJWEtFwhcaGFruLZg5X3bEIsNU+KK28BnlUk0nWVeT8aMQbYhYqVgQCUPqRoKJnmREXBP3Xyt0shoQmNo00q1RvY1QDX6opKz3ib7s+qA== X-Gm-Message-State: AOJu0YzZ7xob7+F7hFwI09KyNv37lZgEZ1aFrlUBIZnAg9vs2XpUjswN 4aP8E3rWTTP/lYnslD97FFqL1YjFpOY6e9qiPC/ajuAZGf+LoWYq8HphfCUJAVMWuA== X-Google-Smtp-Source: AGHT+IF7AD+YRao5td3YpElQcdFXOPFuZYx851oUQzFfxWUZIY8WdXzymrz1IOOqT3xIsV7O8bkcJA== X-Received: by 2002:a50:8e14:0:b0:570:d85:f296 with SMTP id 4fb4d7f45d1cf-57832bedb2bmr935416a12.26.1716361397054; Wed, 22 May 2024 00:03:17 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:3217:b0:578:30c5:90ba with SMTP id 4fb4d7f45d1cf-57830c59a78ls211709a12.2.-pod-prod-08-eu; Wed, 22 May 2024 00:03:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3sBa3keAvc4wrJFBaW2FMa+YvDne9aY7sgzNVbqAQzGXIJjF+dVMrcnGQyqKBYljNpmvQJYjRJ9enI4xqs5UuaKagrfQJF6DqB6GKQMOsNNh4 X-Received: by 2002:a17:906:3b48:b0:a5c:e372:222e with SMTP id a640c23a62f3a-a62281e13c6mr98406166b.60.1716361395440; Wed, 22 May 2024 00:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361395; cv=none; d=google.com; s=arc-20160816; b=rungtw9S3NiliLnO0OHFoC0jGSGnPjEp5wtqcCm1JgmBaE5/zCnzx3oUuoEDYlZAdS 84gbVxYQBsElZVVeQM6ZVKiYzcwvUG/EWCec3JVlJeBaD/OPUsAmA5LU/kAa6ASr8UZM wx3Dm2Qvrf51DXuFma10x8F/L7xg6IpaahaJ0wC5TeQheueR1yWavKL83FLL3gVyLHZ7 t0PLXZJi4b5PBYZ1tbtLAamz2W2MrY9MsHpicd6nl/EseeHL/dpmac4R8HlI/cSnw8kt a7tuHf3GuGMnXOfrA6VvjZBd1va8L9lNroIKE9Hhvpcj+WjI3KDr4RHfZgO/0h6P4r+t ZNvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jKiNYT/2fEi0ORe09gfjLGCr9wdhiNnONIilSaVRxfM=; fh=YMcwRTCyHGM9FClsaq+JfRJG1qYkmtkf7crWhsNWTuU=; b=d1YeymHE7Yyol8zAjfH8la6idmczdOSaxoaSuDn3XlAJifGzvqAWEw/NZf1g6JrMjY AxwePtR0q2/jpGwQMJCRnnygQYou56Pdn+17TZxmlk9TP1tezPvYy8wVMXUiEtJMU+V6 +hxDq7jMT9LeKGAeQKT5T6Z/pGjWr3rMOwA5xF0Jzg5UQEYipAE27fJFLtaQSrVVfslx 7kT8LnKyx6teLCy30UtldrchChvm8elL4kOiuaX+2ig9l0yg8r9D9L0ktgmPURkZ+8eq Q1HFnDorzYpWhPxxKDmZLpdmwMiZCXCpA8tyw0Oz58F7a/57oxYCdrBoeNZN/0O2t/R/ 5z9A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PLek2E1b; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a5d16784bf9sor241095666b.19.2024.05.22.00.03.15 for (Google Transport Security); Wed, 22 May 2024 00:03:15 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVb74Jv0+/dHYqyxTYL1YG25j0cMTeAmGVdOTGSLqzyQlSW+GMCUAR/cE/znO1M6LxnJB9zLwM09UwbuiM336CwyOIBjyHUGbM/gKGGCyrRY2kn X-Received: by 2002:a50:8acb:0:b0:56e:23e3:bdc2 with SMTP id 4fb4d7f45d1cf-578329fd42cmr995312a12.13.1716361394972; Wed, 22 May 2024 00:03:14 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:14 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 18/18] support/scripts/apply-patches.sh: set the maximum fuzz factor to 0 Date: Wed, 22 May 2024 09:02:37 +0200 Message-ID: <20240522070238.3282121-19-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PLek2E1b; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch was created as a fix to a problem that occurred during the compilation of QEMU: >>> qemu 8.1.1 Patching Applying 0001-tests-fp-disable-fp-bench-build-by-default.patch using patch: patching file tests/fp/meson.build Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines). Applying 0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch using patch: patching file softmmu/qemu-seccomp.c Applying 0004-tracing-install-trace-events-file-only-if-necessary.patch using patch: patching file trace/meson.build With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test does not report any errors, even though the patch itself is no longer applicable. The only noticeable message is: "Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines)." As reported by the patch man page: "With context diffs, and to a lesser extent with normal diffs, patch can detect when the line numbers mentioned in the patch are incorrect, and attempts to find the correct place to apply each hunk of the patch. As a first guess, it takes the line number mentioned for the hunk, plus or minus any offset used in applying the previous hunk. If that is not the correct place, patch scans both forwards and backwards for a set of lines matching the context given in the hunk. First patch looks for a place where all lines of the context match. If no such place is found, and it's a context diff, and the maximum fuzz factor is set to 1 or more, then another scan takes place ignoring the first and last line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. The default maximum fuzz factor is 2. If the hunk is installed at a different line from the line number specified in the diff, you are told the offset. A single large offset may indicate that a hunk was installed in the wrong place. You are also told if a fuzz factor was used to make the match, in which case you should also be slightly suspicious." By setting the maximum fuzz factor to 0, we avoid that patches which cannot be applied are incorrectly reported as valid, with positive side-effects on version bumps. Signed-off-by: Dario Binacchi --- Changes v1 -> v2: - Use fuzz factor 0 instead of 1. - Add patches from 1 to 17 to adapt package patches to be applicable with a fuzz factor of 0, ensuring that this patch does not cause regressions. support/scripts/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 6da83f6826e9..36afe489f2ef 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -114,7 +114,7 @@ function apply_patch { exit 1 fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -F0 -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1