From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9FB2E7AD8D; Wed, 6 Jul 2022 13:13:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 946E9A186; Wed, 6 Jul 2022 13:13:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS; Wed, 6 Jul 2022 13:13:19 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AE59843DA2; Wed, 6 Jul 2022 13:13:19 +0200 (CEST) Date: Wed, 6 Jul 2022 13:13:18 +0200 From: Wolfgang Bumiller To: Fabian Ebner Cc: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Message-ID: <20220706111318.rav6ba2wi3omt2vq@casey.proxmox.com> References: <20220706085419.45987-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220706085419.45987-1-f.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.293 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH proxmox-perl-rs] move apt repositories module to common X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2022 11:13:20 -0000 On Wed, Jul 06, 2022 at 10:54:17AM +0200, Fabian Ebner wrote: > while introducing a 'product' parameter to the relevant functions. > > Suggested-by: Wolfgang Bumiller > Signed-off-by: Fabian Ebner > --- > > I did the changes in Proxmox/Lib/Common.pm (and Makefile) manually. > Is that the intended way or could I have generated those somehow? > > Hope I got these right: > > pve-manager (respectively pmg-api) depends and build-depends on > libproxmox-rs-perl and libpve-rs-perl (respectively libpmg-rs-perl). > Both are needed, because just upgrading libproxmox-rs-perl doesn't > make the new functionality available in the product-specific shared > lib. > > New libpve-rs-perl breaks old pve-manager and new libpmg-rs-perl > breaks old pmg-api. I mean in theory we could keep the old functions and just have them forward to the common module with the corresponding product parameter added, for a little while anyway? > > I don't think there's a depends/breaks needed between > libproxmox-perl-rs and lib{pmg, pve}-rs-perl, but we could also go > ahead an do that, and have pve-manager and pmg-api only depend on one > of the above rather than both. > > Makefile | 6 +- > Proxmox/Lib/Common.pm | 8 + > {pmg-rs => common}/src/apt/mod.rs | 0 > {pmg-rs => common}/src/apt/repositories.rs | 18 ++- > common/src/mod.rs | 1 + > pmg-rs/src/lib.rs | 1 - > pve-rs/src/apt/mod.rs | 1 - > pve-rs/src/apt/repositories.rs | 162 --------------------- > pve-rs/src/lib.rs | 1 - > 9 files changed, 22 insertions(+), 176 deletions(-) > rename {pmg-rs => common}/src/apt/mod.rs (100%) > rename {pmg-rs => common}/src/apt/repositories.rs (86%) > delete mode 100644 pve-rs/src/apt/mod.rs > delete mode 100644 pve-rs/src/apt/repositories.rs > > diff --git a/Makefile b/Makefile > index 6f9b597..4b59a57 100644 > --- a/Makefile > +++ b/Makefile > @@ -41,13 +41,13 @@ pve pmg: > gen: > $(call package_template,PMG,pmg_rs) > $(call package_template,PVE,pve_rs) > - perl ./scripts/genpackage.pl Common Proxmox::RS::CalendarEvent > + perl ./scripts/genpackage.pl Common \ > + Proxmox::RS::APT::Repositories \ > + Proxmox::RS::CalendarEvent > perl ./scripts/genpackage.pl PVE \ > - PVE::RS::APT::Repositories \ > PVE::RS::OpenId \ > PVE::RS::TFA > perl ./scripts/genpackage.pl PMG \ > - PMG::RS::APT::Repositories \ > PMG::RS::Acme \ > PMG::RS::CSR \ > PMG::RS::OpenId \ > diff --git a/Proxmox/Lib/Common.pm b/Proxmox/Lib/Common.pm > index d8a0d57..668986d 100644 > --- a/Proxmox/Lib/Common.pm > +++ b/Proxmox/Lib/Common.pm > @@ -6,6 +6,14 @@ Proxmox::Lib::Common - base module for rust bindings common between PVE and PMG > > =head1 SYNOPSIS > > + package Proxmox::RS::APT::Repositories; > + > + use base 'Proxmox::Lib::Common'; > + > + BEGIN { __PACKAGE__->bootstrap(); } > + > + 1; > + This is just example documentation, no need to do anything to this file at all. > package Proxmox::RS::CalendarEvent; > > use base 'Proxmox::Lib::Common';