From patchwork Thu Jul 4 18:44:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3169 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 21A1C43CED for ; Thu, 4 Jul 2024 20:45:09 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-57cd2950eefsf883265a12.0 for ; Thu, 04 Jul 2024 11:45:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720118708; cv=pass; d=google.com; s=arc-20160816; b=HelNMrtG7DBLReldluaX+cKVw5KrWVI8gxMv4d31YbeHE3OctjE6epHVsmgdTl+v7o RIo+j8Vxn1IPk1wriHgoAQsLDw6ULeCnwDnzvkXVpG6A6kc6IqkH/a2cQVm9ihaYU3wj HJ467cHcE5TwsAgBHDLVGshwHG5ghLCnxyiaH+cOPufuullcwSxrRKG/im7lUU6m00qN J5QC6GgU70UOk5Iz3LQg0MQGYQBVmEBSGn5ElUhZS2LMv9CTP1ljlzYsBFPmdFotFHzy RLlIa31Cjt9cQEoishOBpL3XQeTBYbyL+lsxLhg7GDpXttRncLTY1dtv1QPZXRdqcNnJ 2KHw== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=trfylwYTqCVENU3TpesqApS5M19207iQuf7nWF3Pcis=; fh=7JD/AeopWDpP+QNAIGjasrjQKh5Gju0Q9xPcfIgJ6SM=; b=UujbERsp6aEk2WljKNLHvT6r7JWTIC/Zg26Evpgb3HgasWRSYzSttK5x3lwL7ngjAQ gp5scFcMe7Ir2ke0+FvXY/d/g1lGBuZaU98GIGBTjDQq9apEQrSWyDXQqPX/N64EWYl2 kZe0bULkSyJUqwxI989Sv2ctED71QmvNED+dYDU/epv6zTnCoHYLDtuIJfsPhkDi+7IN F+eqC2yzDKKoA/s4GrP+27rgLod3tp2N+ZhWBEe3KZnBxf+k3Au0oe7xsGluoxaWh4TR HOSDDlItCTkuF3RfwrgeTX4EPnDQ/SzbCangKsujurZS6tZKV1YoYAEbJRaaAAVBoRsO RqiA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=l9EmjWfD; 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=1720118708; x=1720723508; 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:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=trfylwYTqCVENU3TpesqApS5M19207iQuf7nWF3Pcis=; b=E4iMl9LawaY3S2qrlb9Y3/oV47WlAk2QgSazChn2WmcB39WtaJjmZGPY0FXqdqOCRp JD+6c/LM9o+T4xrnyZZ+d52CozFqZrJVLwyO3wLLSOZPbcEounNsQ6ctDKDwlvwM+NHn U2dZ8h4ZNtC5E7to9shp8hqlOz2GwSKQZz0cc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720118708; x=1720723508; 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 :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=trfylwYTqCVENU3TpesqApS5M19207iQuf7nWF3Pcis=; b=CK0FefcAslgIflAasE22iF3Rmh2kMf9FYdVOJRSYOOhn8E4LGIEkoqRgdqrfH45kq8 KqBpxJCJuArLwYmjxBgPFtPukE1zgRYKzo0yD4mH6132rLcf1zYyaHywAwIYFnEVuNYk qbcyw9Xu95IKjSy9QbgIU98F9QE9wfBIj7DVyNogxRbBIfQgpx8vftQ3MqHO8RP/pvib UEKteybgcuwLLHD4XywogJLQB5UgpWNsSmekAxQ3z0aHwnYyUjnjlfeYBKhx1RJvuaBb d02Klpb2wsFQ6SNu3HqpCgUrx9a1RPUYn+ESF8ogidKt0esg1wk4S2ObQLzQLNHx7dbd 3KDw== X-Forwarded-Encrypted: i=2; AJvYcCXCZAM5lN+wlDivSuTNd6m8x0azNKOBYnvXDUzyQ/PJ4BDVKko56O18aLOPMgYjbX6rFAicdmXNC5E7VI2NjExjGbC7m4Y/AfnCXmKzsTN4f7S4KT5W8PSq+A+4zg== X-Gm-Message-State: AOJu0YzmWAx8JOQW1eHfXn0BqpL/BmJHK/6QvKb7gQ1wVMTkm+n4jPno OdqeIAPtL2El5J3rjxgc16nQJ4/PxN9rgBTp+Fe0f/hO9AcY4ppKM763LH5At2TbNA== X-Google-Smtp-Source: AGHT+IF4xJw8qxJmGL5WGLj4Veg94NvzBinWP1/KFjTCxvY3WsX2RiFdj2hLX5sGBx65v+iNC08hwg== X-Received: by 2002:a05:6402:26c4:b0:58e:3501:5c0a with SMTP id 4fb4d7f45d1cf-58e5abda77fmr2054412a12.11.1720118708490; Thu, 04 Jul 2024 11:45:08 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:34c3:b0:58b:b493:fcc9 with SMTP id 4fb4d7f45d1cf-58e2047edfals534374a12.0.-pod-prod-03-eu; Thu, 04 Jul 2024 11:45:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX63j8aFtSMXraWFWOp2K5IV22HJkFmTngDqiJQ0jAblxSBZJ83yHrdxuLCja+qKiEcImFq2omHTzJ8hC0DOM+sqT9WT7JF4/+NxtXT1cJR+4YU X-Received: by 2002:a05:6402:35ca:b0:58d:115c:f529 with SMTP id 4fb4d7f45d1cf-58e5a6ee3f6mr1584280a12.7.1720118704853; Thu, 04 Jul 2024 11:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720118704; cv=none; d=google.com; s=arc-20160816; b=YM7xLWyqYl6Y0i2eenP+QrAHlGzXH35H1pgT+jyk35wUQuWxswgz7RB3S/qztXWCc1 22lS79WpHYRyy5Wt2yiyP5bM22uoyF8RZJOldOJox5LKHjxX2j7IUCg83xX+gK2t5cGC c5yjLgc8VXl95cCl/2Zufwr0BmMF4rLEIchiE5pj5MjKv1jpZuhlwvIDhWWtf3oVwxbC C39N2zoRKs2+TzKH7fJzb73HCCwGLKhcipyCTOTC9bz2U2SMBnwL/zSA8N6dUY+pCmFD RS5hI38UpzMYSRXcf9RpfBqz5CwYU3CmZsUgtxxRWJGlnCXgdpC0EGHR4OJ6LyJXroot N0Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=cxcAuIkjMWU02vv28vQr/NQic9wWR/0RqQUCFHm93tc=; fh=gMWZgNzQnL2DpBgZ8dWXprKD7B5Tx9eEf4JFumqpcRQ=; b=acRZH9+eLc0ZSCc7Fyyr3uem/nZn3ddmHWF/nH8CNwNdrqHds4jDuFFLWgx8xbt/gJ ePNxei+36vIHdhu07liXL8PxkKA6InLuxnOi9O+4u55SqaGHTiSo+TKqmM/Z5oWRPe/5 Mda56LIRSfP/S2otCUEZRVhPE+4FHtw7R25nFf3yn6Q8zi2TodVxB1hqdub9FF2ApTtP U9aLjM5qaI9zFZrOspvhVzkUysQuzJTiZ5HyE5HRfHK4egigFjJvQsdv2Iezw0nFEACP wGEdJBx4v5HdXFJVb7RBtLcp2mc0bTL+O9fXWQATL9TGoPZduQcc9eik6kSszDKgR91s Nd7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=l9EmjWfD; 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-58c057c1847sor1775413a12.12.2024.07.04.11.45.04 for (Google Transport Security); Thu, 04 Jul 2024 11:45: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; AJvYcCXASDgW6rtsBU/DHK58K8zsnGk7FJTWO6sy5kx+jaVIsMeVI3VoUBwapG52GQmCk1dxtoBthoRVQlcVefxD9Upz+Ix/VIKA1VWVTYru5+EreRN+ X-Received: by 2002:a05:6402:5191:b0:57d:6326:c658 with SMTP id 4fb4d7f45d1cf-58e577fadafmr2352932a12.0.1720118704318; Thu, 04 Jul 2024 11:45:04 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861381868csm8654667a12.55.2024.07.04.11.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 11:45:03 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/nvidia-driver: update the patches to be applied with fuzz 0 Date: Thu, 4 Jul 2024 20:44:56 +0200 Message-ID: <20240704184456.2970034-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 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=l9EmjWfD; 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: , Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, nvidia-driver fails to build with output: Applying 0001-use-LDFLAGS.patch using patch: patching file kernel/nvidia/nvidia.Kbuild Hunk #1 FAILED at 87. 1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia/nvidia.Kbuild.rej patching file kernel/nvidia-modeset/nvidia-modeset.Kbuild Hunk #1 FAILED at 70. 1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia-modeset/nvidia-modeset.Kbuild.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- package/nvidia-driver/0001-use-LDFLAGS.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/nvidia-driver/0001-use-LDFLAGS.patch b/package/nvidia-driver/0001-use-LDFLAGS.patch index 7b7df8098832..9ce237f9595e 100644 --- a/package/nvidia-driver/0001-use-LDFLAGS.patch +++ b/package/nvidia-driver/0001-use-LDFLAGS.patch @@ -17,6 +17,8 @@ Add use of $(LDFLAGS) when doing the link, as the kernel provides the proper emulation in those. Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Issue reported upstream: @@ -25,8 +27,8 @@ Issue reported upstream: diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild --- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild 2016-08-09 01:57:50.000000000 +0200 +++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild 2016-08-20 12:25:02.780233423 +0200 -@@ -87,7 +87,7 @@ - always += $(NVIDIA_INTERFACE) +@@ -93,7 +93,7 @@ + always-y += $(NVIDIA_INTERFACE) $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS)) - $(LD) -r -o $@ $^ @@ -37,8 +39,8 @@ diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-3 diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild --- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-09 01:43:19.000000000 +0200 +++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-20 12:25:39.596772662 +0200 -@@ -70,7 +70,7 @@ - always += $(NVIDIA_MODESET_INTERFACE) +@@ -75,7 +75,7 @@ + always-y += $(NVIDIA_MODESET_INTERFACE) $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS)) - $(LD) -r -o $@ $^