Re: [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages base-container
https://github.com/void-linux/void-packages/pull/45565

[RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
If we don't want to do this, I'd be fine with just changing the description.

This makes it more clear that it's not meant for normal usage. Provide a transitional package because this could ruin someone's day.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/45565.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-container-45565.patch --]
[-- Type: text/x-diff, Size: 4417 bytes --]

From 2977fd89fb6c236a9a18d39d766bed1baf15f786 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:22:02 -0400
Subject: [PATCH 1/3] base-minimal: rename to base-container

This makes it more clear that it's not meant for normal usage.
provide a transitional package because this could ruin someone's day
---
 srcpkgs/{base-minimal => base-container}/template | 14 ++++++++++----
 srcpkgs/base-minimal                              |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename srcpkgs/{base-minimal => base-container}/template (59%)
 create mode 120000 srcpkgs/base-minimal

diff --git a/srcpkgs/base-minimal/template b/srcpkgs/base-container/template
similarity index 59%
rename from srcpkgs/base-minimal/template
rename to srcpkgs/base-container/template
index f43f0c3ccc356..3778e3ae956bb 100644
--- a/srcpkgs/base-minimal/template
+++ b/srcpkgs/base-container/template
@@ -1,9 +1,9 @@
-# Template file for 'base-minimal'
-pkgname=base-minimal
+# Template file for 'base-container'
+pkgname=base-container
 version=0.3
-revision=1
+revision=2
 build_style=meta
-short_desc="Void Linux base system meta with minimal tools"
+short_desc="Void Linux base system meta for minimal containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org/"
@@ -17,3 +17,9 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;
 	*) depends+=" glibc-locales";;
 esac
+
+base-minimal_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/base-minimal b/srcpkgs/base-minimal
new file mode 120000
index 0000000000000..4b836ce798602
--- /dev/null
+++ b/srcpkgs/base-minimal
@@ -0,0 +1 @@
+base-container
\ No newline at end of file

From 8c7417fd5b819195f32e54cb95c82f0b2231aee2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:41:23 -0400
Subject: [PATCH 2/3] base-voidstrap: rename to base-container-full

same reasoning as base-container
---
 .../{base-voidstrap => base-container-full}/template | 12 +++++++++---
 srcpkgs/base-voidstrap                               |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename srcpkgs/{base-voidstrap => base-container-full}/template (74%)
 create mode 120000 srcpkgs/base-voidstrap

diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-container-full/template
similarity index 74%
rename from srcpkgs/base-voidstrap/template
rename to srcpkgs/base-container-full/template
index 563f950d5d7d1..8433cf0690325 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-container-full/template
@@ -1,7 +1,7 @@
-# Template file for 'base-voidstrap'
-pkgname=base-voidstrap
+# Template file for 'base-container-full'
+pkgname=base-container-full
 version=0.11
-revision=1
+revision=2
 build_style=meta
 short_desc="Void Linux base system meta package for containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -19,3 +19,9 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;
 	*) depends+=" glibc-locales";;
 esac
+
+base-voidstrap_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/base-voidstrap b/srcpkgs/base-voidstrap
new file mode 120000
index 0000000000000..8bb6a358fc1cb
--- /dev/null
+++ b/srcpkgs/base-voidstrap
@@ -0,0 +1 @@
+base-container-full
\ No newline at end of file

From 5c61f84852a4f8c9fad300b90e5b36c84f4776e6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:46:36 -0400
Subject: [PATCH 3/3] lxc: switch to base-container in lxc-void

---
 srcpkgs/lxc/files/lxc-void | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxc/files/lxc-void b/srcpkgs/lxc/files/lxc-void
index 948a5be9336a5..eebeefa26355d 100755
--- a/srcpkgs/lxc/files/lxc-void
+++ b/srcpkgs/lxc/files/lxc-void
@@ -42,8 +42,8 @@ arch=$(uname -m)
 default_path="/var/lib/lxc"
 LXC_TEMPLATE_CONFIG="/usr/share/lxc/config"
 
-# Install 'base-minimal' by default
-base_packages=('base-minimal' 'dhcpcd' 'openssh' 'iproute2')
+# Install 'base-container' by default
+base_packages=('base-container' 'dhcpcd' 'openssh' 'iproute2')
 declare -a additional_packages
 
 # split comma-separated string into an array