* Re: [PR PATCH] [Updated] [RFC] base-minimal: rename to base-container
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
@ 2023-08-12 17:33 ` classabbyamp
2023-08-12 17:37 ` ahesford
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-08-12 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 718 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: rename to base-container
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**
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: 1842 bytes --]
From a0fb85ca520e3272e9a5cf875894f376611bd6b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:22:02 -0400
Subject: [PATCH] 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-minimal: rename to base-container
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
2023-08-12 17:33 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-08-12 17:37 ` ahesford
2023-08-12 17:42 ` [PR PATCH] [Updated] " classabbyamp
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2023-08-12 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1676024404
Comment:
+1
Would this ruin somebody's day? Might break some container build scripts, I guess; but if we don't add it to `removed-packages`, it shouldn't break any updates.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] [RFC] base-minimal: rename to base-container
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
2023-08-12 17:33 ` [PR PATCH] [Updated] " classabbyamp
2023-08-12 17:37 ` ahesford
@ 2023-08-12 17:42 ` classabbyamp
2023-08-12 17:43 ` [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full} classabbyamp
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-08-12 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 718 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: rename to base-container
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**
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: 3817 bytes --]
From a0fb85ca520e3272e9a5cf875894f376611bd6b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:22:02 -0400
Subject: [PATCH 1/2] 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 f5ce34e08158ecc82b68d08ebe718d5fde7aad6e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:41:23 -0400
Subject: [PATCH 2/2] base-voidstrap: rename to base-container-full
same reasoning as base-container
---
srcpkgs/base-container-full/base-container-full | 1 +
.../{base-voidstrap => base-container-full}/template | 10 ++++++++--
srcpkgs/base-voidstrap | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/base-container-full/base-container-full
rename srcpkgs/{base-voidstrap => base-container-full}/template (76%)
create mode 120000 srcpkgs/base-voidstrap
diff --git a/srcpkgs/base-container-full/base-container-full b/srcpkgs/base-container-full/base-container-full
new file mode 120000
index 0000000000000..945c9b46d684f
--- /dev/null
+++ b/srcpkgs/base-container-full/base-container-full
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-container-full/template
similarity index 76%
rename from srcpkgs/base-voidstrap/template
rename to srcpkgs/base-container-full/template
index 563f950d5d7d1..464b52be5ec0e 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-container-full/template
@@ -1,5 +1,5 @@
-# Template file for 'base-voidstrap'
-pkgname=base-voidstrap
+# Template file for 'base-container-full'
+pkgname=base-container-full
version=0.11
revision=1
build_style=meta
@@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (2 preceding siblings ...)
2023-08-12 17:42 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-08-12 17:43 ` classabbyamp
2023-08-12 17:46 ` classabbyamp
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-08-12 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 738 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**
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: 3405 bytes --]
From a0fb85ca520e3272e9a5cf875894f376611bd6b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:22:02 -0400
Subject: [PATCH 1/2] 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 6197c58826376c90031df940f9fdcbfc47ba112c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 12 Aug 2023 13:41:23 -0400
Subject: [PATCH 2/2] base-voidstrap: rename to base-container-full
same reasoning as base-container
---
.../{base-voidstrap => base-container-full}/template | 10 ++++++++--
srcpkgs/base-voidstrap | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
rename srcpkgs/{base-voidstrap => base-container-full}/template (76%)
create mode 120000 srcpkgs/base-voidstrap
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-container-full/template
similarity index 76%
rename from srcpkgs/base-voidstrap/template
rename to srcpkgs/base-container-full/template
index 563f950d5d7d1..464b52be5ec0e 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-container-full/template
@@ -1,5 +1,5 @@
-# Template file for 'base-voidstrap'
-pkgname=base-voidstrap
+# Template file for 'base-container-full'
+pkgname=base-container-full
version=0.11
revision=1
build_style=meta
@@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (3 preceding siblings ...)
2023-08-12 17:43 ` [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full} classabbyamp
@ 2023-08-12 17:46 ` classabbyamp
2023-08-12 17:48 ` classabbyamp
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-08-12 17:46 UTC (permalink / raw)
To: ml
[-- 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: 4284 bytes --]
From a0fb85ca520e3272e9a5cf875894f376611bd6b7 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 6197c58826376c90031df940f9fdcbfc47ba112c 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 | 10 ++++++++--
srcpkgs/base-voidstrap | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
rename srcpkgs/{base-voidstrap => base-container-full}/template (76%)
create mode 120000 srcpkgs/base-voidstrap
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-container-full/template
similarity index 76%
rename from srcpkgs/base-voidstrap/template
rename to srcpkgs/base-container-full/template
index 563f950d5d7d1..464b52be5ec0e 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-container-full/template
@@ -1,5 +1,5 @@
-# Template file for 'base-voidstrap'
-pkgname=base-voidstrap
+# Template file for 'base-container-full'
+pkgname=base-container-full
version=0.11
revision=1
build_style=meta
@@ -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 5c12e2762f625e4497fdab98e3b8acca8a389e04 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (4 preceding siblings ...)
2023-08-12 17:46 ` classabbyamp
@ 2023-08-12 17:48 ` classabbyamp
2023-08-14 11:56 ` Zapeth
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-08-12 17:48 UTC (permalink / raw)
To: ml
[-- 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 d1c576c5ac02ff2e5e83942538976815973c2f9f 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 f32fa059ef26433cfe7022c76a4c1032824b4216 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 e7417ecbf7b874ad38f5be18ced2a2345d9ff53c 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (5 preceding siblings ...)
2023-08-12 17:48 ` classabbyamp
@ 2023-08-14 11:56 ` Zapeth
2023-08-14 12:03 ` Zapeth
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Zapeth @ 2023-08-14 11:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
New comment by Zapeth on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1677185865
Comment:
Slightly offtopic but I'm just wondering if there's a reason why these packages are not set up as a dependency chain.
Currently all dependencies of `base-minimal` are set in both `base-voidstrap` and `base-system`, and all dependencies of `base-voidstrap` are set in `base-system` (the only anomaly is that `base-system` specifically sets `base-files>=0.77` instead of just `base-files`).
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (6 preceding siblings ...)
2023-08-14 11:56 ` Zapeth
@ 2023-08-14 12:03 ` Zapeth
2023-08-14 12:03 ` Zapeth
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Zapeth @ 2023-08-14 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
New comment by Zapeth on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1677185865
Comment:
Slightly offtopic but I'm just wondering if there's a reason why these packages are not set up as a dependency chain.
Currently all dependencies of `base-minimal` are set in both `base-voidstrap`, and all dependencies of `base-voidstrap` are set in `base-system` (the only anomaly is that `base-system` specifically sets `base-files>=0.77` instead of just `base-files`).
If they were set up as dependencies then I'd say the original names would make more sense.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (7 preceding siblings ...)
2023-08-14 12:03 ` Zapeth
@ 2023-08-14 12:03 ` Zapeth
2023-08-14 13:42 ` ahesford
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Zapeth @ 2023-08-14 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
New comment by Zapeth on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1677185865
Comment:
Slightly offtopic but I'm just wondering if there's a reason why these packages are not set up as a dependency chain.
Currently all dependencies of `base-minimal` are set in `base-voidstrap`, and all dependencies of `base-voidstrap` are set in `base-system` (the only anomaly is that `base-system` specifically sets `base-files>=0.77` instead of just `base-files`).
If they were set up as dependencies then I'd say the original names make more sense.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (8 preceding siblings ...)
2023-08-14 12:03 ` Zapeth
@ 2023-08-14 13:42 ` ahesford
2023-08-14 14:07 ` Zapeth
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2023-08-14 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1677342429
Comment:
Unifying the dependencies [has been discussed](https://github.com/void-linux/void-packages/pull/39814) but failed to gain enough traction.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (9 preceding siblings ...)
2023-08-14 13:42 ` ahesford
@ 2023-08-14 14:07 ` Zapeth
2023-11-13 1:46 ` github-actions
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Zapeth @ 2023-08-14 14:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
New comment by Zapeth on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1677386464
Comment:
Thanks for the link, I see the main pro/cons points were already discussed.
I don't necessarily agree with the conclusion, but if it hasn't been an issue so far to the keep the base package dependencies in sync then I guess there really is not much benefit in changing it.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (10 preceding siblings ...)
2023-08-14 14:07 ` Zapeth
@ 2023-11-13 1:46 ` github-actions
2023-11-30 15:13 ` [PR PATCH] [Updated] " classabbyamp
2023-12-01 23:15 ` [PR PATCH] [Merged]: " classabbyamp
13 siblings, 0 replies; 15+ messages in thread
From: github-actions @ 2023-11-13 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45565#issuecomment-1807356014
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (11 preceding siblings ...)
2023-11-13 1:46 ` github-actions
@ 2023-11-30 15:13 ` classabbyamp
2023-12-01 23:15 ` [PR PATCH] [Merged]: " classabbyamp
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-11-30 15:13 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Merged]: [RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
2023-08-12 17:24 [PR PATCH] [RFC] base-minimal: rename to base-container classabbyamp
` (12 preceding siblings ...)
2023-11-30 15:13 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-12-01 23:15 ` classabbyamp
13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-12-01 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There's a merged pull request on the void-packages repository
[RFC] base-{minimal,voidstrap}: rename to base-container{,-full}
https://github.com/void-linux/void-packages/pull/45565
Description:
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]
^ permalink raw reply [flat|nested] 15+ messages in thread