From 15c39cb2584a822784ad97d3fb5b38134610af24 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 28 Feb 2022 12:01:24 +0100
Subject: [PATCH] Revert "move apt to /perl-apt, use PERLMOD_PRODUCT env var"

This reverts commit 9bc3ab23cba44ee9cdad2e6a24c9783a993183c5.

This is not the way we're going to organize common code.
---
 Cargo.toml                                   | 2 +-
 Makefile                                     | 1 -
 {perl-apt => pve-rs/src/apt}/mod.rs          | 0
 {perl-apt => pve-rs/src/apt}/repositories.rs | 2 +-
 pve-rs/src/lib.rs                            | 2 --
 pve-rs/src/openid/mod.rs                     | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)
 rename {perl-apt => pve-rs/src/apt}/mod.rs (100%)
 rename {perl-apt => pve-rs/src/apt}/repositories.rs (98%)

diff --git a/Cargo.toml b/Cargo.toml
index 6b869d4..b04fc01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-exclude = [ "build", "perl-*" ]
+exclude = [ "build" ]
 members = [
     "pve-rs",
     "pmg-rs",
diff --git a/Makefile b/Makefile
index eb197cf..101cfd5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ pve pmg:
 build:
 	mkdir build
 	echo system >build/rust-toolchain
-	cp -a ./perl-* ./build/
 	cp -a ./pve-rs ./build
 	cp -a ./pmg-rs ./build
 
diff --git a/perl-apt/mod.rs b/pve-rs/src/apt/mod.rs
similarity index 100%
rename from perl-apt/mod.rs
rename to pve-rs/src/apt/mod.rs
diff --git a/perl-apt/repositories.rs b/pve-rs/src/apt/repositories.rs
similarity index 98%
rename from perl-apt/repositories.rs
rename to pve-rs/src/apt/repositories.rs
index 04fa082..2d5e1da 100644
--- a/perl-apt/repositories.rs
+++ b/pve-rs/src/apt/repositories.rs
@@ -1,4 +1,4 @@
-#[perlmod::package(name = "${PERLMOD_PRODUCT}::RS::APT::Repositories")]
+#[perlmod::package(name = "PVE::RS::APT::Repositories", lib = "pve_rs")]
 mod export {
     use std::convert::TryInto;
 
diff --git a/pve-rs/src/lib.rs b/pve-rs/src/lib.rs
index 2c25ee1..69a7fb2 100644
--- a/pve-rs/src/lib.rs
+++ b/pve-rs/src/lib.rs
@@ -1,8 +1,6 @@
 //! Rust library for the Proxmox VE code base.
 
-#[path = "../../perl-apt/mod.rs"]
 pub mod apt;
-
 pub mod openid;
 pub mod tfa;
 pub mod calendar_event;
diff --git a/pve-rs/src/openid/mod.rs b/pve-rs/src/openid/mod.rs
index 2c47d3c..aa31f9c 100644
--- a/pve-rs/src/openid/mod.rs
+++ b/pve-rs/src/openid/mod.rs
@@ -1,4 +1,4 @@
-#[perlmod::package(name = "${PERLMOD_PRODUCT}::RS::OpenId")]
+#[perlmod::package(name = "PVE::RS::OpenId", lib = "pve_rs")]
 mod export {
     use std::sync::Mutex;
     use std::convert::TryFrom;