From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id DC97B1FF0C0 for ; Wed, 18 Nov 2026 10:13:05 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 51F1821685; Wed, 18 Nov 2026 10:13:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GYw9Lv5yaTfBVwJmNdabCwqadstmwc7h0ISu3lwb0o0OlFc7tOMHyn+nwiBqZFV8jU9v0dB2TgDHTozQCjJ+bqK0tHLowd+DnVZ0l8S1DoUJb4g/nO1uxF6PNRjsvTqtPpZ1otnS+Lb2pOk6HypcTnqXMBdn0PPvZd7sMbUD13w1SGZV5GmdUilVabIkq6ZSdJNR6m3LNvArmB/e5P3hm69ob24zBVbWVUNyMl+MPi7GVVaQOGQzn6YmhMJvg9qXDavy+iQ+0bAQSnS8/F0KcEvI6z0PBurkY3lk7+qNcMTPJ+46X39PKp52kzpJVIStboXxxdZ9xUp3wOYIjeeNAw== 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=QSf0fDWYjJ9qOL2CdYJh9KIA1qww8RL+eGu2VYLZqvs=; b=kKAJkKloUeabzbiadtp5bAD88rc8ChzLTjVFNQGv8Dp+MZHAc0/Gdv22BH+aqPJVqGjPCPmWYL/bMXZ+D2rwqMP5+l/sFd+QlSvjJJUEgKjSTt6BSka17FnkYac3AY4zLhZszBt3N5GzfsUFy1E4zjc6+/5yS8MyB/izC40NHqxriWLCK6KfKd35rhTTljYa/fKFToRI0W2F/1KQJPeE+YuoTyJgtzUATen7vf/rU5kJcSg45Bm4nDKyPk07vKXjmxU/Rr4vEg1ZTY9UQl8n5LzhS9syf03WpAlldK5NS2vGxWkLRPLM47dT86hjhv2WVs4SEwH3w8rz9Toy6k5dFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cyber.gent; dmarc=pass action=none header.from=cyber.gent; dkim=pass header.d=cyber.gent; arc=none Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cyber.gent; From: Yvan Janssens To: pve-devel@lists.proxmox.com Subject: [PATCH dab] allow building s390x appliance templates Date: Wed, 18 Nov 2026 09:57:54 +0100 Message-ID: <20261118085754.70657-1-yvanj@cyber.gent> X-Mailer: git-send-email 2.54.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AS9PR06CA0227.eurprd06.prod.outlook.com (2603:10a6:20b:45e::16) To DBAP193MB0876.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1cc::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBAP193MB0876:EE_|VI2P193MB2981:EE_ X-MS-Office365-Filtering-Correlation-Id: be27289d-7d42-4f59-c575-08df45520a82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|366016|1800799024|376014|18002099003|56012099006|261102123227099003|261026121527099003|261021123027099003|261021121427099003|10067099003; X-Microsoft-Antispam-Message-Info: qP1lFHlzNtiFwtogbrXOv3ODtXgj5ysnY3g6cvt1tGQPRiW0GEM+rGkbkED8uLsXJvbz0SJL88qpUl8FM9fQeC2v0WDh/487fPMvAwU3JCFU2zVUjae1biI2PjkeW+D2wCCe1JceVtAo8fFumbczgOPuQMl16wlh4XXK0QGKxUVAa2SRYIz+KwItMn+diVcLjk8IwLi/QLJKu/Y1Y9T0F9/f0+EPGUua/Z/qIK7c2kRz5Y9eq97v/aMgU22t8YqD/TcgC2qf55W5owh2WLdTsW6dFecXBq0DKIRD+wLqd3yQtS7ZKbaUk2ja7eXdRAFSe+Xq9udYuguUwvj3s6jpIG5e43rXtcq2T4IUhKJkWavXFnoYK5P/qbzzvajetlVR1G8qOoJelzfXOP7pV5li96Xi8JumPU4VuECVbJufIM2AoWLmPLsn1BNrvq8AM8oF2wzvH8uK5x+W2+m1eaYEW84mcwr86JhCgEdIjpL9GFoRt/O5UjyEuDuzZeAkGhdxDm35XKOv5qkSd6rx3hANzKWWIgQ+1TBG6vmypXyjAu6SYB8RHTVbhCXXuk2m6phpJLMsTCpr2+gquFkpm0NSs2D2oZ8WC3+1kRX/yioeFRkLPDkxQp/JF2t02rlyDzWtiEf7V/YcEooOVF8GXAwtYCSzJB+cbBubUOc5KmoQRlE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DBAP193MB0876.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(366016)(1800799024)(376014)(18002099003)(56012099006)(261102123227099003)(261026121527099003)(261021123027099003)(261021121427099003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5FlVt+hSeHDEErRybU/81zgRkWjpSUynai+AI88g5N3eOknYzFNXhn5NLXE5?= =?us-ascii?Q?BsLD9lqnNANqexSbp4sv60jVPKVmjxDJr8fDla8YcvozldRwY8fDMRNLdOQ/?= =?us-ascii?Q?tFXSWVkRUNrmrvYmFCLeHY4FDm+4qoxcoVaUt0mAQT4KsnjhB4j6SA9wzWP4?= =?us-ascii?Q?nlpaC87RVX9awDHfBXm3ZuvG22foQD4yS5GdhKQgQhUIDH3RIir303dIiPJ4?= =?us-ascii?Q?Gn3SoS4c8JxDIUF4JafwcaU1LUs47Ql8leDiE3XXGo0xS02FVG3ihdGjZbI5?= =?us-ascii?Q?4BLOE2GBQjWgD1kjyJIPzw29+0+pAu9pVWjTAZxmkW8vYj3egxqcuwd6RUgw?= =?us-ascii?Q?EBg9/aO1aH4uO1cnv8yALMFLxQncCIfh+1ZtXioKBhMmnozGn/HLuaC6gT10?= =?us-ascii?Q?xbh+S7raEYKz9c+ld9X81koMaZoToLOQHxHMiwSBJtOKFkJtMCXSaIkMBWLF?= =?us-ascii?Q?g0wEUwjfEcX/F7QsZZaUaeUIIwulaQkRplGN3LzZyMhE4CbPMncfaHZQS1A2?= =?us-ascii?Q?R6iKhO4n9bjJnzuA388aw9PBoIkfe9B2dCeynfhMAxW51UrD/XgER0rGbXY8?= =?us-ascii?Q?6ccdDLxPlYEdgjGz4I+z8Gtk/PDP0hyZGI11wpaaNUc3oQ/P2NOIiHJPyo3O?= =?us-ascii?Q?o4wnqCijMdgqxX0bxnreC6Zg2SKrvi6ycPeiuduHK+gvK+cSzV5qenx+eyAo?= =?us-ascii?Q?JRzX9v9qHtD4k2hMvRC57MZGbJOc93/RCXhKYVgtFC0w8bvmikrtDqY0ZO5d?= =?us-ascii?Q?5wxrRfcWJSkNH+qcur1eEf9ws0VcBYC0ysGR2TGiymh7FFimXPjxHBhFjg2J?= =?us-ascii?Q?z5UBgXgX5EqBoqUk4VlAPZnqea4JLTnAKit9V2lphASZrZmv/Lblhe4LJZf3?= =?us-ascii?Q?KwEujpFLjoTpXli3xIn4LEI31peLZSQzCpiI8WGF8Nm+Ewuj/nJBgj41blUg?= =?us-ascii?Q?HU7+Iq/cLG2KCmA1Xhabs18r0I+iXQv2JMZiaUYVA/ELd4s4sC1LzeuLVS7k?= =?us-ascii?Q?Dh/STCAV4WWcMyKN/Fjmvo8HrgkTe7Fz+ovuzkR2zPGyurO967u6rxI5WST2?= =?us-ascii?Q?5kvzb29JG9IV6FLtjoEhPJCRaPWkTCPrIuZ4u48mPUUKupYBYePEg6ID78rJ?= =?us-ascii?Q?JiSYgMVQZc7IQ9xZkfOiHIgjmIFjpw0INNCmrga9xLprqCEAq0va/Ezd0Eyk?= =?us-ascii?Q?st8xK08MukdB30ZYPCDoVa36GpD3DyqcP9csSJqAncNvFFkPTtcjFyZTXZ2b?= =?us-ascii?Q?MbcC1p4W+ZpXUk7sI2/mqejzdMVjW+GZOIsrXkMhFemopZsoxf+iKnNQVmDt?= =?us-ascii?Q?44s7gNPuAEhe+WyXew5vmr7KS3gUI0aKzY4LbyqqLfu5640LkilmeDoGJNGB?= =?us-ascii?Q?8Knce74rLf00gpOjr0adfdDSFe6ucgow/dnF1GbAoLGl3e+Z3bmlAC41xZco?= =?us-ascii?Q?0pPJTIWBOT1P7n9/lKscdy2RUCJ3ZhUZ6siq4CyjW6azFiaNFYf4R6tJ2pfk?= =?us-ascii?Q?WYp/TcyQlJPjnp8Zb4yF22P7KFD1VHwRxQlHmWBHSQxpeMYfDWrkcK9GY9fW?= =?us-ascii?Q?6dfkvCPwJDWJfFYzE+Dk82yxkHFiOvvxHrxwszzSzhygJ6CnOvdw+4rbQMc5?= =?us-ascii?Q?dRSU7G3bfr/nSgwyk2ThtGtmYgaIvaTfdbT+MWHT5AX+vjszHmOq5rKNCMhO?= =?us-ascii?Q?/p7xSBYE059Z5t7hgDd5x0l/jK8CO/7bNGu0Nb0RwHkq7gECDKcA2m+mMnyC?= =?us-ascii?Q?knKFbX2F3Q=3D=3D?= X-OriginatorOrg: cyber.gent X-MS-Exchange-CrossTenant-Network-Message-Id: be27289d-7d42-4f59-c575-08df45520a82 X-MS-Exchange-CrossTenant-AuthSource: DBAP193MB0876.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2026 08:57:57.7281 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d5a0a0d6-18b4-44e3-8e5e-e5dbe37f9ee2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7YmkH8BXIaKbqrZorjKHKibtMoJ833UauZ7Jp3fa9YRA6/Ro7EaU0MG7FWFzduEnhQ1J3SIG63ZPv5htMHXCjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2P193MB2981 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address DMARC_PASS -0.1 DMARC pass policy GB_MSAUTHSOURCE_EUROPE 0.01 Mail authenticated via Microsoft Europe (EURP) datacenter KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: LWYZTNAZKIAPH5UGGXC4TXFBDRVNBY22 X-Message-ID-Hash: LWYZTNAZKIAPH5UGGXC4TXFBDRVNBY22 X-MailFrom: yvanj@cyber.gent X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Same reasoning as for arm64: dab is its own bootstrapper and already fetches binary- indices and unpacks the debs architecture agnostically, so an s390x target only needs the validation gate opened. For usr-merge, s390x needs lib32 in addition to the base set, matching debootstrap's link_dir for s390x. As with arm64, dab does not emulate foreign architectures, so s390x templates have to be built on an s390x host. Signed-off-by: Yvan Janssens --- PVE/DAB.pm | 4 +++- dab | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/DAB.pm b/PVE/DAB.pm index 77a3bee..77a9e61 100644 --- a/PVE/DAB.pm +++ b/PVE/DAB.pm @@ -770,6 +770,8 @@ sub setup_usr_merge { push @merged_dirs, qw(lib32 lib64 libx32); } elsif ($arch eq 'i386') { push @merged_dirs, qw(lib64 libx32); + } elsif ($arch eq 's390x') { + push @merged_dirs, qw(lib32); } # arm64 needs no extra lib directories beyond the base set, matching debootstrap's link_dir @@ -814,7 +816,7 @@ sub new { $self->{logfd}->autoflush(1); my $arch = $config->{architecture} || die "no 'architecture' specified\n"; - die "unsupported architecture '$arch'\n" if $arch !~ m/^(i386|amd64|arm64)$/; + die "unsupported architecture '$arch'\n" if $arch !~ m/^(i386|amd64|arm64|s390x)$/; my $suite = $config->{suite} || die "no 'suite' specified\n"; diff --git a/dab b/dab index 4930fe9..7bb2dcd 100755 --- a/dab +++ b/dab @@ -552,7 +552,7 @@ Appliance names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character. -=item B I +=item B I Target architecture. Note that dab does not emulate foreign architectures, so the build host's architecture has to match the target (for example, build -- 2.54.0 (Apple Git-157)