From patchwork Tue Jul 2 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: 3139 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 6B6523F102 for ; Tue, 2 Jul 2024 09:02:46 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-58b92b79a46sf364970a12.0 for ; Tue, 02 Jul 2024 00:02:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719903766; cv=pass; d=google.com; s=arc-20160816; b=q9C0I5iYMV4Rwel+jw2HJZeBCQAC4Z0TAupnmnzw5Saz2NmN/2RpwXCwj/rsuabuub WoB4uJZ2//4YdBGOQy06sJyYy9CaOwDf88jRHoQa/QUE0htaGzzKPqeiblFRBBmRZWWn NwtLgFHqkU+9tzTX2326CfzKJYKR/cQ+y5lfRXw7Wp7BopfRKZvtkVaW6bmFVvqXyl9z nHnc6UDDQqR+4LiSjZD2zkNXvG/VhE23UkO/bIcrQHEI9yzX+QoEJIxrCn7ldHaIbj8y fNVPRxpEz/S0PwuTKuYatmY40arTHrEQdaSysrE9CaHQTZBaEtzj7SllvsbSaUyojVDG O1IA== 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=Le6FL2iJliZPW++eTwmNFwGMylDOYHDFgBnaySH/MW4=; fh=yoQDyDJY9NegP1n9Q+pASwQkNVwamoqUb59prt2eyyM=; b=f3eP3Lh7QrI6g7sTru3Nz7USJEglMs9CYH3XtSLGC0rHeKa+J5aXsE+F2Hd+9kxZ0Z abGbHrHkqq2xA8s2G4FDLjYZYWR/hzxfVJTt+p6QLeotBaZJlANKhquMK8vzp4hxUG9E JEWTwYU3Ys7LF9CE0OZB9hg9UDYM2WD+Pr0iNz1t/3aDtxPsf4g4RgMmBafPQbDWBTJn pu7SKGBIQSXlnklW91ubUsv6ZwrgFObbdugCFAXttfqgx14fzJbtMYnA+NHmLSTRHV0w 8W6MTcHsB+gV+ighO0VwDHYbWKLGGDvQJ0qhIpejFvKrJsyBmnggy5sm/bPsdXD3i/2L 39WQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lBq8JVdE; 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=1719903766; x=1720508566; 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=Le6FL2iJliZPW++eTwmNFwGMylDOYHDFgBnaySH/MW4=; b=hCSpJ3zNYO6bdx5qPw0RQsAdB6u6mpa5wW/ko9QSDh+vS4tmmk/7e5KI6HJQ7we1f9 A8Uq4w64093kbEA9bvG/g3mETnoX2GSc5JdLQ8ex11SX3hSims/Sh8Jxh82TUCfG+w15 8tSQ3NqUTQpYmNZBcVTBsccr9PD5q1ga9w3MI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719903766; x=1720508566; 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=Le6FL2iJliZPW++eTwmNFwGMylDOYHDFgBnaySH/MW4=; b=qH6HFF/kMuuhPkw+LnhCRtKm2AkgDI3MSDL6Wah28hN9CcquYH96CcE+bdzNSVHx9F E7hPOg5Ktv3kCiLjwMngbseMOaM/V+C1RYuvHRQDHQB1dmaAFfs0X/hmu8xz7rytsn4S JO29zw3wlWA0aNhDZ0Mw/kuW9NouoLj29IHBVABDwXVOya+WhPsEGtvIxiwdMj2TPs7k 9PmrzvOa3jTuibUNh/zgtDn5HHCahhR4N0Nj4FSr85H4NiqiLUepObp6JOhb2+6gXZVb Jte2XxiCcSSW6zKfX9VfTzMFJLTXs7tczNcDlCkIe095hL03MrAMkdlXVbzUstJrQU9Z xbBw== X-Forwarded-Encrypted: i=2; AJvYcCVZkrzoeONM+HbvTDQ76ti/WV04ylv0PJg3ogH3wQ4ULzgxaM+YLA6qXO2L+flkkfjgU3UQoCwiCttYtsqxytmzEI4jepflm2BtophO4Yt9t+CXdwF63HEsWm+kDA== X-Gm-Message-State: AOJu0YwDNBXvLgY8EdmZ0zEUqOcCH7Rqc2bmnRT5BGsSNYXjbvotbCDt RabfXblJZZ2k+OFYsnp2z+hBPDyaMJp7zlFr70RWhdXgcl86s0TLFz3vNahiaTfg2A== X-Google-Smtp-Source: AGHT+IF6UNjGPHbXi06CfAxoFIAvpXiACQU8REOMVPy4eeSxs216txOGlL3kfiAyVWBnzhxTYJSzPg== X-Received: by 2002:a05:6402:7c5:b0:58b:4a7:2a04 with SMTP id 4fb4d7f45d1cf-58b04a72a66mr1245737a12.20.1719903765702; Tue, 02 Jul 2024 00:02:45 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:cc11:0:b0:583:9e8e:cd8c with SMTP id 4fb4d7f45d1cf-58628a13d80ls2740670a12.1.-pod-prod-00-eu; Tue, 02 Jul 2024 00:02:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnmAQesHIdO/62+iRemORGbmRKhUz9M0CifERP00saMfBAuZp1ospAuBFVlji+IFkRcVgBSTTKnrurrQvtiZkjb6aj+by4U9JHCYpNwVGjr/0J X-Received: by 2002:a17:906:1753:b0:a6f:dd93:7ffb with SMTP id a640c23a62f3a-a72aee3d06bmr722977466b.1.1719903764184; Tue, 02 Jul 2024 00:02:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719903764; cv=none; d=google.com; s=arc-20160816; b=Tz0hntuZuob1Zwx4p33lRVNOmcrhkRkqIJ7WyZa5jiXoiJpx46UR/BiksN3xBFAlVQ vDReVlhNWhAsHWIVt9SW9yB+9VmWI7e8zV8lQqejcF9/aEruW6tsSlkM2cYlVrQXm2Q4 dleAXaRGi9Bqg4Zm6SGL4Ws/80LqbpREWju8SJ85BBc2CflxacBJJTNPrDRCi0R9spyS Yz5iCgP6YtLQFMYCZs386B5ahwglkL+PSaAE0XjN9POVbtI1aY0VPCwOzJjJkxOj2urG zrccYZQ40wNjEA868MdfxFHuWB2tgHcasWJtAajBRV4EYEqrDkDYvukGEnEvNRvuYrzs OGpg== 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=CHwxL5YxO6W+DUY+O5qe5gEM1w1oj7tyfwdght8WNhE=; fh=nusZ44VxpGZSRmRxmqiUuH6VPQ7+3q6qESShOXXCi04=; b=Fjg/kvigHGXZ4uCxZzGeTYf3iXhZrrJ8xNZmkiCBpe+AHSqwOU7e1GXhh/4ixrWCZ5 GubIkBNFBIx/deYVcSwxRm/eyrtPwTCsbBkBhG3YcimeWhLgxbxfGZ6rXMd/ayd96kJT Hfl/o68odfTJjMCYQVFnuT4GpM2XXmXtozN980/5BZFNMWq7fFK447ynGXpRacuUqQya TyrXAPGCIX+Ltdpx1QA6B1Bk2B+ALF5GJV6ieu1GUApa08WuVcc2/bikHURbVJs6SuTi NNefC2lOWO93xlCiWQ8Ehe3GnjZkGcc47qrI2uPDhi6VbPWnarIN4gWiYmaBTIkT+Z7q 1Pqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lBq8JVdE; 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-a729cd21734sor428066866b.8.2024.07.02.00.02.44 for (Google Transport Security); Tue, 02 Jul 2024 00:02:44 -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; AJvYcCWWdwNwYzoElU9w0cRdU3FVQ0yTr2xD/ZNIii/pgy/UR53M5OTA70q/nO6JielovuCxtNlZHqzCl97Me1vdXXRgb31yL23Y+KkXA85vh7MSB8R3 X-Received: by 2002:a17:906:4e81:b0:a72:9ebe:29da with SMTP id a640c23a62f3a-a7513953df2mr508240566b.35.1719903763667; Tue, 02 Jul 2024 00:02:43 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:c733:f73f:670d:ca47]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a750fb362d4sm282567466b.49.2024.07.02.00.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 00:02:43 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Julien Boibessot , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/gpm: update the patches to be applied with fuzz 0 Date: Tue, 2 Jul 2024 09:02:32 +0200 Message-ID: <20240702070232.2373630-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=lBq8JVdE; 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, gpm fails to build with output: Applying 0003-src-Makefile.in-Really-install-unversioned-solibrary.patch using patch: patching file src/Makefile.in Hunk #1 FAILED at 115. 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej This commit refreshes the package patch on the current package version. Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Signed-off-by: Dario Binacchi --- ...efile.in-Really-install-unversioned-solibrary.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch index 259180197696..2105bbbf6a0c 100644 --- a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch +++ b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch @@ -1,4 +1,4 @@ -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 +From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 17:59:52 +0100 Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary @@ -10,22 +10,24 @@ which created libgpm.so but failed to include it in the install target. Patch sent upstream: https://github.com/telmich/gpm/pull/11 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.in b/src/Makefile.in -index 7e9e2ef..bca226f 100644 +index b63e4f4489bd..a1838c300312 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,6 +115,7 @@ install: check if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ + cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ -- -2.7.0 +2.43.0