From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 18 Jul 2024 19:21:22 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sUUok-000ZVv-2q for lore@lore.pengutronix.de; Thu, 18 Jul 2024 19:21:22 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sUUok-0002ST-CE; Thu, 18 Jul 2024 19:21:22 +0200 Received: from mail-dbaeur03on2139.outbound.protection.outlook.com ([40.107.104.139] helo=EUR03-DBA-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sUUoV-0002SF-Dy for ptxdist@pengutronix.de; Thu, 18 Jul 2024 19:21:08 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ax+UkYTaN+2eum0DT9cK5iTWC0x9zUkM+kIZ9ByKM664EWSwFOjwp9dBIoW5N0FX5ytjtRaD5oF45p4LxkUCSaIkyWQOkGvFxyUNrzkFEXPdl5GjhS8rzqwa34E0hP3XrWetrbEw6BQZfHcNTSc0TtN4KmETcJEMSOcAsvNtLcb8DfLSBstZFrw0LipNzlyB6DTp3yKZ1PvuNRK8bQzNticgRmhpBS/qRN7IOH20M/z8K6GQmBheTBHUr7+Q7E3sl+4y8ME1yaAH7Po2V4WweeIQ0dDXwUCCXn1Ej36j1Sk/9tcSL/Sad5ChUrnPS18XlQuoxYGvn5AHbCLQ/OTN2A== 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=gekbAzWjMLTNYNSjtvU5krnHED51gEnErURoHCJycuM=; b=ZYrzcS9gEotMnqPu/u4mwYCIX9Vb6aonDSSm1AW+U7fJiAMesVnl3hcvMqhds/vDpIqhf7nj0LDUPDdak+MkuwIeywFsuu6sxwZc2QdZRpSo2p08Oltd/kiuEd6m4Fo0KDo8qVsmzEhsmTew0w8rq4cH5fDCd8+nznss42I1xI0vL4XK1TYvq0guGb3JcSOpbGsDRWP0+MZd9xQ3kUvU4biNefZpD2zYTzgRNOfIGTnxLrwzxFd2tBrlTB/CD5RmkePtg//dj6zJo0+M3/fc7YgPcnQm0ZPKK3LwDOZoE0WwcmI8m7jcFzi+s7E6gNihWhK7gkDouCcleGeP+qx95g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gekbAzWjMLTNYNSjtvU5krnHED51gEnErURoHCJycuM=; b=EwUBGnXY+q8RoIl4s1+r+GEX5Xo0KfxqqgD4NijgxDSY8DxHY3hyPiPU4Hbeu8CMuiM/1bn+t2EVyi7fe83fioW8Wxxa/yfG8uNI9oSEuZwBsmX6rOB04qrog9mlkB58M490DhyGAqFYtUJHgQSzKyK+Dni3b0RQWoGQXOojbqw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by GV1P251MB0747.EURP251.PROD.OUTLOOK.COM (2603:10a6:150:62::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Thu, 18 Jul 2024 17:21:00 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::fe8d:f825:5b29:2903]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::fe8d:f825:5b29:2903%6]) with mapi id 15.20.7762.030; Thu, 18 Jul 2024 17:20:59 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 18 Jul 2024 19:20:53 +0200 Message-Id: <20240718172053.1205006-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: GV2PEPF00003836.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1:0:5:0:1f) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|GV1P251MB0747:EE_ X-MS-Office365-Filtering-Correlation-Id: f97314c8-30fd-422a-5280-08dca74dfe11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|41320700013|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ME43amtINFVVRk9pWlNyeE1hM1VTTXIwbCtUM28yQm1kNHlTL1hyZVA3VklR?= =?utf-8?B?NHgvVXJPbDFUcU13aEdLTjBBY1RSWGhHVE83RGlySXp1R2hKQ3djSjRCQ3F5?= =?utf-8?B?d2p1TGwxNm9LYTdhQ1hpS21QS1lxZThUUm1Rd2RzcVpmeFhMa1BxelRmMjU3?= =?utf-8?B?Y0ErV2hvbnBEL2xZN25IRE1ncENGcW1UMjR1czk4MExKbmVSK2FsMXVHVWsv?= =?utf-8?B?VWVvNW42bXhBU0gxR1oxRzBQbjI3WmtPVlhYTEpycDFuWVkzcmg4VCtkdDE1?= =?utf-8?B?dUd4TnBzU1V5QjRqek9EQUxZcDdnNmU0VWw5RkJ6c21IellyL0NpMU1LVGZZ?= =?utf-8?B?b0tXaVNlb2IydzhvMlcrcmFrSUEvT2NHYmRmZmxyRlF2eDZnczFRTmdKOCsz?= =?utf-8?B?TWs2TUlWTlF4d0N3Qit3Z0phZDFqem9meiszcHZTWmtjNzFaU0I3L0g4WE9Q?= =?utf-8?B?WWYvUTVxdDBvb3ZsT3FSWVdROThVT2V3VUlpa3R0WGxQUGZRaUl0ZmtKazZo?= =?utf-8?B?TlhSU1RuSE81VlhMVVhFay9mWjV0U1o5UFFsZzg2bmt5Z0U5OWhvcDI3dkZN?= =?utf-8?B?MW1LRnRjSHp0cUFNK3NBbmpiQVQyM29EanhjazE2M2NNREpVYkNYUFZmWHlD?= =?utf-8?B?aWNNdnltUkErSVZzRWxmSHhaUmRZaHA3UnZjblpuc1pZa1VXcmFwbkM5WXdL?= =?utf-8?B?Y2lvSDNMaVZuVUttQXdkL1BhS3JsQ2IrdVZaUktxbWJzQkRqaSs4cVVvRWJ2?= =?utf-8?B?anR1bFV3M2hDcWFweDZlM085dFc1MEZoOUlFc1poUGpzbmdUakVOdEZIT05P?= =?utf-8?B?Wm50azNKOFpGSjhZZVhRb1RqMjJUK09LbkkzcXMyYnVETFNiY2Y3dTUramVS?= =?utf-8?B?UEhtU0VTR2JESUVCVEZiNE9ob1RzakNVbkQrMitZZ0ZiWUZFeTJudEZ0MzR1?= =?utf-8?B?NXJiaDhaYUdUZHhrYmYxN2NoYiswYlUzSnRxVHNSMU9JQlRjQ3poVXdMRW8y?= =?utf-8?B?QVJJQjBkVzk5M2lhZytReGtRLy9VZ2dkOE13c2tlcDdFbFJDeTU4NTJScTht?= =?utf-8?B?Zk8wcSs0eXN4TkRra09JMktlMjVqNnE2NHBmWm5JdysvVlZrSUdHdXVLVkZx?= =?utf-8?B?QzJaWDd5TkxHZ1BEcjlyUHcvK1g4Q0NHK1R4UmJTdHFjVmxhM2xMUDNBRzls?= =?utf-8?B?c1FFMDVEY0ZuUE5jTmFqZHJVQWVrUmJ4dGZtZ0EwZzFITVZSSjF0VHE2NWg0?= =?utf-8?B?bWNPUXZjWWkxNXBDbDJoRUREamRGMGhCaTF1SFhlS2ZFUUYwZ1N1dko3R1dQ?= =?utf-8?B?QmtPSTdCRHNPak1IUzdBNjR1UERCZzdRMkRTcTVXYzFJN0dzczFRUUJxUlZF?= =?utf-8?B?bkhubk9JcnpQa0s5SUhjeTR5QS93bXRvS2hjbit4TFk2ZjU0V2VQUHRVdGpL?= =?utf-8?B?KzZaaTdWU2hIYk9xMFFTYU5KTjJMWlZLVEg1T1o5Wmlla0Q3V2VzVFNPRWw3?= =?utf-8?B?MTZGMERGczdzQUY4Zm9UdGptZFVLRDFSQStsMEtqbTVTOXByN2xNNzFjUFk3?= =?utf-8?B?NGk3UWF5TmRZTThKVGpSa1dIb2g3NEdDRERxNy9DQ3AzSThsTVJJYmNnUDNh?= =?utf-8?B?aEN0NlZKNFRGQ0dtVCs0MXpEQ0ZJT0M2TEVHa3BUNHZZRlNTRldjSkFaOTVC?= =?utf-8?B?L2RZY0hzMHIzTjRSSGxJMnFxTWlFb29iUFZ4Q0VZeWxlNm5aMWVNU2NTSkwz?= =?utf-8?B?SSswMGVQK09JYzNhM1dpU1I2S0JPNTI5WkNHV0ducUJ5NWNBU2hXaHBzVXZi?= =?utf-8?Q?azauGclLDck4XYDDh+yR4363uIDDZgmz6ZzcA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(41320700013)(52116014)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cWFRb2wzdnBEMDVzRjlRMzY1RXBDUWd1S1NaZzkvbUIzdlBwRGF0ZGtEODFN?= =?utf-8?B?M0dWVXl0NUlFTEk2cnUyWkM0WUhnNDJvaXA3OUYrNm1lV2RsYW0xTklvMWJp?= =?utf-8?B?UjBEaGN3eFQrYVZtdUtIYkg3Sm5rU2RJMmQ0NTY5Y1I2b2xxeVcyQ3N0OThY?= =?utf-8?B?WlNTWm5BZ2FyeDVQaWN6OHBqc1J5ODdLczdRbytzZ3czTXU3ZzVHY24wSG4r?= =?utf-8?B?NXY0VzVlTnpNNjJLR291MlRYdU4vWjBwV3FWaWcyWlU2Zi95YjNTR3NOYVF1?= =?utf-8?B?ZHlwUU9XWFlDcFdJSkY2cnduVkRGKzRYZVhzMFUzWnY0d0lWVVpsVVN5OU1C?= =?utf-8?B?dDhmejdHM3BORjhtYmlZWnNZcFpVL21TNFE1ejlibDIyTS96VTcxMEhWcC9B?= =?utf-8?B?Z0oxbGthY0lPdGJ4Q2Y0My9Fb3NFa2ZvZDhGdS9MY1lJSFNLZHhMZXlMZktr?= =?utf-8?B?SUNzb2VnbFFGQUdib0g4NkNrMllNc2lSYXNGQnVzT0k1azNHdEN5UVAxZTBl?= =?utf-8?B?c1RNTGtNenJkMXpucTBBS0VxdFQ5WlkrZHIweXNMV0JrME1CbnVnKzg2Wk5T?= =?utf-8?B?c0ZCSnI2Zld2dGNJdUFBRE1aMFFGQU1GZWVBeGNDZ1RNSzRycTRvM2tVaHFT?= =?utf-8?B?b3IvYitpbDNqRHpuK2Q4L01mZTFGcjFBVmp4SFRVMDN2RDIyWmFNOXNrcnZO?= =?utf-8?B?eUxWSXltR1p4d2NybnNDTVU5L3VTb0p2K3FWQXducmo4OURxYWQvWXZCY2Jz?= =?utf-8?B?NUcwaXlPQ1d5elpiVG9aZmVpV1V1S0wvWnFTMlNrYmRIekJNZnpLaVRETDBT?= =?utf-8?B?enM5TjFqWFJCc1JpUzIxV3Y1VHBlRFdHRmRyTzFhWjl5WXhtdWpkdlpVK0Vr?= =?utf-8?B?N3VTK3ZhK2lrcE80TFhkY2I0KzJoN2FWWWVJejJld0lxNkVpdzFZbjRjRHZ2?= =?utf-8?B?dDRoSE11Y0VRY2ZjR3VjUHNoT2w4QVJWdFZ4eEFZWXc3QW5qVjF6Tm5qamU2?= =?utf-8?B?M3pSMU85UERwbGRIcFozdWovZit1bFhHa2NKaW9uNDg3U3JiUUVTYmNZNWxu?= =?utf-8?B?eXBQUHFnYzlmSGdZczMydVRrZlVPUUVvN3RobytVSDFSaXdPTGZndDVLRUtZ?= =?utf-8?B?SFpqNDhmR2M2VzBLNE9PT3JVdVdXVkNUcjlJQlRUT2R0Skd2SnMzNzdQZzVE?= =?utf-8?B?bERUd0JXZTRxbjgxMjhmN0loTlZKSjRPeS92aFZNWGlqenhpb0cydTN1U2ZS?= =?utf-8?B?SXRQUXkvMEwzZ2RaWlVaU25iOE0rV056bVNUQng5L29kSGxUNUxRT09rVkhW?= =?utf-8?B?SFF1UlpGcTAwdDVEVlpqOGxtZGdEL0VGMGg5dDdvOE01UDZ6am1zUW9HUU5N?= =?utf-8?B?aStTZE5lUkxxS1Q4amh5OW9USGVzT2NJbzZqMUZ6cjVWWUZyUUNmT09VU2NZ?= =?utf-8?B?R01FaTQxY0pjSFE5OFVEc3RKWFdmSkFjakU1WngrakRRcm5lcUZ2WHN3cnRa?= =?utf-8?B?QUZ3VitsUFpSU2h0OENJdUcxNW9NT0xTMW42SmJGZTE2Z1N1MHdSTFVmb29E?= =?utf-8?B?S2dCSjlnNUZWbVdseWc5b1FucHpMbEVXcmRFNEFPeVpKSTViTk82TTA4OEpK?= =?utf-8?B?bERsd2R2enFQMXljalFVTGpVWkRpWlJoODg2blR4MGZpbGovZDVGWXZtUjB3?= =?utf-8?B?dXRwQTNmcXJKemRYMHlaNGRQUk1CYncwSG1FczUxYm9ZMGtMbm5HeWd0VUpi?= =?utf-8?B?cEkxWjVNZWwzQjBXZENMMFdpK2p6U2VlYlAzenZ5Z1I4MUZSVTlLR285d1hu?= =?utf-8?B?WnlvbnpzU1N2dGNOOS9xNER1V0dlY0drK29JUVBaWjI1a05OSWdtSmRMbDFS?= =?utf-8?B?N1hLZkNQT3ZsYjBYaklWVkNxelNGbG9CQk9pcjRlMGVkeE9ncFJpU1hRLzYw?= =?utf-8?B?YmNtMlFjajVrQjhYN1YvTGswUlh2U0tJUlF5dVV4cFZRY2xuQ2MwYmt4WHpC?= =?utf-8?B?K2JvV2l2b2lkYmxwclZwd0dxUmdUV3RQNzJ3cjRSSjdUWm13ZzRWT3p1Vjdv?= =?utf-8?B?dnNna2VlZU96aXRMRHJRQVNZL0xyWVgyV3A1b2VxSGVZSC9acnZKaWExYlF1?= =?utf-8?B?OEJ0ZWNlcGpSOEZ6cWVQWXVuRi9GZFZrNGE4cWd5TzZIYmxOeHdiZXJSWTJ0?= =?utf-8?B?eXc9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: f97314c8-30fd-422a-5280-08dca74dfe11 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2024 17:20:59.7857 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C5aNBzEKG5BAygZ/HhSrkKoxTHgDt4gg32NCXpdYTue6W4glQktT0cNgJYkmYpprHaZ8MvXqa3+h12F0ZLcV7lmOHhXckBiiAC1HuQ9VN9o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P251MB0747 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] qemu: Version bump. 8.2.2 -> 9.0.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Bunch of changes. https://wiki.qemu.org/ChangeLog/9.0 https://github.com/qemu/qemu/compare/v9.0.0...v9.0.1 https://github.com/qemu/qemu/compare/v9.0.1...v9.0.2 * Remove syscall patch, fixed in new version. * Remove jobserver patch, doesn't apply, and I am unsure it is still needed? Signed-off-by: Christian Melki --- ...4-Handle-the-vsyscall-page-in-open_s.patch | 57 ------------------- .../0101-let-ninja-use-the-jobserver.patch | 25 -------- ...symlinks-for-security_model-mapped-f.patch | 0 patches/{qemu-8.2.2 => qemu-9.0.2}/series | 4 +- rules/qemu.make | 4 +- 5 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch delete mode 100644 patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch rename patches/{qemu-8.2.2 => qemu-9.0.2}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%) rename patches/{qemu-8.2.2 => qemu-9.0.2}/series (53%) diff --git a/patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch b/patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch deleted file mode 100644 index a91a32996..000000000 --- a/patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4ef1f559f270c66b3ffc23f6c845ff3d008c6356 Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Sat, 24 Feb 2024 02:29:41 +0000 -Subject: [PATCH] linux-user/x86_64: Handle the vsyscall page in - open_self_maps_{2,4} -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is the only case in which we expect to have no host memory backing -for a guest memory page, because in general linux user processes cannot -map any pages in the top half of the 64-bit address space. - -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2170 -Reviewed-by: Philippe Mathieu-Daudé -Signed-off-by: Richard Henderson ---- - linux-user/syscall.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index e384e1424890..bc8c06522f88 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7994,6 +7994,10 @@ static void open_self_maps_4(const struct open_self_maps_data *d, - path = "[heap]"; - } else if (start == info->vdso) { - path = "[vdso]"; -+#ifdef TARGET_X86_64 -+ } else if (start == TARGET_VSYSCALL_PAGE) { -+ path = "[vsyscall]"; -+#endif - } - - /* Except null device (MAP_ANON), adjust offset for this fragment. */ -@@ -8082,6 +8086,18 @@ static int open_self_maps_2(void *opaque, target_ulong guest_start, - uintptr_t host_start = (uintptr_t)g2h_untagged(guest_start); - uintptr_t host_last = (uintptr_t)g2h_untagged(guest_end - 1); - -+#ifdef TARGET_X86_64 -+ /* -+ * Because of the extremely high position of the page within the guest -+ * virtual address space, this is not backed by host memory at all. -+ * Therefore the loop below would fail. This is the only instance -+ * of not having host backing memory. -+ */ -+ if (guest_start == TARGET_VSYSCALL_PAGE) { -+ return open_self_maps_3(opaque, guest_start, guest_end, flags); -+ } -+#endif -+ - while (1) { - IntervalTreeNode *n = - interval_tree_iter_first(d->host_maps, host_start, host_start); --- -2.39.2 - diff --git a/patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch deleted file mode 100644 index a1524c1d9..000000000 --- a/patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Michael Olbrich -Date: Fri, 26 Feb 2021 12:08:46 +0100 -Subject: [PATCH] let ninja use the jobserver - -This is only for ptxdist. Ninja uses the make jobserver here, so don't add -'-j1' if no -jX argument is given. - -Signed-off-by: Michael Olbrich ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5d48dfac18a3..61a291a95903 100644 ---- a/Makefile -+++ b/Makefile -@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) - MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS)))) - MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) - NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ -- $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ -+ $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \ - -d keepdepfile - ninja-cmd-goals = $(or $(MAKECMDGOALS), all) - ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)) diff --git a/patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-9.0.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 100% rename from patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-9.0.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-8.2.2/series b/patches/qemu-9.0.2/series similarity index 53% rename from patches/qemu-8.2.2/series rename to patches/qemu-9.0.2/series index 8912ba0c6..a55ede383 100644 --- a/patches/qemu-8.2.2/series +++ b/patches/qemu-9.0.2/series @@ -1,8 +1,6 @@ # generated by git-ptx-patches #tag:base --start-number 1 #tag:upstream --start-number 1 -0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch #tag:ptxdist --start-number 100 0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch -0101-let-ninja-use-the-jobserver.patch -# e07b440a88f02f8ec66d73afd7a82c61 - git-ptx-patches magic +# 7c1abd8b5f5ef26378050b669cba203a - git-ptx-patches magic diff --git a/rules/qemu.make b/rules/qemu.make index 19d07a599..854116b06 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 8.2.2 -QEMU_MD5 := e43091262671c1728b09522932b75b1d +QEMU_VERSION := 9.0.2 +QEMU_MD5 := f7f0462262d2571f146c6a8adda33b29 QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX := tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) -- 2.34.1