From patchwork Sun Sep 15 12:51:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49076 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EF99C35FE7 for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.113766.1726404739169961867 for ; Sun, 15 Sep 2024 05:52:19 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYMsZ018016 for ; Sun, 15 Sep 2024 12:52:18 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41myq1s1y6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:17 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HTqzjaIIJ6iUVjK3LoVkeVBcjIS3TcVIv82M6vqTsWiup87Utu7uuRD8lB2HbzAkbMrjDXZphFwuokN9GRdmPDyQ/tQ1xpmgGmMXY5/Ey5se3bzqYD8MQYppbCIHrS/zBlad317u8dkupeVjnVZR+xLocrwak6nMCFk6qY4u6stkGek8GD/rP2gwJ+3VxgSnZ1tbv1M2W7C8DnEN/bIQfs6urrhbMqzn97GQEE29+Es8xWicmCNnncFqXGehXlyQPolnHlxKkR8H5DiO44UZcFCA+Mq9Grzzjs6mRcegu85sjRSxVMeLP7vtLSKhayu49F3hwO9mq9BPbY3J2XHPSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/4tdG/6DU/gI3Y07qrBVO2r9YTMaVKh8UAuh6fkbffc=; b=Ew/FGCtEhFfmVYnbven2eHmPMrRcFIHpPBYovOtySwfMpCOQX4PwvzL/hOdvnXBHn3W6HokM1XZhvq1JWTICR98QkEwFN6y2O2w67csOg3W0IWzc30lkzfjyO+LMWa4E2RJjMwL7hZ6BB571FMFtmIxU3MrLDKrDjKI8w7tTgknboYlkVFZWG1baJW4Gltq/OqkYbgwZdE61273++0LpdzLUsV9YIJyfVd9GmQvvQZilFdARfRdT3/nu/GkF69AJGYI1/Ae8SSrnNbV9T0yQVPGsahuqn+P0Jr3WPGzKX3kJCp9QAdNHBJvtfwer/MXuPTHcxWH5w4tfsTNhdAt7jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:07 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:07 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/6] fltk: upgrade 1.3.8 -> 1.3.9 Date: Sun, 15 Sep 2024 20:51:48 +0800 Message-Id: <20240915125153.2940806-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: e8d0244a-e93b-4066-fe01-08dcd58534e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?2ExjJq+yLBc3fyNhYGTLA1XfRap62f8?= =?utf-8?q?5zCsHgO8AWwuzNJ+hWRAbC3TIHaRhhm0gBfmXdyUmIGuHdEbP955VvE9Cz8h2+sgF?= =?utf-8?q?q0aJc5DPzp33g+DSY6BfxLpHuyLImjybIbzWYBNMSJtpywkl0UfrF8diptQUP3/yS?= =?utf-8?q?6obiBhL3zDnZ3YvbwM7RL2o/ljDrOtfScMBsAoUteV1P+E9GjelPgdy06EO9sLlgj?= =?utf-8?q?E4D529ROreuN1G0a//iQEAd9XZniiauADM0LBDYpKrSCFzfOtx7AIlKfhmArk3Cpw?= =?utf-8?q?AuFQoiP5keyfrVc7Zh23B4Z61brayZV+XqcfV4CT7t/+Z/CMmHCW6gRv1UndwiQ0b?= =?utf-8?q?VCvV2t1NYH0WX37Zof/OOS0TlgrAtAdKjMbboQjeI3Ijp2Nzg46Dy5L7/QbreiA/J?= =?utf-8?q?at2MBxZj4zUrW4vMCvAwrPakQKSqY7a57J1x0LUJBu/8Ekh9J0L8TcrYQ+yMaEhIx?= =?utf-8?q?HJq7VSP2/m/rCDvyJkvTNbvS6RI4TTvxQAsJxOlPdx3t/+8014w/ExQatOAIu7buG?= =?utf-8?q?efy3K5t74DAK/gmIL5N16XDmPowNaT0ccbJklo5CgirDlJgFQQqReM3pj3v/Xddi4?= =?utf-8?q?pbC+CdbaGySy9FZ7j/PNQc4DtIjjIziJE6yoPa7aQNsujqSq5C1gRxeKMDhI7AKds?= =?utf-8?q?I3OoP1+omldYygyyDzEwyim38Qq1LCd2PgyvYvfsWqUH1WWw/956zF9Cq62tl3rK4?= =?utf-8?q?LUmmoFIF06/2GL3mCQnCnijv6dRKetNrJGxBXGqRoWa0mUrJtuN/HZdFNGbnAQKBE?= =?utf-8?q?9Z7EZQUNMrzzN4M0+Rarq/ggnda/6rAq2AfuzZ9Jgkc95wRMsquUWZMYmTHMKO/BO?= =?utf-8?q?82qZg7v3AtGYhOids86RW4w3A2/Ax3zxbTfxychQer05NahxqTFvNtjXQnvKfMTAs?= =?utf-8?q?AHRRUob8y44YMaUYC+b/gWoJzu5Ay38xdDJU+Glf2bKhS+CCPw6yY4MRnBDukDH8E?= =?utf-8?q?2HRCXgmI7b3+wgM36Pqdqgza4CbRJJ/GX5Tjfc8tteYrL0XEEwOFQeeQIGJErwDeF?= =?utf-8?q?Nam9nlBbFISMoC9E/mEhemQf7j8UbikwPMIh8DyDPXNC3aajKpwHYEU4EPkFngiiw?= =?utf-8?q?F6TzPh99GNr7wRPSDbf/ALaBd8tR9REDD51NCuBCm4mDP1kK2K3pmsd7yV+UGUlk1?= =?utf-8?q?8088eKmZhFf/yq9o8l99BLzx+Yej/sWDH0R9pQoI34WNeBTvY9ncpFUuc6F/R0K8/?= =?utf-8?q?yX0rEW1QBV8MNv8Lp7luajRaEmxuGdQ0RUovJTxtbQp2H2vKRXCSOpMjgVrnJnUqz?= =?utf-8?q?Q9U5/U1gbDtGc/exSF3fnx2GVDsJBPkSkJoJFGSpu3bZcyfVrfn5lbCI=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?f+jlrWAQbAjHQj0RAkTafRvRfDKm?= =?utf-8?q?6/J6NKJdSqf7g2qiBvfSRebmI+Ol3wjbw37dj56pCZU23q4OW9tx0S+0VEEgRNt11?= =?utf-8?q?C36300/YRRdFGcD5NVDiCPpAg20vxs4mtRl6wG0rWgkN6ksIQLMNFf1Gl4kNC6aIk?= =?utf-8?q?IZ2yDh5rg7HUEcs/dia9UO1roZDk5LW0tu16dkOom1Zxru0PDfcnC9HNHrHKnLRpg?= =?utf-8?q?yM5IILMao5xynSqyGf7iNSvNbFxVY/YY6lyRgSZD9LKDs0iVzoTjbb3uIgKGinCwU?= =?utf-8?q?VwEQeakXdxyXOFnlKhKKCwtPF6Tmj4jkpXNujD1flKR9gnW6R7GxSXrJRX3J3197I?= =?utf-8?q?XM4LwnO09KIm0Lw8fFlfwQ+LjobEVXi+Apy6mPhNSY8xSGCWp+DOkqUG9ex9MdRQk?= =?utf-8?q?vEBfNxteSNMwBcXACR4wlj7gB+0IdFXc/70NeK1ZeLsH4wCY845rwmPsS0Q++hXVA?= =?utf-8?q?tZUoBFHendlKmxnODmhWSe4M3XC+Ef2q+G8dXtafjfj5OvXFRY4XdRJalqfYP11PO?= =?utf-8?q?KEayF63SLbPSHNokb2eduskCAXfI5R4vHpWhyWR0u9bq7/bRpz3Bz8qTNFTScvVKN?= =?utf-8?q?ARhhswI0YeYrjYa2/dCTPbuiRs5Ko/Px5a3Lp2YwJo1srmd8VmkZ5NcvtA5rF+y4k?= =?utf-8?q?cXzV8rrmRG6i53AMAetk38fSWZvLTc8IuV2VKfSY3YRM15U2ah2RDtIoxuRGs1kri?= =?utf-8?q?Ven8PEN/BUUy8e2UW1kjBdt2xOG2v+GOfF18sHrbxKAJzL5tEG1c0IgaovkWrO+tw?= =?utf-8?q?qzIEcchgUUweOQ7OhCqzEfX0qZzTTeXOQF8RujYmcoJvgBFL4f+eYOPLL4KN/4Mft?= =?utf-8?q?OEdjD01H1NR3Iem7WpVe64aTnTywG4EQTUAJW22bf/cSziA+UzYW5l30Dq1wZAZ4+?= =?utf-8?q?k5ke0ZVXcTX+HL5BKfOyTeNc2q5alguQW/Et53QRyOipLdjRT3p9MYsH3rAOTnGSg?= =?utf-8?q?jy9HXiIJJO9QZBFDT9SwxPsv9a0zlYg8hkrpZrFpFXTZ1Cw6bdUu+cPuvCrqQNXyr?= =?utf-8?q?oLaCWHuSsiS8ZgXqYwhWG3OZPd/tseZLcbso8YOzka+Vw7mCSirqQkNbvXgJAivu+?= =?utf-8?q?aNaZfurwNnT8QTcEr4cBQJo6EUacgwn9WypqgraK/ihuVK2mzy7JFHNE6ZcmN4NvS?= =?utf-8?q?drMjLM5TUJHqoDeCauClZ92/tZK/iDCJe8dpxj121zKIQyL58/+rubfCkV0ipeUYA?= =?utf-8?q?sFncp4I7Qgk3fPjz3JQcGQT+baVhnsKMICYG/ysP7Ta71u70asuTjZVT9zfgmlOgl?= =?utf-8?q?SRQXqiYiZhqIZAr88syIbuBZBvHVZIDODUCeyL9mjuxjznW01ktgoI1QeSzqvcjld?= =?utf-8?q?yKfrf2fN/XAeMUzDUsfZwsbphz+RRLEw0xK7Wb4IeAINIs0Qv8hCE2VIa4dKKKOEz?= =?utf-8?q?QhMhUc54yCkF0tyQGNDvnLVCtzNi5zE5zh5VS1WKFjrnkDIDQ8yC1ASYwwNuVuUMh?= =?utf-8?q?Qp0PpR+dQ/O5IwwcgezRDCmyFXAzXcUc5ID847U/xyCOgs3hEM+49wIwbLPgHTf1L?= =?utf-8?q?yaSLutdRBPFk?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8d0244a-e93b-4066-fe01-08dcd58534e6 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:07.6187 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +7w+fdA4Y+Z0gaLCyPI9EcumxwMfgsPnz6iKMNeXIOHObpkT0J33N52Ii9wo32IfL2G+hm6GzBI7Lb4R+CEVlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Authority-Analysis: v=2.4 cv=MYM+uI/f c=1 sm=1 tr=0 ts=66e6d882 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=OYMCiYonAAAA:8 a=t7CeM3EgAAAA:8 a=mK_AVkanAAAA:8 a=hbWoJc9qX5pFGrt-OosA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=4MVqoSYplEcA:10 a=2rklPmxFnYA4oAlhb8RG:22 a=FdTzh2GWekK77mhwV6Dw:22 a=3gWm3jAn84ENXaBijsEo:22 X-Proofpoint-GUID: ZxUn2MSOHBJYU8CXZowq4pSlsHICaQ6S X-Proofpoint-ORIG-GUID: ZxUn2MSOHBJYU8CXZowq4pSlsHICaQ6S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=996 adultscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 48FCYMsZ018016 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112293 Release Notes: https://www.fltk.org/articles.php?L1898 Signed-off-by: Yi Zhao --- meta-oe/recipes-support/fltk/fltk.inc | 4 ++-- ...Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index b1bc83578..0b2921095 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -11,8 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.8" -SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" +PV = "1.3.9" +SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index d1cbb3547..0d47dac2d 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -16,10 +16,10 @@ Content-Transfer-Encoding: 8bit | ^ | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed -Signed-off-by: Andreas Müller ---- Upstream-Status: Pending +Signed-off-by: Andreas Müller +--- src/Fl_Preferences.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From patchwork Sun Sep 15 12:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49079 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9151BC35FEB for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.113767.1726404739887335884 for ; Sun, 15 Sep 2024 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYPos012694 for ; Sun, 15 Sep 2024 12:52:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41n1f98yv3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:18 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m4FkAGZgs/6QFs7bZUufLRJ4PahovMqVV7qanJ4RW9930HMY88ZpYRX09DyBaseXA2XSoIEI4qClafsIUZpWibZnYqxu8eanyv1OFhV/pFa0iiDqTFT/bQglI28r/cwkHUbzt+fjV5nwKTMD2Qgq4TOIkLLVjZ54aYys3a+/G+v0Ja5m+BbaVTg3uefI2zme0ce5/VSFRu+hWWLu8qM5KRPrmP6UwKncokuUCsIEigcFrf/UrpHzC64CNWs3mmdpLUg6G7rXeKAIX8PtASlOjbHY11rUzwg8PpdjT78ZB1+AftwpAJROBioA/EmstlVY06NvXHnk1x9lzbplWklm1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dtf4ZL5IEVJGRcWdKJ4E9B7Aqp7GW75y8XK/lVb5jns=; b=XsQ0Q6PskDJQZ5LAZMRJtlvVUwbpGn8m4qV6hsRM0mI5A+ScHv7AWgjs1SquToo2vanwOl1F+0l/IY/U7D6YTi7s159AWMqFhdKbfvmeHZG2P//OpbbZCF8ldKx3PKvM7X7JF4iNXMv5ZJ0ej1f4EPh/ly3LE5Izq+hZt5TmDM0lohUmPiqInaicEejZtmArr8DrTSPTr3fpU8mMhb/Qr0wdsTSl1zOx173lepQgvuw9R46+3XHiO+s0hMSgEOTUnLhLI/fB9xzCxU+kiN/iawqFmKXbbU1L44f1h7dWSWZc09PPuAinqDe8NoYvL8d5lJFLvuFu79T4oEZGArlBTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:09 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:08 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/6] openjpeg: upgrade 2.5.0 -> 2.5.2 Date: Sun, 15 Sep 2024 20:51:49 +0800 Message-Id: <20240915125153.2940806-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240915125153.2940806-1-yi.zhao@windriver.com> References: <20240915125153.2940806-1-yi.zhao@windriver.com> X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: c61ac927-07f3-4a06-52b1-08dcd58535ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?VgSFcKw/ggC5cJuqpQ9om65KfK6Mm90?= =?utf-8?q?3oFF5uIKeMnjET9YcES5FMj17koF/FGTBz9tZL+2mvkkjlmappMcNZN5bQxM0vFpm?= =?utf-8?q?s4P3mNHJ8YOG43SFP4jkPB1wOjgkdNm8UpqGEv49eNuK8nw5HQZetJaGraz7Cb9Lt?= =?utf-8?q?WgwsOGZZetJldO+wBn/wnGMCkCWw3RF5btMWn/Y08jiDRkyhQcnufWpEGrrBbn4fF?= =?utf-8?q?q6RiUpptGYIk+ew2OCf2Sfth7S9z2HKCLihGfgdnDpN7CcxXMau/7kitQFxBrAUvB?= =?utf-8?q?BuI2vWnTUZ9Hgrt9ztYUETFEaOo6TEj1WIR3nA+tnM1mySFJqz8Vn9z1htP+Lg3Em?= =?utf-8?q?/T4h2DhslFNnRGeosQBjJRZzQ8IlBq/6t3SCt4/m4DaKcilP36306R4YecsD0fxV8?= =?utf-8?q?4rOZtZsH6sdQ7M3RZgR82Uf+VjQhqUWjQwm01J9/f9EJTJlgZt26kfGQFj1PH2Ypg?= =?utf-8?q?qZlRqMH+pXTlr/Bx3f5B5OlW0I/vHZR5awiDfOdn8YEcFFq6L7qM0226D6dnrdtkf?= =?utf-8?q?w2U+NP1k8xJawn5EDtSn1umUWTHU1oV19I2brR5GST7Y1G8y8lgCOHke4lvnNUqyz?= =?utf-8?q?DvCpUWinn6RAwer6DPOEV8U1wvO7j0zQ6VG83nRar5wkhb0GiYal5rHhlS8ylx0xU?= =?utf-8?q?k4aQ6eujXFEvyC0YihgIK5G4JgTFBDXwPQO/meFdvhdD+Psl0A+S0hgBgpAp/ETjj?= =?utf-8?q?aeMIRZQ58twEDj1Dp4Y7nF8ysyj0nitbyPhfNzZg4BHhmvwL+DmUEoLnGQd1WXbkC?= =?utf-8?q?IzbBXO4OrqVE6FYfDGT70tZZZP7VmPeuJIvpzQBlwo5jXmsnncDEvET8ZykQgVFMz?= =?utf-8?q?eBSmO8dfjHR2tc4u8zyFHWCVlf8JbR6IwLR9dHe5fRE4zAm0okgJGJ2FSrE6T5reX?= =?utf-8?q?PB7sMowR8DJe2fkD+UnNC6/mYPzYFgQtH7bJEI7jkXUMsZhyBqlp5aZC3hKLdOHzA?= =?utf-8?q?4UTOg9KCyaofC8Mq5qWloP17M2bauuckxIaTOulsnpeopg/EZo9ym+898p6ixDaZO?= =?utf-8?q?mwbrxsTfcaMoIz3MubGvx/ZXz079+UJxk9Q0d8IgTJaJAnEr8mpbRpg/VyCWYpHoe?= =?utf-8?q?JAPlnyBQWBcq6dcSBjTs4WC2oXmyYO7un8C0GWEG2ehlLvzOBSffhSi7G8Rfq0gyN?= =?utf-8?q?etJ3LLHco1NF3lPQwSTMhwHQzJCezNN+qz+IRkCgdAQYkCzKlTErZGQlNXx690eZa?= =?utf-8?q?xA7LFQUsMhBI1338jUUNiOS1wfRJuYzNFI+7IdhZ5QHR7NfdDlCWcVorhyFx1jpuP?= =?utf-8?q?JO+p3YnScxb+N2a690kzX/8KWaSqZXr8bjhawhSRUb257YV+lg+YjoWYmMpwoi1nl?= =?utf-8?q?TQ5GdBlQ6FsFUjcZu8IOmv4Pew0aQVzw/A=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4+zm6cohH6y2MIH6NLOMmx9j1FwG?= =?utf-8?q?TIG7hXCskziJz5ZdYDB11mA+H/s4z1T8y+UYuDqcITil/VnyIiysY6e548q3/S9Wc?= =?utf-8?q?+CI6gtgTqyXtLf7CiIc3vl5PTcI80mQRyX0S8+wHja4KTKGFXSNl6RP8+4fZduJzP?= =?utf-8?q?rgRg7Yg2Hs0RKkAaDC+0l16a4ajkWRMZhXth3q2j3rAcy0jLLfjZUQxxjhzqEGL9T?= =?utf-8?q?nHxytidxCpuXS1WEY/7csqEtFvdfz4PC44BYUWPl0MK3Zl2CTVaaq36H3ywBQF4u1?= =?utf-8?q?naBZEmxhKgvoL9tSunMNb7FaouEe2vDCmUHb93nc25qv/luD0vGTIwa6cVlvjejnU?= =?utf-8?q?qyTZkHPEmNBxPEWwp+vpmMT+2CC6Pfv6fmSuTMd0xvxcdmcvdJQlCY7FtQd79tE+Y?= =?utf-8?q?m+NM0/LBh7SXfEtRnmXFXkXzaCRQBtO0Vs2sk3yKBT2Sk/hIO3qOb9EcWQtWOvdrV?= =?utf-8?q?GORzapuNdPcdNBejV/S1Bos/Gvo9y7mJb6lt7Mq7vhM9ITlGRijFW/eFCwx0/42lC?= =?utf-8?q?VgTLFm388YvAUNleP2RG4VorTDkmQdMO8e5QDpYNJBNQbLz7SlaG/CTQxElrsIP0V?= =?utf-8?q?//NV0COi0EJ8GEiYfzNLM2kd4I9bNkgY/1D+hSMxrArDy4YxoPnKP8Ri1py2Xp44l?= =?utf-8?q?mpkjWmiUDMJD2XiLXlffFNA8ZuCkT6RjlxO0v7uXnsCupwPRTA5y3McegAfhFRH8m?= =?utf-8?q?Yg4HdwsSwc0VvJiIlzIweQCeCq5rfnGh1XKNNTfaMTUhvmuQeYikNzjWukPZMRlpI?= =?utf-8?q?QULXDtSeA0BVQ9QKYcU8TBmh7rGL2vZMiYlI/hwyib1FzICJeATc3ANb7P6Ado4QK?= =?utf-8?q?7alxjjM91A9ot7DaGhdcPl3wacyEkWdsy+wQwPBS2bOPYokxBDGB0v7z0+PJgfG0m?= =?utf-8?q?xlsg1O7FXE68QdT+w03n/PPiyFBxUq0UVmFPvFNIP/aSl3rG5jvtA6iqBTBqXeiAr?= =?utf-8?q?QTAy4BBE69ANNadgnvHxMYvyftW9KDOWeyh4hZtEe3nKMOnZZIkbrrX26A8ci8T3J?= =?utf-8?q?IbV6qXmXgMTLrqrmy8lDBQosp4ypO+dRFpHvEApJ5eesIGo/j7zPlnDaMyLbLK4nQ?= =?utf-8?q?5Tw94YlzU70bSqgk85yGzjLmN/6DwqF2Gch7cdeTgmXdcikUbzp5rXfWDAcci3cVL?= =?utf-8?q?VFBXd6HiDtG31QVcUbF2oDBgUNllpjjzAGD9dvgO3I4eH5OyKhsuuZfn9ckNTfbzH?= =?utf-8?q?rbngwGoBabRU871TZ3Dsbs3ra+5xevLzinvorRTlRmCY9UuNKkEgT9hiNgE2N6PXX?= =?utf-8?q?8vRo3PDDVjuA06Hd6BWOGOTIE5eaS3gFpwb9wGZVPfUFpkgmM5Hh8+E/KB87SqtVG?= =?utf-8?q?SYn9BTRCfC1fNTA5T/2bHuKZpnQPno7znQYE2UKzRlsW50BF3bKPjX9vjLAfWyz0b?= =?utf-8?q?Kj9pAQLeDq8Zv2j0VG9Rh/ALmHcSZWtVZG0d2WtPZpbwtVDkgHqOevMJe973051sM?= =?utf-8?q?Hiq/fDRGMEHWUrzXRzFGFt4tfmbGMoQLU893cZdre4BMJUMH8i76jIaFQfNhYUG1E?= =?utf-8?q?CbxmlicPY8nr?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c61ac927-07f3-4a06-52b1-08dcd58535ab X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:08.9155 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C0V8tkhRBfxdCKItWiPQ9x/gQw/VyklXr47QK9cPnv0ILugsQnc9r4RhVkfG02l1PGaAfJlyWWS/t0rVoxShDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Proofpoint-ORIG-GUID: m3diCzL3SNC0tTMnsVGcoSBlOwNm-QBl X-Authority-Analysis: v=2.4 cv=afUzngot c=1 sm=1 tr=0 ts=66e6d883 cx=c_pps a=28bFCgguF5sZfysLuYgbMw==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=o7uPnlkYjgG7JocAdXcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: m3diCzL3SNC0tTMnsVGcoSBlOwNm-QBl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 impostorscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 48FCYPos012694 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112295 ChangeLog: https://github.com/uclouvain/openjpeg/blob/v2.5.2/NEWS.md * Refresh 0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch Signed-off-by: Yi Zhao --- ...sk-cmake-to-export-binaries-they-don-t-make-.patch} | 10 +++++----- .../openjpeg/{openjpeg_2.5.0.bb => openjpeg_2.5.2.bb} | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename meta-oe/recipes-graphics/openjpeg/openjpeg/{0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch => 0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch} (75%) rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.5.0.bb => openjpeg_2.5.2.bb} (82%) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch similarity index 75% rename from meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch rename to meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch index 0ba13cf88..2e25ecc7e 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch @@ -1,4 +1,4 @@ -From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 +From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 28 Sep 2018 00:38:50 +0200 Subject: [PATCH] Do not ask cmake to export binaries - they don't make it @@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller 1 file changed, 1 deletion(-) diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 4324c36d..2c11fe02 100644 +index 26156bcb..9eff04aa 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt -@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) +@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) endif() # Install exe install(TARGETS ${exe} - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) if(OPJ_USE_DSYMUTIL) -- -2.14.4 +2.25.1 diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb similarity index 82% rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb index f2d74078e..45f1b5ef4 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ - file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ " -SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" +SRCREV = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae" S = "${WORKDIR}/git" inherit cmake From patchwork Sun Sep 15 12:51:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49081 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92F20C35FEC for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.113924.1726404739633843612 for ; Sun, 15 Sep 2024 05:52:19 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYMsa018016 for ; Sun, 15 Sep 2024 12:52:19 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41myq1s1y6-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:18 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mZGWoFb6i5Eo4FbTYWOrzq9YucO4tG87h3UuqUVtJnK7XtjlBYZCch2vUvNw9eWtA3hi9QeuGu+EZJhfl9fvrxyAqmBN5B7nlgcsfhTn1uCajGHFQAwvZSnda9c+WChcXHu0P79t2watjp0+BrON5dfK8MWZd8JuadMWmh9zHSV606iwLAANcOHUsxxiIvw5Yb87vd+VjJ1ArNxnxu9XHHSFEiZx+4VJoKLL0H9rv7y+sx+uTztRo4OZ8xLZE+BGLBStVYx01wQmczR1RNPDCJAs1iIx/Hi9t092EiF1Nn1XDl+n347v5ybF5lNM8viwM7WzYD+OpWTI9dKZAVWqcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xAJsp+gsYVDp1H5hXjhHj9wLf9nrWrux63IcpEmDM7U=; b=UbGiiBevqyDr0VCjOAcjzJYYYzLhce/7qDipUvwo2ZFNm19GQ2Ts8ETu38vFWVIDMPdcTFFCJk4vU7HsYJhozxtcxANspMOQk/4V0Yo8uJ/4FuhSqolMEgjLPQFyOZM4YQFoA5Mv79NFnpvoixVge3KgO4iiWQk8GljDyKVxA329BKGOtKhT8eww78I48Ik97qZ0uDIIuuqKIxrFYyx8E2lskhJgalQ5ADtoBBRw047GiBQjb+ir2WKqqo0zCXryM5PaTHidAjUuPimDfGB5zXqKPGJRZnhdX9U8OuzDfY3GFxCO256jABd6BSLVSWjGk7+MsPAdvSDm2lRxZC0ZyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:10 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:10 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 3/6] netplan: upgrade 1.0.1 -> 1.1 Date: Sun, 15 Sep 2024 20:51:50 +0800 Message-Id: <20240915125153.2940806-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240915125153.2940806-1-yi.zhao@windriver.com> References: <20240915125153.2940806-1-yi.zhao@windriver.com> X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b4c99c0-138f-487f-93b9-08dcd5853672 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: XvuXSM4M5ysoGf3EF/NY96JRHhshTUB4534qNrphK+TIeWAfepHSGtpeRIzPz8ARgDCXshzwdAqxk0IsAQKkqokzGBm9gJtQ5XqLZJkAQSpXc8liyKkg/VqNDbJoKxJZzM9r9tWAaQbPBGRKXXHxLA8buQNoESkyyiprBwiNRknJ/aqbnyeH7+ZvAffAFaG36Ak5PBmcO5kdLdE9D8sc6ZJJMflMMzr/ZIg9N/23jIip7/280Nxyc4ayTlM3P8clngikmKlCqw8uo8IPy1PVKQpHXlrmKviBQapd50I8XK4yIL9CzMDdyy4ucTlFIMjKj2Z9dCKwoHYKK2RnYToBb/WSuiQwvCHY2pA0XposF/oEL8hJ+kWXqI8bBtVl5WvBBrtzSsWakNzt4ZDOxAE2dTEVn6nUreOAQEKqMVTr2u31AU5SkjWBPjwGZ3O6S7M8Wzw2lzUVU4HQEC4O6rv1e+Gw2VBUO7pfPY4AJk4thsURIrW4I+/mVQXh1KFRm91KjaIx+xee4zfVfioJYDGhMn6gPgyxQ2ZktjJnP6mFzO6bOufZfQB3L0WP3u37GoAvCEhUxOleRSLfl2FRIXPTbybq3X+t/5aXX8mNMNfAhdLPc3C3QzEUSfXlykZbSobIrLunaOrBEXtkB9oYPrwvDJ0K/esYkZH7fimbUAYuwobBcFxxW/Y4sRzXODyMIsPq3Qe3uIqBejQA7Kgvp62HMmQ4BNOrj4/opgXp+3U32p+pb4UuwsuyEOChktENtJr0qtox9dcOZBljzKa701mw1Sca9gFvgZVMh6SCNFNHoGey19p4HYgvL28c7aHXI4pW51MNSLMKpu0t5ORImpl8+vRBEMnJoVp79G9BiiZku2aC39bO4Xf8K4YA/We4cK/kxmDz/OFa95OMmvUDPQT//6vd0/Wk9CmuKD1Nc4qYJExJIWxT0qKD+0WZkxRitZJMBhIEhbR8/xJeaFBCU4IkT3oJQ1FLrxBKhAbHweUgFoPfkzUlU8m7HbZOmIjafh3BTVUUtJ6sllV77hPoyCBWIsPRXPAtPOyh6w+Ul1lnuPbDOLLqCBloYVGXH7hXEiU0WP5Agjy1tVcIDQfXWQsBrz7KryfuI/MrIOadGGmO0aDGEQShHwpfHTyNj/pIHwIHF+AkNr+OJMIO0HHDhIaVN8sSBEZJxGFz5KE9lejah6Qe2nRiWGEQYuxPQGl76GgYVgxLJAjZWJooHGtgnx6ub80n3e123hwwfcx0/cHvQRPRotEsn57fJbu1lpV2F4Nr4rL97dbAoE/1voi5lZ3L5gaBd/cUGyi98cNo18lKcM82ZSRWQcDsObqW5vtXEjhmPAVbNH/cxas8iROGDOFr6E4u68rmEGoQi33k/WcP9nU3ogQyx/fbN8Sj9Txl/adi3UCRWvj/AMHXWVQoHwI+Mw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: icO4wXLJkF7XmhgaUnGIFjiCz7EIozvJOC0Ww4Gpx6YRgr/0bhkJFBZ6FIpHq7Tm4/NQ3DvWj1mqB4aWGDs5wLYmG8qx5e7bwobmzdJpulOQqZiRIA5jxJr2dn1+QxA/h3+yNzrh8v/Vcod5SWwmHXdXzgMzA+S6GAv1cW575fxOYwQCtfJUouyvnpF0O2SCuUjRgMPBbKsA/K/DkRTv4Xj0Np7Dl81nGkmAaQYfjEwPVMT2pXXuyjPttdGEYvebkf4JW3pDjWbiZbqsTumpzCvVSkStLwfaoB/ZafIt2kCKS1+S0Q6Mqkizi7U13PvF1fSdsnVVeKSdW5i8x7/Uley5rnpDnr6FGbMrlYl81pWtcIysrym0R8uwv8jJ2wJnUC9HM4+946ESFgwcqpCc1PE7ziKc44W6G4vOEJm+TQMdGGr/xQmzlk1BQ4cOFBUV5s9YjACbBEbPSqzm3PAKPyzv5UI08CuI2qFtnBCIAlXdKVPHh0VMx9Ulxj4TWRQ5kee33LJu3iJLT/yJeKt/lsDFshGhDg3Y48P/LFlROyCV0FpGBbkW7vKPyLZXOpeGPrGy7TQa8wxHZW0lFG9TDGoLcdq2iu/LPrQWwzU5nH5sldz5yoZk9R+7+pBfwUXHwqu1V3QDZ9JfPGwnS+ym+sEn7TD7YiY3+guFTY0Brjv8tRBhz0b2SPZvQA38PrpsrpB4eUggnA5u8XUUTpj072jhFR/MmkhW1MVIbLbi6VJVS+l5ofdvyL9Zb7El5XIk0qXbSIlqpX714jC8jevuFxW4LHZSJnIB40hxZ6+R1XX+1e2CSCXhGpJMHQGuqFqhZ8pEqyo+tZKQIxE2hpu3ioulgBjJTtGtSYgnFWytMT44QBDS6tIszhRPr2cc6AGLUxEKKtWlYFGyvvJXDAbErh6p3kWvi0ipLQy3Og6D6g0hf/omeUwG97WyXBmz8+VQBc+MCA2qxt1L/hI6mdt2DKTf2LQnKWe2t1P9+ZUdhMpfa/WnGz3z/CgMa7moAGVZ/mIUAciRdH/nTeFv4ZbOwXtc77/5GgX98M0DqEtWku1SuT9IrQCwkAGijTqBrwytTQRnNSx8e8yirRo4f+0cUnI+297NrjjMOCwTD0l19Iyp0xtT2hQmZjh+E3S20cxtYxKQaRSovsnghpFd7CvEHcuMZD6oyymNgech67FSrxD3ce0H/D/7rsTHfQCIb9pA70Q7hhur7lbvX0d+7aMV8AzX26wBvjVIioDm4anfy9YzcOJfo7QzlmcJuWSZuC1HAMRwk4TBGdzOfFXs4wEwoeDAcmkxk7wAVEW12jGiZrwN/bH0rldHDYZstIK5itJHrKWu+p/wVmqhME9BK8/MFWlny5XbielUOxkXqBQQvsqx3kai/M668WjNlYgidzZfVIX3WXEjuBV9ZRJAfRXN4615XmBgNU1rK7FmiKAwLCoJLNTqtzO3bicrh1wGZgjW571UsJTgrsMRALtK34u2OKpWlpqxw6BFp0uyxFxK6jPPkkS919Uwkxd6218z1XAjgDTmY/TBP1ouTd3nN08quB+kCFLR5p2MMpnmuMpozI8I8lOYlOaOyGipFNtAkwEH X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4c99c0-138f-487f-93b9-08dcd5853672 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:10.2268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gFDl3DGuy4gZNOHtJzQn5Z6AJQ5anAvoeopU1z7CfVH4Iga3mjZY8RbHC14DPoUpwHjgCZF0bzaR1sY3nAk4pQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Authority-Analysis: v=2.4 cv=MYM+uI/f c=1 sm=1 tr=0 ts=66e6d882 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=uPZiAMpXAAAA:8 a=ov4endMs8s_DVNq50VAA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: lhbKBpFCbTsoOEjISXnqYsU9wD4nAwua X-Proofpoint-ORIG-GUID: lhbKBpFCbTsoOEjISXnqYsU9wD4nAwua X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112294 ChangeLog: https://github.com/canonical/netplan/releases/tag/1.1 * Drop the following patches as the issues have been fixed upstream: 0001-meson.build-drop-unnecessary-build-dependencies.patch 0001-networkd.c-define-scope-specific-to-case-statement.patch * Set build option -Dtesting=false to skip testing. Signed-off-by: Yi Zhao --- ... 0001-meson.build-do-not-use-Werror.patch} | 0 ...-drop-unnecessary-build-dependencies.patch | 58 ------------------- ...ine-scope-specific-to-case-statement.patch | 47 --------------- .../{netplan_1.0.1.bb => netplan_1.1.bb} | 10 ++-- 4 files changed, 4 insertions(+), 111 deletions(-) rename meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/{0002-meson.build-do-not-use-Werror.patch => 0001-meson.build-do-not-use-Werror.patch} (100%) delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch rename meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/{netplan_1.0.1.bb => netplan_1.1.bb} (78%) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch similarity index 100% rename from meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch deleted file mode 100644 index 860451d97..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6a1a24eb0f30002a4b0049d6cf38d3f2bc3c0209 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 6 Mar 2024 19:27:15 +0800 -Subject: [PATCH] meson.build: drop unnecessary build dependencies - -The pytest and pycoverage are required by meson test but not for -building. Mark them as 'required: false' to get rid of unnecessary -build dependencies. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Yi Zhao ---- - meson.build | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index b29174de..09421d99 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def - # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu - pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false) - pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false) --pytest = find_program('pytest-3', 'pytest3') # also requires the pytest-cov plugin --pycoverage = find_program('coverage-3', 'python3-coverage') -+pytest = find_program('pytest-3', 'pytest3', required: false) # also requires the pytest-cov plugin -+pycoverage = find_program('coverage-3', 'python3-coverage', required: false) - pandoc = find_program('pandoc', required: false) - find = find_program('find') - -@@ -75,6 +75,7 @@ if get_option('unit_testing') - endif - - #FIXME: exclude doc/env/ -+if pyflakes.found() and pycodestyle.found() - test('linting', - pyflakes, - timeout: 100, -@@ -91,7 +92,9 @@ test('legacy-tests', - find_program('tests/cli_legacy.py'), - timeout: 900, - env: test_env) -+endif - #TODO: split out dbus tests into own test() instance, to run in parallel -+if pycoverage.found() - test('unit-tests', - pycoverage, - args: ['run', '-a', '-m', 'pytest', '-s', '-v', '--cov-append', meson.current_source_dir()], -@@ -143,4 +146,5 @@ if get_option('b_coverage') - priority: -99, # run last - is_parallel: false) - endif -+endif - --- -2.25.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch deleted file mode 100644 index 9f01108a2..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6e3dd61bf90a7ca8c36c5b95943cbff7c1ad3c2d Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 6 Mar 2024 16:12:31 +0800 -Subject: [PATCH] networkd.c: define scope specific to case statement - -Per [1], define a scope specific to case statement to fix build with -clang. - -Fixes: -../git/src/networkd.c:544:13: error: expected expression - 544 | gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - | ^ -../git/src/networkd.c:545:17: error: use of undeclared identifier 'first' - 545 | if (first != def->id) { - | ^ - -[1] https://stackoverflow.com/questions/92396/why-cant-variables-be-declared-in-a-switch-statement - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - src/networkd.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/networkd.c b/src/networkd.c -index 25121c48..5eb9c0fe 100644 ---- a/src/networkd.c -+++ b/src/networkd.c -@@ -541,12 +541,14 @@ write_netdev_file(const NetplanNetDefinition* def, const char* rootdir, const ch - * and, if the selected name is the name of the netdef being written, we generate - * the .netdev file. Otherwise we skip the netdef. - */ -+ { - gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - if (first != def->id) { - g_string_free(s, TRUE); - return; - } - g_string_append_printf(s, "Kind=veth\n\n[Peer]\nName=%s\n", def->veth_peer_link->id); -+ } - break; - - case NETPLAN_DEF_TYPE_TUNNEL: --- -2.25.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb similarity index 78% rename from meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb index 2b1a4ffda..40d72caa0 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb @@ -14,15 +14,13 @@ inherit meson pkgconfig systemd python3targetconfig features_check REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.0;protocol=https \ - file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ - file://0002-meson.build-do-not-use-Werror.patch \ +SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ + file://0001-meson.build-do-not-use-Werror.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" -SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" -SRCREV = "3a7516aadaf864ee9d04727977d3d9fd1bccbbda" +SRCREV = "d27f32305f7f06de449b32239a89969e6ff2be31" S = "${WORKDIR}/git" @@ -30,7 +28,7 @@ DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ systemd python3-cffi-native \ " -EXTRA_OEMESON = "-Dunit_testing=false" +EXTRA_OEMESON = "-Dtesting=false -Dunit_testing=false" RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ python3-dbus python3-rich python3-cffi \ From patchwork Sun Sep 15 12:51:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49080 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82588C35FE4 for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.113925.1726404740204526790 for ; Sun, 15 Sep 2024 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYMsb018016 for ; Sun, 15 Sep 2024 12:52:19 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41myq1s1y6-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:19 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OpIvFaOxVMBGeKCKN/ZIDI7mi516BaI4H9F/WDvrFmFAebONX6XlqRKSCWeMjaxL8c2LkofgeGaleYOAJz9lnfs5YK/sIb0lfWu/fHFX2NVvnIV0PDv8dVJyiwX/YUAUHvwjON7XpHVk0J8SXk9LjWiktFcgswN9OJsKm3lwtqXEq+wpL3RZYR6iNKQ7dLxivvtcPXMBW+rrea2jonl1l7hONqorS/9KWGPhvrcpGepZKq06GCqyi7qWhVhDzumN/bcbXPZs/NBiFhKtqGIbFhVF04aF2etVWS133kDJUm93JhCsJhAJ5/mN80v0lQdQ0bJ1lJdrTI5UkxQrFUOQTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nvUL0QbjPVJ8g9zgoxAMkyuk1p6+/0qkamvP+JVKjmU=; b=jsXaObPVV9UxvpMr9uGrAcodvVR0T6VCI4Res3t5vEFwxABbOUdfzPtBpc6ep8JC9gZGuHD9JeBIv04X2WKNFgRAPp/3w1jJSKFZ4aZUHuxTXN6X7FW1EFk1ul09pQEyHfirbRH6DygaiP1cyLrK90t20p8wHjj8WLfr6VtePxRDor8X8wrLFknPHaqu+WD8QCiRBnG128/VdDK60lIY4XamCxGEh+qaeKhxduO0Sdh9oV5N3eRdD8smgwSZ2s2TTm99U5k/rzhzJtqXsCUx220jlZ+4sPoDeGfhG+h/Xh0Td9CYUw2Rne5952sObmwfMq/LMkGxCiMly92tdQhUdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:11 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:11 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 4/6] libssh: upgrade 0.10.6 -> 0.11.1 Date: Sun, 15 Sep 2024 20:51:51 +0800 Message-Id: <20240915125153.2940806-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240915125153.2940806-1-yi.zhao@windriver.com> References: <20240915125153.2940806-1-yi.zhao@windriver.com> X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: 9778d468-0fe1-4e75-51b8-08dcd5853739 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: Cx106HB/OqlqBsxkIThUrwsVGS9tI+Y6xSzRpJeDSwtEPeVBQGH//BGU0MwbCCMt34mGwObIWEX5+rjaWGJdoyTCmLBP6wmwgR5pEHfiH5YMKDwRRWMMBXne/SqCmr9HkxALAg2UsaUXgEjVg3TrLuhwDxgiXZE/CVdXbgcXUO/PGZyaBi/a1OUR5gG+DVA8t/d2Pigh8Yfvk5p7vpMBoxbd74lB675w1Gh5DNHK8RhEshsbw/dcYLVTekkW0cZzYL6aDP88PWCWtD/emAKwgD2G3ZU5zD9viPK654NHStWUQS7hqBlMpHwp2dASdfWUUoFHSzZlDdgBNCi7KwGJR12vmNuBMw/3H1FTXVSgscOPa45Df7NBNXxo3o0UHY3TPxFbQFYWLDBmvK7ao8XwtHZcupyiWK1ekyDgeLQt5Df8lrNYC0hbDB2ug4gP5oNP09KuB6b1ophReRyHtok9btQkCkZtX3FIZh+Bux0iDdTlBEjrBhsfxVmha2PPC7KWV9WsxOI7WCD8tMG9xShDS5/YM8PEP4vfvr2oVjYVULOGPnRGL9E6nGq+9EcZTSmAnsHf0xP8b2gyA/O1U4GPLmDx8V+5arRQR9dLswQlnyFCAX/8krFNSuqdJ12cvzp7swmRKqagLnL5a140fuW4PMtk7CH/rAqyC/fPc/sdi90KU3WgeM4pEGys8/ijTuf8kL0jRa0/YcqlDDihIHY1bot3WMJ+0/1hNy/eAFbpVUWm0mhZcnBUlIzNBK1x2uEzlH8B4CSYlmsqdJ5HCzBcRO7lwkJgm0lbKN12RjJOLIAVdL7rgXbJVvn+7Kb2wY9n/vnePXWIZ1C7bK1snNbgDBvnin3IPLYOeuXedEWUSyfX57QRpkf5dN1iKFH/ldtRc9sgDYCKjdYucu0u2GnRORk/nNddnqfN02omR3mRBcSCmARXA6inWs5rylNYD0BYWmlcV1b6tjqV5i6+qsz9kMRVXXmL6kgk8TSQwYQmsRK+LLSmmQ1iATv0BvY1SqbB3FclEi3zKNqxsyrQqEHeNw+DiCWq+yV4ym/Nju8M+bReXJ7Osw/NKQF3TgvXSzF9gyyqJp/CcuGhQYt8KHJEDf5IAmQmx+/XDAoVYnf7OIxkGQEV0XLA8MPePpWfCvM0ba12xRcG+LwyWYOJ6U4RoWIPKT1pV9yvk1u6xmKnNffneqyZ0sQ7wwzXSmMIeQSqQtwR/rpghIlJ8YxwUXpJE5zRmDnEInU4JyZ9914VPaX4qftP6g2O5cc74OxpvtMb7U/AZtPfXSE9Hiy08YQYbv9gZy23vLZfPldcPNl5BE+ipTNl0ZWm9SJWXnF7nvjW+K7SX7sa+WUBkwsDVlsmV5LF8Nqk3vXheSAOhH8CdDAFbKrK05L9yIVak1SLw6awb4xag7CDQLHD+3gPcn4MxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pl5F1qpTq7uJmluRg4Fo3TNAvKmx7enUq7Pw+NnRjD6CFGrvFQKZsjp+pLfyMbsfYjmjNzaCCF9Jh77Z+yNTVPZSVd9aZtOWCrJTvJmOyO3gk9SsZ7Jsad0nyfTAoLHITIxEdWbgNxUO/pOuAYETx3JBKp0Gt/iYifAHY3M+Ud5QaqwI6NRNDDr+0Fxhg2F23WTb3M3564l4iwvaMCcZ97YGyne4eVGdyg2R/YBlUn2qz5WxCrOUW470uge5YZPpLZpPOL+4LXc0TYNH9sKcPsAeIEeiwUXqgyuL2VR9BK19hxsLOb7xYHvmrUJ/9znRtZqGnQEloBpDS6pgyYZUwZ+HswzqVlQ49CvbA9amJ4TGvNFBmjN1pdWaak90k40Gq1NIHXinFmSE5k3BzwJUHmnL1tVoLaDLo6KhJZwMcdtoxjwwkG7TbFcTw2pNEUTZJqYojMdjEMAsPK2fiHjPmNvrOr1aXkwep38RNuRKXrZLej42TaUakHxZ/MOtGDUzDTq2O0KeE5FwjIsGcc28ya52VA3JTpooS7qOyT0pSJ7BSdsGjze/D7gNYLOtWi/hcj2odqTW8ojwoy68esZls7y2oNUVW72g57jeFcI0GOrXV0SrJWxQEmR+vXNFrNA4N0cBXPRemibLnrY91dt7W4etcr3KnSA4F6Wu69DvpXWFduNxKQLQy+BatcAiAL8FUlUl5SKU2gLP2OH1Y5Hu8d29S6T1f0sDdNNZaL0bfrmL+zO65hSl31GCkFAyCcRbXlaA0pRkxfKtBrzuBwrBXEqHjif0q6Rpb4p7EL/ORv2qZ7BQaeXk175Ooo5hXpBlnP0NhCXtCsXUnvnrb4mj4CJ0qvzvXZFFpKwijhF+Oiw5HSMhU5VqWchxGpWAZ8IW/jjrBy1bMzjdbYybQ5irvZ1sOO8UJZrrg58j5LbSyRzLnHMGY2qomeR0t8V61GO2KsaSuKI9HX4gkL031ly7zr70VlDYH2OdqzC+kLIwP/zDw5egBwckP99HEGdXzd359oVQIyStAj/NJuKdkhsblJANTWGtWSJiranwbnhebDMJJxrVFHg13jvNXkne5U6SwNEHZZe/bSHha0qzYtvXx+L+I0sitajBVkUh+Y3jV4shpBq1iBbSsL3IRQdL9F4bMVqiR0AouOiv1ZTXzKaqIQ+Ti41VOoHELZ+W2Gy/8x+M7Bk4ckUgERKnWTMt8SicdMEpYzS2U0CJw7eo3w+Z+uoVnLdl/jMnYXKbyJU7Z8aniP/wc8kxFEi6G/VYAYfGgRJaF5umzZBUlOIOxQhzj3d4gScgj4knZkKr+T37tge6A8CqwJtzd5xm5tU5Q755ZIAFTNgNFmLRWcwxFr/2LRck09Nn+YElp2dxyp8Gf9BZnHyuk6aJF2Mav2QvTluD7ZHYsp8FieF2HnCqo/uaZwnQb9+uCJUm+mwBIeYEMXohha0ZaZePBoxQhIfJa7ImKXT7xDsWuhDzxgo1jAJyX0xVNP7CdmcXQAi+/bvkfycGDf581G0i+MYUdC4Re0kh9lryUXEGEQeHuIAKdQUc4WOy1ALbuvxTpyjx8HpXnMFXZbCC3cS5JGwIbv7aIdez X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9778d468-0fe1-4e75-51b8-08dcd5853739 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:11.5206 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: i0a7cF33K3ZfdK6YcKKalhA6FqMiCUFytyLE4JuszWS4B5RgQKaXZldc11e0Juam/7NHs/zWgM61H+OkyI0Yjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Authority-Analysis: v=2.4 cv=MYM+uI/f c=1 sm=1 tr=0 ts=66e6d883 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=nar8ntqeAAAA:8 a=oLtHuQmu1MEBwpkKkUYA:9 a=FdTzh2GWekK77mhwV6Dw:22 a=RptMqvEBejqe73AKBt4K:22 X-Proofpoint-GUID: CQLslmzfo1qCpGSPinuRrRBQHgtfX34_ X-Proofpoint-ORIG-GUID: CQLslmzfo1qCpGSPinuRrRBQHgtfX34_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112296 * Drop 0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch as the issue has been fixed upstream. * Add a patch to fix build with clang. Signed-off-by: Yi Zhao --- ...cks.cmake-drop-Wunused-variable-flag.patch | 37 ++++++++++++++++ ...prototype-of-des3_encrypt-des3_decry.patch | 44 ------------------- ....txt-do-not-search-ssh-sshd-commands.patch | 16 ++++--- .../{libssh_0.10.6.bb => libssh_0.11.1.bb} | 8 ++-- 4 files changed, 51 insertions(+), 54 deletions(-) create mode 100644 meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch delete mode 100644 meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch rename meta-oe/recipes-support/libssh/{libssh_0.10.6.bb => libssh_0.11.1.bb} (88%) diff --git a/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch new file mode 100644 index 000000000..21af9a5a1 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch @@ -0,0 +1,37 @@ +From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Sun, 15 Sep 2024 20:31:55 +0800 +Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag + +Drop -Wunused-variable flag to fix build with clang: + +libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable] + 29 | GCRY_THREAD_OPTION_PTHREAD_IMPL; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL' + 217 | static struct gcry_thread_cbs gcry_threads_pthread = { \ + | ^~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + CompilerChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake +index 9719e699..ec15fa2a 100644 +--- a/CompilerChecks.cmake ++++ b/CompilerChecks.cmake +@@ -48,7 +48,7 @@ if (UNIX) + add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS) +- add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) ++ #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) + + check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT) + if (REQUIRED_FLAGS_WFORMAT) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch deleted file mode 100644 index d2d1fb595..000000000 --- a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 20 Mar 2023 21:59:19 -0700 -Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt - -This is to match the prototype for callback functions which are now emitted as -errors by clang16 - -Fixes - -TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] - .encrypt = des3_encrypt, - ^~~~~~~~~~~~ -TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] - .decrypt = des3_decrypt - ^~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - ---- - src/libgcrypt.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index f410d997..e3f66781 100644 ---- a/src/libgcrypt.c -+++ b/src/libgcrypt.c -@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { - } - - static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, -- void *out, unsigned long len) { -+ void *out, size_t len) { - gcry_cipher_encrypt(cipher->key[0], out, len, in, len); - } - - static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, -- void *out, unsigned long len) { -+ void *out, size_t len) { - gcry_cipher_decrypt(cipher->key[0], out, len, in, len); - } - diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch index d6bc75c3a..4803ff81d 100644 --- a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -1,4 +1,4 @@ -From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 +From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 15 Mar 2023 16:51:58 +0800 Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host @@ -9,16 +9,15 @@ not required by unittests, we can skip the search. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao - --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index f5c30061..885c926a 100644 +index 89b95d08..e481534c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt -@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES +@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES add_subdirectory(unittests) @@ -26,11 +25,14 @@ index f5c30061..885c926a 100644 # OpenSSH Capabilities are required for all unit tests find_program(SSH_EXECUTABLE NAMES ssh) if (SSH_EXECUTABLE) -@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) +@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI) + file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) - message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") - endif () + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") +endif () configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb similarity index 88% rename from meta-oe/recipes-support/libssh/libssh_0.10.6.bb rename to meta-oe/recipes-support/libssh/libssh_0.11.1.bb index 31f29c1b7..5f39c2d79 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb @@ -6,12 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl" -SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \ file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ - file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" + +SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" + +SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73" S = "${WORKDIR}/git" From patchwork Sun Sep 15 12:51:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49078 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 825BCC35FEA for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.113926.1726404740435823854 for ; Sun, 15 Sep 2024 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYPot012694 for ; Sun, 15 Sep 2024 12:52:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41n1f98yv3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:19 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=e1WSmQPVRT3yYd5Xr95TPMe1eD/D1tLR+6J6zRuw6eUvx/RfL8mU7tZ9dQ8B2whNhlxnMi5SjXwCA19QwA7Sx1TdUxv9z9dBwXmA5Q+tK7cnsSZqXlNLPdYyehJ/cJHnv6QSeuW6qx4iIJfeT7kAoJGc7dDJgp3ecr28VNDThNflbVJYQaOHxX4f8/ap2jFGNXA3dz8AA/SrWxGEqGahgGuip+wIxceWGsaiy+VFGxQ8C+5Qr46H5S6FfO/70OGW5F8BIEULm9QDZ7dEDsG8eHNJYb+1fyncxe0sUYoC610xqNSm0XCbzb/CtIiI+cgRDZCQPTpFAlseahKZ6HAbng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5YGeL8D2GjMU+hIzAcx3RRTi78Ex4o03JI4iKGUZlQk=; b=WvTXf7TdxCn7DFd0J1BVNJNISpymwCYvhjHsyb0+CefCr0T6b+xsWa5eOw+psJVFi3L4SCq5X2aDM4MLM5Mx7Qi+Mqjj/nlrLQMsemxtVBJXmFUod6gIi457E1yEN2eO1vBtOfbqsagiCCLB1bX6UHk5RKiOyGR/VRXeiPtaWz6vN2trBZj1BhVeKrmys/65X3c8VIOo4PJZ3oEeBI5bclgwcDUTUpwcLOSlVEw+3snjT6vrakX7Bbvj3XY7zkuOZMK32IGPJuAqI6WtQrRchFsMb4+BaWLZtZuRYdfFL71Elluzlcq9uUu61x1Z2N8H1t2x1fu35RlsdtipWIk+gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:13 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:13 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 5/6] jsoncpp: upgrade 1.9.5 -> 1.9.6 Date: Sun, 15 Sep 2024 20:51:52 +0800 Message-Id: <20240915125153.2940806-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240915125153.2940806-1-yi.zhao@windriver.com> References: <20240915125153.2940806-1-yi.zhao@windriver.com> X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: 25d4432d-40bf-48ff-bf96-08dcd58537ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: 0Y7hb/zu59AERdSwT0D+9iN6FMYRmbRlIJDDxk11hW8cC+V3RJVL1uEaoGGD990GLyx1RFPu7k0S39VGayN9kNpvVzZACqcs+Q/5YQNQ+I4UHqDGLMCfaMJS8Jg+fCv522OHKc4K/9p7gycHZQuPiqtzaZuWrGDum8c6KXdXPP0e7vzP4FeZe8zY4nqVtUwziEFcKsIHZvDdn2GsZpzTmhXs4XXOlxuLByeNJJU/rKK3dY999zLyylaaLktFwtWgRZ9yOXtHw6hzMCr6JyV1nq/YA18oED960YbsvQ/9f9Oo9OJpPEgOHVJnhX74Srmyjz8CZGgpKU9j8rKW/aXquHNWgWFT3PquSmlrsoHDm+mI6mEe6YMZWtsOBcVlIzpmE/F8uSEq4DRWMzFL6ixaZZ6eKS6X7JLtaaq6DVpDm7NqogMCqLP9GcuIoKE59h3dbvM8secP0iv8fB6yAozthpzwGUKzEVCktxNbhpNc1Em9ztSFH7xPYLjmFwMioCeHDBbrCqvlPTzOESN0O75Bbdsq63wIgC0kI33yW8l/FVMbVIePqvVcchV/VatVmXZT6rxx840AK8KeIcDryi0AhHFPb2WDOZeW0TKNIr+jlIPKjy080YSqf15nznc4PPLuQvFGrrWIm42zLC6MlDI3oyAbOX6+KPE/q6ZxamXcjUvFLtzZCNjaFEa4ds/54r9weZNAxTpixDssbkJLH1ozV/gijeB8fS1NkWDszY0rU97QDiCjGFP2Fmu0AYpELv7KNixf36BW1KBJwidCX/yAnFFBZeUVPQwkEM4o2ubdgk3+7lHycObzXHJF7gx/b1wP+W4/ynmJgBuIhj43eJjw7g9KIz4rK8eLCt3BpUQgGSAQ+T3bu3PShOOZKZQh959qpI57p9WxmMI9AN3zglbhhpDrWgwYpamW72WR1S4OiKbKzEMCjH2HrnuCmu6r3XdsUAZbu7N4FKTpiWzJ3T4MLqfTPa6bUIteANt9t8K+b1yPmZNVMXBh5LCRjmO3I8/3SeBE/t7guLmBmPs3Z59Ur4dauQaKT66Y8mYTppi7Svl+tomY/oKEhL6X2IypiDTk+E/ZQm0PGU5PO+tKF/a+Mx6bkI2u2YNKXv5NO87Z2cGLxiO2a7365FY7IS1CHrCyj25z2P7FL33xEuwz8cK/Y3Vf6+yffgqNBOtCO0JISYd0V1bp49t02vfXyyJHesUif+WWqW6ztWD0YgPeCYjb35w2NLdPcSoNE4XVyMpstPuQLgwN+8Uc9xXiPIfBY9y9xiAxbsW87SjMTjdWBsmnifiC5J3KcV0DRRKdvbw6k7poIC/0DZS1wRaqcvzQ1ujnZy5+IYurGqZckGdb3J9eI7gI/lBzr5jPwSQkKt6DkBjU7revEduC9oUQ5Zw4lQ4qXU19vI2yH7UXmLAATORALw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UtcPHENTkKp0Ba37bs1FIhkgKlFnLk2Z5hGWHVylvLZBRr/w/3+nR3DcxeSP2a1P+AYsGQnR9vLgvb2Gjojwpd4aQNlaQDz3jKQpwqcowI6USrohS/6HvkCqLtmW/C1x6u9ouHF60g1cx0nJ4dbNfGiYqsai0Hi7fh/VrttU9MhfI8apzsJ2PWott3eEvmnLtdrLxz7+EMQBRN7uuFYMRicNJQyxJ9ocLZKd2Y/qLvjXhUd3LrfBUsSSOKjvzcyCJ84xV2BH1U+7c/SiXuyHpBoekWKx6t3dPg4IbXgBRnOUKrqeTiriFYpjFP12qtvZuSPu0Fs9JvRWXqlQ8nfbB8UTMGCOozJT5RdfUV0GG2dg8e0KGgrlWye1fyyMEMhMRYdOE2xHHwaGc8QmtYrrTX3Fsv42dOQIgmx7F2uwk/y9yIAtzTbJQhAZa7QbJZU/T+SsqzqeyReqlc6r541TPiDeGKeQ3+/wrzgv/0imCx19h4nEQ9uJ8pSb6MPZ2m+v7+pjTO73OQx1ifzzXaz107I5UXgWO4auutSMSui7e+72VP+e4Lov7vPgyJPY6y+XTceDwH6vkPbMTYWdys+cJDkoK4nKhVL8x4nMhHkKsDdBIQItK5v0KMd9HNbdGJ7F/1l36Eq494nR7gIAGizBCBluKUFNt9stCh4g01bATzl5QTARiIK6B+hQAMb9yIxquQNB5jKvhUQZp9VapAuZBpHSW2MsXWPhbd1G7MQuHI7NrbZhJINl8VaQvMB5CD1hntmTOo5i+v7Rb6D097F0QMWFyE4CJJUybUQ5ug+6QDTPM121Hw2sOEJCmOYqfaiPjps038LooDJdQUBJLEoaN5sSeAjXZ1oQns9NmT55Py0LRJFiP46rpY1HPFJ9kduZbhitLyFvrHPq0wDDaB2fOkmkcveht5l+3AlTPI42fkaRYpkBL/p6jbSVjQk0AI+SY2lLuV9vDdnYF0cC/tcamfXuoFK3NS/7f1Um5BNyRABIA3a28n4OZ43VqDr0MiJj6Cx9C5vZST6Sz11/1vCjncyxW30/I7bqbeINIecaVDgaL6RCJFX+aMBt1H+iDWr35doJ3fwX5lcozeZnOHeU+dLhaX+5IAoQOmaDZfDB2XEWbzpIGbaP/MZRe/K7aL4rM5pZHVIwRjxT9jbIz9cLmGvgR01a+PqsFSm8D5SvFBjjrW7sl4MJ808JGzfLmWWS4ZVF/nLaNJVVraGI89UG3lVww//V2VlV/bRwPMOzGH/TY53rr+ZQJqwd6LFdbfNF13yfa/10304pRXZJLoKXngbmP9A91StXXYeA76CMHQwQ/C1X7Pmk/7jA/aZP/0O3WGlPQsQjQAjDG6icB3bFeyRMYhUSM5EtD5mJZW/RBYoYsmd+sk0uwno5nbGswFv+uStzFx0A33klnMFrjCH/NE2Qm+U2amwvwsnBwbff3btUJNeQIceg2B6b18y5PmUX6A9OLWk6wXDRezg8eOUznRx1RiXfr3ZHKNKyjy0R75nO1qP5hq8TE2cS/Smq4ICMhpGQrFuqXczSTyzutx3ZnuvMFV4AAZVdbJh6UJCkNczZk6VNL3r+CJ/ljDb/tKAL X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25d4432d-40bf-48ff-bf96-08dcd58537ff X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:12.9851 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Nqq8eo5jfJLi+jzAyhTErnkLJpzAl36HCHlMhxfWn7hXMR8xu2GqvO/yhDcsQF2TjPgFkXJRHwAPTrPa2KZggw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Proofpoint-ORIG-GUID: qLsjMjNvxDZ6V4rMCjiRPU6J6bx-v8r9 X-Authority-Analysis: v=2.4 cv=afUzngot c=1 sm=1 tr=0 ts=66e6d883 cx=c_pps a=28bFCgguF5sZfysLuYgbMw==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=ax9bDcA9AwNTG_gPzAAA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: qLsjMjNvxDZ6V4rMCjiRPU6J6bx-v8r9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 impostorscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112297 ChangeLog: https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.6 Signed-off-by: Yi Zhao --- .../jsoncpp/{jsoncpp_1.9.5.bb => jsoncpp_1.9.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.5.bb => jsoncpp_1.9.6.bb} (93%) diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb similarity index 93% rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb index c54dc9466..ade9f35d1 100644 --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926" PE = "1" -SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc" +SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6" SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" S = "${WORKDIR}/git" From patchwork Sun Sep 15 12:51:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 49077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FC64C35FE8 for ; Sun, 15 Sep 2024 12:52:25 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.113927.1726404740741167398 for ; Sun, 15 Sep 2024 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9988d41e42=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48FCYMsd018016 for ; Sun, 15 Sep 2024 12:52:20 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41myq1s1y6-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Sep 2024 12:52:19 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eeNuqf7qeVWWFGQAQzur1ObmxxOV8sQi7Du1rvCToQcF6YwKULIBBvlYedkHtmjzeWD89GQHisvzRzR8jaXOyG9T67q/gFPSVPdXG3883aUfzLudlUpil6USUgAcXu4n1QNC3N91j+0i/WCjmJKdw/Yn52wAMPVVrUawIcCTi7Iv+Sy1cs5Zpw0D1G3Jv0t614gub9HExf0isfPBaK5zKXNvbbclwHZcI14XZuvLD0YhREvmgEFv6nOHGa69lu+DikQ71q+JdgHdCVik46MnF8GKF35GbID+7xoDE62pzWRPOQlfS3Etnw1DeFpLwAN2l3F/mL55RhqDBT3pUVcYUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WqbKIqYx/z3CY4yOZA7yd6xnI2X34RiMfwq4KifJR4o=; b=Bq7PdP3Fwox4xrSt7Xr0ExMpL7t1A6nV9G5sO2gRmSZYh7n9P+vk4zBrQY+iRDf2mBiGsHsvn8kAwOOhf1+LPdYzbrP090pHLJo4zoa16/porLZtkK8OySNBhQi0k5v/A1/Kn7fmfoCsaGQ88C12MXuWo8a5Z2YPBzoyhuSRVLDFX8YBD9gbLL+hZAdaZGy1VnEyWiGC4KcKsz2HOLTB6270Rma8MksW1EoS3/+cWqmGB3YfE1zRzMnrIb6XLWSKcj4MDzVWzlqLhB8cyzAjv7jkbh7OXB7za9CwkJDR7gf+3E/0be2xGAWjVctKlr9XmKiXWQsSpSGSz7Upv6zFDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by BL3PR11MB6314.namprd11.prod.outlook.com (2603:10b6:208:3b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.23; Sun, 15 Sep 2024 12:52:14 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.7962.022; Sun, 15 Sep 2024 12:52:14 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 6/6] debootstrap: upgrade 1.0.132 -> 1.0.137 Date: Sun, 15 Sep 2024 20:51:53 +0800 Message-Id: <20240915125153.2940806-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240915125153.2940806-1-yi.zhao@windriver.com> References: <20240915125153.2940806-1-yi.zhao@windriver.com> X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|BL3PR11MB6314:EE_ X-MS-Office365-Filtering-Correlation-Id: 80b4743d-16ca-4567-1f68-08dcd58538df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: z5Dmuj5SvACAvynydZxVf9Y10kaeptffBpwJImpK/Di59VHkOt9Ef5ABr1NBgCnQMb9dWudIjWK/s8JFk/bx/IfGvOsxTLrJLBBQtffM0SqUd5zheBznjHynmmDlwEjG3j/rUS2dZ4YW3hS9zY30tJeEQajUqzTWgT/vkLdoXOqd1r6HqfwulKhnkyU7lgfUnOAHqWM2QW8Q1gkna1BFr61nbPJ4SYwDLNdGINM/e+xcYMz2Fq7/mCCNufdfxGQUgphiymKEykmuvaByocP5rzpc4zUCJWI9TRti6HivQPjM6pgBSQAnX/FczoLHO4qHxeY7+P+LoT+jBiPx0VTBI1FKRTvCOapXMXTliTMrgDryQCaYjA9KijmjN4ded4VSu9Cw/2unKC+LdORT0lrMNE5Hqb947D5xWVLZ+5tdr0N/3TQddL04OU65c4Br3vP8J7kYqpEXkn/oEkAfSO6OHSbgYhvlsh50MV0UlUdrn3NNTI6sFzlEPdyAWXJ92FOkyAJbISs1iZQVegMBGf6j7FBv5gR2rx7+/03XSAHIVk3CcWvCWErZ6pRQlw9SExmcT9tmvTCdmiSfxWwBiOxHAViwbw9vO4MHd+JpIsrTRAiBzmnffp4fcvzDSpIha+QiWJ2UTKmC9cXzD4qG/ko18Q82n+N1D5pOlElKwF6ZncN4aB4uyudpGKwYIaggOw5cT/fCYi83h1Qm8yCOo7Gg7Pz43W7LFFx8UzLFR881ikYE8XsunNPuYwcHnfPzrY8FN4L+iQazMaZUeBWv8uRIJhpLBYCuVMvOpvE3nd9IyiF6X+3UP9JbE8L43LzgYzLzx1rxM1l0Z+WS0z16tvvon77KLeiNUhdqFYQj299WP2AU6/ABFpltA6kYBOdr/cYPQ5HMcmnx9853tby2zxZbbbGqiaDhRY3gmMhIQ+6bAAV7zCdWhQ7Wr0Kh2/lI4ePZElRzXfNAqOuHZtwVLi3wdRkoKCXMd40OuvrRpWhzChRjad0z6pbDb510dqNIgU33lB7PZj+dXeEn5WXON2/NLJl4uxN3CcY0eI2XdvlOI/sPKu7of4+oPwOr2dTEffzQHiOQB77bLCAFifTFjUjeymlgE4Hn0S/34xkMzhFIwaOcah0EVudrVATzwE21Xwt7IA2atyJzlzr5xjZec3+I43qTAtOsl2GRL6uwQKSP+98gTUUrYjeen/YTPs/eeDJsEnVOLV+R3IVyvCwoWyFvIlSiYkXBJhS33N5ZPjn1xU9dP2UO/K2mwhPE2MK4YUNzXQTNItMUMXPW+o2QAEMnWXvWSplyCdB1xasoOkAmHw8qCheVVGkEY6GET1vaaiIW6tbhh5hLqlgAfmypN9Uy3+6OopifFsG1kF71wc2nRIaYBWJU+DnVtcsyX8IgeJdylTJpocYZ816OCORmi22rKzWbx0m8NK0+ZDj1j8uQt94= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IfdKdPbH68Prc1c7G+h3BzmAf+7fvqYVVrHEBnJ8SUZoeWRWWrkA1nU8boTUAfy+u9QkLiNevfi909Co7AtDHJuvC4O+4O4FWadH4uxC97kZwvu+0Aw31fwiGh2dUUHiCn0cJoGbzI+dM5D+3weXmPxKJRcUTb/4eGAcBX2WL4jgHUfKXsQW6RkC20k59xLLa3uKX7cCa0K0BydPqbwS9FRa2cwcMh1zQMHF/DQrVF1uRZrZbgclVi3sYtPGp33sY0hZjBTIGivPiMdhoRyAaCV/c++upOiPlTKVBYU2Jxell7h1nu8F5JG+96+vWTsyB8FzEN3BCFvylNn4EkGOFlQZtiSuYNtQ8bCwqq64+TmWUaEtpwu02/hAB76+ZHfVigtwRPJy9EtbYuHnmSWyFx7SjgrdvKNUOCMCDeKCWAY5R33pDpO/nKL1nDEImtvN/C+eWZLbmQ5VB+HyAB+f1hcWoaCz5xM6F12Id7DJkq7d3IWWXMrLkzYT9vGDRODjjHl9lRmyq/jcwGQugbyqAeh3vW709e0LezrIpaq/+6UDbKRdI+P457v+WHTAYeVKX1JxKH1vJCeYUJrc1elFIZbLXKArIaw2fYxvYvrVF1cX/9KgXaDLZxvxylsK7NUHoHBYPoQzVcR9IJALGxWXKki5i3GaeZmWY20GD5yXVrdNyTGSlxJNf72d7QKnCrKyhRnUY8qTTVX6k6o6qrxyfvxamEFOHcKEkatbZ+roy35slQuCfb6+FZdHYOnygOdRoWymMRING1rsxUKD4YjKQh15PQW0cM/n8aDbtu2ut6kBVNPL8zLSFcUJKFCgxXO3vFVmZ3KU9L/sL5+ItxHdK1xnnuSkB7nVaV6bFNYV8OIyJqrQaHZQAu/vG8jd05gECIURHWY6X+dgz2tu/d+hmuYExqN4x08zFZkB7YpAOJgFjP8em/XF2rrCk6o0kz8TiFRfFQgQhQoGGYI+NOk+hM0g6StHU3oDal/6E3VKb1x82hZ7e4gNq61ftpbysG8XDDrWul8DJhdMdk85XYNp8m9pJm11ywvcxznHXx7Wcet1Q2Ha/ogn/tJzwJojDxdmgpt6Z3Q8d8Mm0/wlP3II1GAZQMAAfdoZZLvzPkA7bcjtUWPdM6s9PBSjOXk4lZXtkbBqSb13JYh1SkfiLLmSeOF4aoByJU4//p5goNfGLedwAXw+F7jCkuCRcMK60HzNkEhpv2D/ux/ThqlEYR4sJeryUHt3Lc6C8lo27yX/SbfXmQtreFyczdb/GQ4RNf1+JRay7AkzV/ALh8Xv+b44kfXEjuadI8ZgWXaop8fYpmSO/9QQkDPwivupacmLkNhnfm7PHaVG8XAPj84GBhhCYclJkdbG32Pm2DRYY052j8VB7rU8TxchC9yhSWl1DnmdbiIVGhrTgPmTLBxsC68M1xYN3Lh7eqljck1/JoMhx9eTFKkmV7jZLlvoAp2wgHqTcF9kqJFZ+77PLaqjwuKYFHH9G4xbGNysRhqtaJYCoDxKDZhOpd7Y2717MWdXuRfQAW6/J1foLHPvqTepGmb4xTbUWHz9VguKzA69jZdYoMi5/GvdEH3m/SwSaYliNv2o X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80b4743d-16ca-4567-1f68-08dcd58538df X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2024 12:52:14.2803 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +6HavN02gfuSLVRDXH9Yizhci3tp6oqMDU2D5vL143kxSIt+eEVdlN223OyHwfRAHw0ZIEoQJ/S21o9NNbbFVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6314 X-Authority-Analysis: v=2.4 cv=MYM+uI/f c=1 sm=1 tr=0 ts=66e6d883 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=xNf9USuDAAAA:8 a=t7CeM3EgAAAA:8 a=3cwXC-BSH5rauHzdvMsA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: -LcYXP5SHLL5kBCCwAaDz2ZBqjt9BNHX X-Proofpoint-ORIG-GUID: -LcYXP5SHLL5kBCCwAaDz2ZBqjt9BNHX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-15_04,2024-09-13_02,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409150098 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 12:52:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112298 ChangeLog: https://salsa.debian.org/installer-team/debootstrap/-/blob/1.0.137/debian/changelog Signed-off-by: Yi Zhao --- ...rt-to-override-usr-sbin-and-usr-share.patch | 18 ++++++++---------- ...support-to-override-usr-bin-arch-test.patch | 12 ++++++------ ...o-not-hardcode-the-full-path-of-dpkg.patch} | 8 ++++---- ...strap_1.0.132.bb => debootstrap_1.0.137.bb} | 6 +++--- 4 files changed, 21 insertions(+), 23 deletions(-) rename meta-oe/recipes-devtools/debootstrap/debootstrap/{0001-do-not-hardcode-the-full-path-of-dpkg.patch => 0003-do-not-hardcode-the-full-path-of-dpkg.patch} (87%) rename meta-oe/recipes-devtools/debootstrap/{debootstrap_1.0.132.bb => debootstrap_1.0.137.bb} (71%) diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch index 12dd23810..faa66e026 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch @@ -1,20 +1,20 @@ -From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 +From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:06:05 +0800 -Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share +Subject: [PATCH] support to override /usr/sbin and /usr/share Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] Signed-off-by: Hongxu Jia --- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + Makefile | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 8516803..a2d8c00 100644 +index 21a9a39..649f465 100644 --- a/Makefile +++ b/Makefile -@@ -5,14 +5,16 @@ all: +@@ -5,13 +5,15 @@ all: clean: @@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644 + mkdir -p $(DESTDIR)$(sbindir) cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ + install -m 0644 functions $(DSDIR)/ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap -- chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap -+ chown root:root $(DESTDIR)$(sbindir)/debootstrap + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch index 69329df4e..5de65779d 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch @@ -1,7 +1,7 @@ -From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001 +From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:08:06 +0800 -Subject: [PATCH 2/2] support to override /usr/bin/arch-test +Subject: [PATCH] support to override /usr/bin/arch-test Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] @@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debootstrap b/debootstrap -index 9b9e58d..a3cf3af 100755 +index 552c8d6..11a9465 100755 --- a/debootstrap +++ b/debootstrap @@ -51,6 +51,10 @@ INRELEASE_PATH="" + DEF_MIRROR="http://deb.debian.org/debian" - DEF_HTTPS_MIRROR="https://deb.debian.org/debian" +if [ -z "$ARCH_TEST" ]; then + ARCH_TEST="/usr/bin/arch-test" @@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755 # set $CONTAINER detect_container -@@ -645,12 +649,12 @@ fi +@@ -661,12 +665,12 @@ fi ########################################################################### @@ -43,5 +43,5 @@ index 9b9e58d..a3cf3af 100755 ret=3 fi -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch similarity index 87% rename from meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch rename to meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch index 2a5f23316..5cd1ce88a 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch @@ -1,4 +1,4 @@ -From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 +From e92554e57b4aae242cb0416025883ccc2c539d2a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 2 Jun 2021 13:34:35 +0800 Subject: [PATCH] do not hardcode the full path of dpkg @@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debootstrap b/debootstrap -index a3cf3af..5e96c3e 100755 +index 11a9465..17ab05a 100755 --- a/debootstrap +++ b/debootstrap -@@ -538,7 +538,7 @@ fi +@@ -551,7 +551,7 @@ fi if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then @@ -29,5 +29,5 @@ index a3cf3af..5e96c3e 100755 udpkg --print-architecture >/dev/null 2>&1; then HOST_ARCH=$(/usr/bin/udpkg --print-architecture) -- -2.27.0 +2.25.1 diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb similarity index 71% rename from meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb rename to meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb index c28a51749..d4783b354 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb @@ -2,16 +2,16 @@ SUMMARY = "Install a Debian system into a subdirectory" HOMEPAGE = "https://wiki.debian.org/Debootstrap" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e" SRC_URI = "\ ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ file://0001-support-to-override-usr-sbin-and-usr-share.patch \ file://0002-support-to-override-usr-bin-arch-test.patch \ - file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ + file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ " -SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" +SRC_URI[sha256sum] = "666927457ee4b0b3e68e55a0efbf3fb69189610b7abbd534017d7032cb3ae833" S = "${WORKDIR}/debootstrap"