From patchwork Sun Jul 7 14:17:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3194 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 47B403F1F3 for ; Sun, 7 Jul 2024 16:18:05 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-584ef6c00c0sf6322340a12.1 for ; Sun, 07 Jul 2024 07:18:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720361885; cv=pass; d=google.com; s=arc-20160816; b=vHLR7OEHimxqjfbx7vgI+JdhYzmK+pEvDQsInn/KFv8fL3neXKxHtKm6t0ZAfKwEBA whNale3CKMJjmPt8oZa3S60Duo90MNyWbKrVQtFrvG1hxEYahN8824oWFlvAqaSVjfdE aseXCzJTvDtOjtdmJlrzpNTFNU3AFnEPwBijfX+PhjgfkPDbMxyYwFMb6vIKSnMAOBs6 nG7/lS5atlQc3pEka/ZdCXIACO6lu/cL0PrbLWOA539u8PE4WWxYL7myerc7RLy+6QRu ZSjzGq1FYs2qK9ZKqeViGm2pZhNqtjm1raB8AFKWYwJpOvQl7eVRWpj3LCVLm1ovbcmg aj+g== 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=X3rT3cath8os/FbRQhGlI6WrquHWJzIF2JNQ0zUsvLI=; fh=//U4fIXFSxX2A1YBL9+gIvQtF5cFPvFV+zEHvpTGJug=; b=S6h2sEe+rpbc3J8BKHbnAu19jjPKnaFqbndeCXNi56ByOxG8UDYrFBNmMDyuEF1TBv Clkzb8boCJJ8U27AfNLyUJnCq1XJ4+1S57bRBhzMfPQNds+DMHAsVkEKna0edyxWuwaW Bipc681EQxq0xyd/6TS0kw4VQUwn1Jey2hym7HiP4tfao+Svk6jDPmDOuVAr4Hvuo7Fn rnjSU+fduPE2qfQslwjCqnMcRZG2wM9De5oNA0Q0TEKWkMKTfqiV/7jG/oKjzXmGNDN5 1pelmIMHGxWDZHzsqIYSW4mtYLytYt1agqny5YApxLzi5u7jO8EUGJHhZ+1j0lRQTZrd 4V2A==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mAOHIMBr; 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=1720361885; x=1720966685; 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=X3rT3cath8os/FbRQhGlI6WrquHWJzIF2JNQ0zUsvLI=; b=lJOUFypR+6hl/XjEt4HH0l4APyCcrEAbcYvIHV0QkCJMleaxoz1EweETSoCbbH6lIU 42CQIuqs/R3cvnRQJDnNGSEKvcMTgpCUB1rJNRe49L8TG6BBHXrMdSvYdG/cd885XrXI 5cKDyq+cxRFqNdXXrs4j3C6kfAYIMvhuvCuvw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720361885; x=1720966685; 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=X3rT3cath8os/FbRQhGlI6WrquHWJzIF2JNQ0zUsvLI=; b=Cl31izQDXUTpqESwRXfRyw7QiCKCSyxZXUH2zJ7A8nLbNY9T+nFlxeZPQkkQ8oJd6x v1OEVRTA3834SBionHVO/AzVxG7U8/KuWi6zcvUMjJjneBOOi6n1PO7usEWOWnINbmX+ fR7RAMU8u8ZJ+T/gPXEF/bpiLG8azCygaFYWA6b9q249er/HbkKpG3wMAKgtUA7DaNzh ytH9snzp4XtrGAzF2uo98afEFgtkoWfsjBCr46LgVKBuB6OkU/qkdfKS/3YMrVe/Bwh2 ZzhJAEarjzpVa2hfCQTQmTeQKpakGIxLDqywhK4THq2ePFJG3aOeMckjxjpJsFEaxlux F1SQ== X-Forwarded-Encrypted: i=2; AJvYcCX1X3yZj4iIHYAa19V85sknDRPAJDOOWC3SO3pV2zWZBAUX8GVyalPPip5g3BDejJK7s2bo5iTVqiRyDX0di62tNxftLxrxXlcWoi8IyASpf8Pbk5MUBsa99GzGYw== X-Gm-Message-State: AOJu0YyjJUif4v4Dku9D+uXsflTzt6jGQR2gU9kliwsPv2YKesEQX0oI JBl/2MzMaJruBpkU8BwlQq2FxV8ur5R9YnlyeL8rb0dsXAT+ddKP+DPw13xdGSSOTxcrVJXNQA= = X-Google-Smtp-Source: AGHT+IHcl2xt3ObBBiF48R2jJZGQMxdAe5VQeAOk5l3OTXiGV1jJYRHNWK8nTJYHa8IdIR7zq6nDNQ== X-Received: by 2002:a05:6402:2806:b0:57c:b82e:884b with SMTP id 4fb4d7f45d1cf-58e7bad94d1mr7322547a12.19.1720361884716; Sun, 07 Jul 2024 07:18:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1d2e:b0:58b:d414:30d1 with SMTP id 4fb4d7f45d1cf-58e20380b9fls1800067a12.0.-pod-prod-00-eu; Sun, 07 Jul 2024 07:18:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXcRwVpkfFaLAenAZ+wyok9qWykUquZoR8+TeKRM6JkxCZz4mQgRZyypgwPumS/zkXk/6YXV1IAkxDpBi2Tm2wDHhGnf0Ezds5yRUDZOdSiC8pa X-Received: by 2002:a05:6402:518e:b0:57d:d59:461b with SMTP id 4fb4d7f45d1cf-58e7c29be71mr8421396a12.13.1720361883036; Sun, 07 Jul 2024 07:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720361883; cv=none; d=google.com; s=arc-20160816; b=xVhAsfNxcrfgQP+EPcIaVPTXP5lsqriOpqfHpugxi+gBWvk/q/pEtsg5cBPY1gYI5O 0kw3t9z3/SkPZDVR5+yfmHYcm7wHzrj4SDGIatpdJlJuhei0I9DHdn1PDouLkFOw7VyH F04bpn4tzAI/JQgXY7QSU4nXDYE3L1bnbv0hS8Ej9Y466XxNyu/LreEZScy5Ebtuldgh yJ4fLlE8HtvC4i7s1ffV05Md+AjHK8PRHTLtSjhOFfNlPDS3uWSi9XnAc9Fq5KPI2iDb jRwIpyuEEFEvWBlQKzCfVcFPhhzHJkxQawa40jovgUhXbCrDOPQF+JcHhukYJQ9aWSJs f9qg== 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=1mt686jrLzJsWPoNhb9AcjXrHvoJhbMljU7L+AQl8F8=; fh=EZ6uyDA3WCMKg7nWGjlllPY2OHUif0++NHN2iOZ6BIE=; b=kkVxYLRQ7v5HP3W2sAu59ovSqNAlW9NzYs2kHhzfUhip44WhZxBx4WOgxY0hqlzfGU 8IHJ6rHgoOAaTaxTMWPBT8S2zUnY0YlCeKg3BMILcZ9Q2gPsP6TU0r/WKBLAuijPiEvo nEpvPdVdM8TqnBu/JmbB57TtL/PYGg+CF4xe0fQGdS+Qq6dbq1DU9PzuD6dyrRJ33yTo w9dILd24JKQWhmxvGkgWGN/wz7Oj9Zl4unSsE6t6ri0LMqmY9tT9c45aMNAl/AbpYB+e RCNSwcFP1YAOJg8hstCOCjl02Wa1f/Tp6njjaQsbeeK8dPrdzjXP3zot4UltSOh+3ORB qKnA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mAOHIMBr; 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-58e44fc193dsor2413519a12.5.2024.07.07.07.18.02 for (Google Transport Security); Sun, 07 Jul 2024 07:18: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; AJvYcCWbs0sjc5BLeuD6rwj47d5FxM/rz2SPik1qetrWkxUF3fgnp0exEyrFQHr94//aFyoF0wOtZm9TZ2KXtwIpkNu7O6fauzcifbfHQnFjdtIkdDHi X-Received: by 2002:a05:6402:254d:b0:57c:a8e5:35f0 with SMTP id 4fb4d7f45d1cf-58e7a74d34amr8230401a12.2.1720361882384; Sun, 07 Jul 2024 07:18:02 -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-58dfd5aeda6sm4550516a12.78.2024.07.07.07.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 07:18:02 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Karoly Kasza , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/openvmtools: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 16:17:58 +0200 Message-ID: <20240707141758.126043-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=mAOHIMBr; 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, openvmtools fails to build with output: Applying 0007-Use-configure-to-test-for-feature-instead-of-platfor.patch using patch: patching file configure.ac Hunk #1 succeeded at 940 (offset 142 lines). Hunk #2 succeeded at 1150 (offset 86 lines). patching file lib/misc/idLinux.c Hunk #2 succeeded at 1022 (offset 28 lines). patching file lib/nicInfo/nicInfoPosix.c Hunk #1 FAILED at 34. 1 out of 1 hunk FAILED -- saving rejects to file lib/nicInfo/nicInfoPosix.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- ...ure-to-test-for-feature-instead-of-platfor.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch index abbc5183623c..f10e74e1528f 100644 --- a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -22,6 +22,8 @@ Signed-off-by: Natanael Copa [Retrieved (and slightly updated) from: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch?h=sumo] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 ++++++++++++++---------------- @@ -32,7 +34,7 @@ Index: open-vm-tools/configure.ac =================================================================== --- open-vm-tools.orig/configure.ac +++ open-vm-tools/configure.ac -@@ -798,6 +798,7 @@ AC_CHECK_FUNCS( +@@ -940,6 +940,7 @@ AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt]) @@ -40,7 +42,7 @@ Index: open-vm-tools/configure.ac AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1063,10 +1064,13 @@ AC_PATH_PROG( +@@ -1149,10 +1150,13 @@ ### AC_CHECK_HEADERS([crypt.h]) @@ -72,7 +74,7 @@ Index: open-vm-tools/lib/misc/idLinux.c #ifdef __APPLE__ #include #include -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,31 +1022,32 @@ static Bool IdIsSetUGid(void) { @@ -121,8 +123,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c =================================================================== --- open-vm-tools.orig/lib/nicInfo/nicInfoPosix.c +++ open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include +@@ -35,9 +35,13 @@ #include #include #include @@ -137,7 +138,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c # include #endif #ifndef NO_DNET -@@ -348,10 +352,7 @@ GuestInfoGetNicInfo(NicInfoV3 *nicInfo) +@@ -499,10 +503,7 @@ * ****************************************************************************** */