[PR PATCH] [RFC] xtools: add xtools-live subpackage

[PR PATCH] [RFC] xtools: add xtools-live subpackage

[classabbyamp]

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

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages xtools-live
https://github.com/void-linux/void-packages/pull/37826

[RFC] xtools: add xtools-live subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

- Not too sure about this approach, it's a bit clunky, and leaves non-included tools in the manpage.
- Should the subpackage be named as such or something else?
- is this list of tools a good selection? I took all the ones that aren't related to packaging *and* don't need git (the largest dependency by far)

see also void-linux/void-mklive#

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xtools-live-37826.patch --]
[-- Type: text/x-diff, Size: 1854 bytes --]

From 5f78fb4838abe84ee23ea725737a01eee7e4b1a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 3 Jul 2022 20:35:54 -0400
Subject: [PATCH] xtools: add xtools-live subpackage

---
 srcpkgs/xtools-live     |  1 +
 srcpkgs/xtools/template | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/xtools-live

diff --git a/srcpkgs/xtools-live b/srcpkgs/xtools-live
new file mode 120000
index 000000000000..2af5852036b4
--- /dev/null
+++ b/srcpkgs/xtools-live
@@ -0,0 +1 @@
+xtools
\ No newline at end of file
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 5392fb9a0602..152138b4bad4 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,7 +1,7 @@
 # Template file for 'xtools'
 pkgname=xtools
 version=0.64
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
 short_desc="Opinionated helpers for working with XBPS"
@@ -10,3 +10,20 @@ license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
 checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be
+
+xtools-live_package() {
+	short_desc+=" - minimal subset for Void live systems"
+	depends="bash findutils xbps"
+	conflicts="${sourcepkg}>=0.64_2"
+	pkg_install() {
+		vmkdir usr/bin
+		vmkdir usr/share/man/man1
+		for tool in xcheckrestart xchroot xclash xdbg xdiff xdowngrade xetcchanges \
+			xgrep xhog xilog xmandoc xmksv xnodev xoptdiff xpkg xuname xvoidstrap; do
+			vcopy ${DESTDIR}/usr/bin/$tool usr/bin/$tool
+			vcopy ${DESTDIR}/usr/share/man/man1/$tool.1 usr/share/man/man1/$tool.1
+		done
+		vcopy ${DESTDIR}/usr/share/man/man1/xtools.1 usr/share/man/man1/xtools.1
+		vcopy ${DESTDIR}/usr/share/zsh usr/share/
+	}
+}

Re: [RFC] xtools: add xtools-live subpackage

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/37826#issuecomment-1173806145

Comment:
Why not make a proper subpackage and let xtools depend on xtools-live?

Re: [PR PATCH] [Updated] [RFC] xtools: add xtools-live subpackage

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xtools-live
https://github.com/void-linux/void-packages/pull/37826

[RFC] xtools: add xtools-live subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

- Not too sure about this approach, it's a bit clunky, and leaves non-included tools in the manpage.
- Should the subpackage be named as such or something else?
- is this list of tools a good selection? I took all the ones that aren't related to packaging *and* don't need git (the largest dependency by far)

see also void-linux/void-mklive#255

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xtools-live-37826.patch --]
[-- Type: text/x-diff, Size: 1910 bytes --]

From 58759cedc7b43ee4193360ea5cb48872cff4e9ab Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 3 Jul 2022 20:35:54 -0400
Subject: [PATCH] xtools: add xtools-minimal subpackage

---
 srcpkgs/xtools-minimal  |  1 +
 srcpkgs/xtools/template | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/xtools-minimal

diff --git a/srcpkgs/xtools-minimal b/srcpkgs/xtools-minimal
new file mode 120000
index 000000000000..2af5852036b4
--- /dev/null
+++ b/srcpkgs/xtools-minimal
@@ -0,0 +1 @@
+xtools
\ No newline at end of file
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 5392fb9a0602..fee3cfda7ef5 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,12 +1,32 @@
 # Template file for 'xtools'
 pkgname=xtools
 version=0.64
-revision=1
+revision=2
 build_style=gnu-makefile
-depends="bash curl findutils git make spdx-licenses-list xbps"
+depends="curl git make spdx-licenses-list xbps
+ xtools-minimal-${version}_${revision}"
 short_desc="Opinionated helpers for working with XBPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
 checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be
+
+# all xtools that can function without git installed
+# (git is by far the largest dependency)
+_minimal="xcheckrestart xchroot xclash xdbg xdiff xdistdir xdowngrade
+ xetcchanges xgrep xhog xi xilog xmandoc xls xmksv xnodev xoptdiff xpkg xq xrs
+ xuname xvoidstrap"
+
+xtools-minimal_package() {
+	short_desc+=" - minimal subset"
+	depends="bash findutils xbps"
+	pkg_install() {
+		for tool in $_minimal; do
+			vmove usr/bin/$tool
+			vmove usr/share/man/man1/$tool.1
+		done
+		vmove usr/share/man/man1/xtools.1
+		vmove usr/share/zsh
+	}
+}

Re: [RFC] xtools: add xtools-live subpackage

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37826#issuecomment-1173970593

Comment:
Should've done that in the first place. Also found that several tools that use git *can* function without it (sans auto-detecting void-packages), but that seems like an acceptable compromise for a live environment, and if the user is downloading void-packages in live for whatever reason, they'll need to install git anyways.

Re: [PR PATCH] [Updated] [RFC] xtools: add xtools-minimal subpackage

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xtools-live
https://github.com/void-linux/void-packages/pull/37826

[RFC] xtools: add xtools-minimal subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

- Not too sure about this approach, it's a bit clunky, and leaves non-included tools in the manpage.
- Should the subpackage be named as such or something else?
- is this list of tools a good selection? I took all the ones that aren't related to packaging *and* don't need git (the largest dependency by far)

see also:
- void-linux/void-mklive#255
- void-linux/void-docs#688

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xtools-live-37826.patch --]
[-- Type: text/x-diff, Size: 1902 bytes --]

From 43caa017fe5ef5c24bbd879eb394605effbe25e6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 3 Jul 2022 20:35:54 -0400
Subject: [PATCH] xtools: add xtools-minimal subpackage

---
 srcpkgs/xtools-minimal  |  1 +
 srcpkgs/xtools/template | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/xtools-minimal

diff --git a/srcpkgs/xtools-minimal b/srcpkgs/xtools-minimal
new file mode 120000
index 000000000000..2af5852036b4
--- /dev/null
+++ b/srcpkgs/xtools-minimal
@@ -0,0 +1 @@
+xtools
\ No newline at end of file
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 5392fb9a0602..676928bff814 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,12 +1,31 @@
 # Template file for 'xtools'
 pkgname=xtools
 version=0.64
-revision=1
+revision=2
 build_style=gnu-makefile
-depends="bash curl findutils git make spdx-licenses-list xbps"
+depends="curl git make spdx-licenses-list xtools-minimal-${version}_${revision}"
 short_desc="Opinionated helpers for working with XBPS"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
 checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be
+
+# all xtools that can function without git installed
+# (git is by far the largest dependency)
+_minimal="xcheckrestart xchroot xclash xdbg xdiff xdistdir xdowngrade
+ xetcchanges xgrep xhog xi xilog xmandoc xls xmksv xnodev xoptdiff xpkg xq xrs
+ xuname xvoidstrap"
+
+xtools-minimal_package() {
+	short_desc+=" - minimal subset"
+	depends="bash findutils xbps"
+	pkg_install() {
+		for tool in $_minimal; do
+			vmove usr/bin/$tool
+			vmove usr/share/man/man1/$tool.1
+		done
+		vmove usr/share/man/man1/xtools.1
+		vmove usr/share/zsh
+	}
+}

Re: [PR PATCH] [Merged]: [RFC] xtools: add xtools-minimal subpackage

[classabbyamp]

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

There's a merged pull request on the void-packages repository

[RFC] xtools: add xtools-minimal subpackage
https://github.com/void-linux/void-packages/pull/37826

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

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

- Not too sure about this approach, it's a bit clunky, and leaves non-included tools in the manpage.
- Should the subpackage be named as such or something else?
- is this list of tools a good selection? I took all the ones that aren't related to packaging *and* don't need git (the largest dependency by far)

see also:
- void-linux/void-mklive#255
- void-linux/void-docs#688