* [PR PATCH] New package: singularity-3.11.0
@ 2023-03-04 22:49 snwnde
2023-03-04 22:53 ` [PR REVIEW] " classabbyamp
` (23 more replies)
0 siblings, 24 replies; 25+ messages in thread
From: snwnde @ 2023-03-04 22:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]
There is a new pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 2728 bytes --]
From 5cf6cd3646b1ec68858da571db6fe1a43cba7fba Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 +++++++
srcpkgs/singularity/template | 54 ++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..3860a2fd1f78
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,54 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ ./mconfig \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib
+
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
@ 2023-03-04 22:53 ` classabbyamp
2023-03-04 23:14 ` snwnde
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2023-03-04 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#discussion_r1125569873
Comment:
why set the build_style when you override all the steps?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
2023-03-04 22:53 ` [PR REVIEW] " classabbyamp
@ 2023-03-04 23:14 ` snwnde
2023-03-06 20:50 ` [PR PATCH] [Updated] [WIP] " snwnde
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-04 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New review comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#discussion_r1125571663
Comment:
I was trying to do minimal change to https://github.com/void-linux/void-packages/pull/28129, and I agree there is no need to set it.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
2023-03-04 22:53 ` [PR REVIEW] " classabbyamp
2023-03-04 23:14 ` snwnde
@ 2023-03-06 20:50 ` snwnde
2023-03-06 20:59 ` snwnde
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3198 bytes --]
From 0380ee99d993be2f6e41e3cbd2cf1c5a40cc6578 Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 ++++++
srcpkgs/singularity/template | 66 ++++++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..864e933d99fb
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,66 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ if [ -f ./mlocal/checks/project-post.chk ]; then
+ rm ./mlocal/checks/project-post.chk
+ fi
+ GOOS=linux GOARCH=amd64 ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+post_configure() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOOS=linux GOARCH=amd64 srcdir=$PWD make -C builddir old_config=
+ fi
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (2 preceding siblings ...)
2023-03-06 20:50 ` [PR PATCH] [Updated] [WIP] " snwnde
@ 2023-03-06 20:59 ` snwnde
2023-03-06 21:40 ` snwnde
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3221 bytes --]
From 9f927573d409e5beffaeacf1893b1031b9186f50 Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 ++++++
srcpkgs/singularity/template | 67 ++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..06a9edd6cece
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,67 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=configure
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ if [ -f ./mlocal/checks/project-post.chk ]; then
+ rm ./mlocal/checks/project-post.chk
+ fi
+ GOOS=linux GOARCH=amd64 ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+post_configure() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOOS=linux GOARCH=amd64 srcdir=$PWD make -C builddir old_config=
+ fi
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (3 preceding siblings ...)
2023-03-06 20:59 ` snwnde
@ 2023-03-06 21:40 ` snwnde
2023-03-06 21:55 ` snwnde
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3234 bytes --]
From 7043bac881b6c77c86d36c62d6872ffb54a0a7ec Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 ++++++
srcpkgs/singularity/template | 67 ++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..6a90967abbce
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,67 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=configure
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ vsed -i \
+ -e '/feature: NO_NEW_PRIVS/,/feature: MS_SLAVE/{//!d}' \
+ ./mlocal/checks/project-post.chk
+ GOOS=linux GOARCH=amd64 ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+post_configure() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOOS=linux GOARCH=amd64 srcdir=$PWD make -C builddir old_config=
+ fi
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (4 preceding siblings ...)
2023-03-06 21:40 ` snwnde
@ 2023-03-06 21:55 ` snwnde
2023-03-06 22:16 ` [PR PATCH] [Updated] " snwnde
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Several difficulties with cross compilation.
- The configuration script `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- If we remove that block, we get this error message,
```
make: Entering directory '/builddir/singularity-3.11.0/builddir'
GEN GO DEP /builddir/singularity-3.11.0/builddir/starter.d
GEN GO DEP /builddir/singularity-3.11.0/builddir/singularity.d
GEN /builddir/singularity-3.11.0/scripts/go-generate
GO singularity
[+] GO_TAGS "containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper sylog singularity_engine fakeroot_engine apparmor selinux seccomp"
# runtime/cgo
aarch64-linux-gnu-gcc: error: unrecognized command-line option '-m64'
make: *** [Makefile:178: singularity] Error 1
```
This option doesn't exist for [gcc on aarch64](https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html) and this could be a bug from Singularity's compilation script.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (5 preceding siblings ...)
2023-03-06 21:55 ` snwnde
@ 2023-03-06 22:16 ` snwnde
2023-03-06 22:17 ` snwnde
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 22:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3292 bytes --]
From 38e8772c1422ce84a56d03ac3e509faea4438c91 Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 ++++++
srcpkgs/singularity/template | 67 ++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..8847fb174e64
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,67 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=configure
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ vsed -i \
+ -e '/feature: NO_NEW_PRIVS/,/feature: MS_SLAVE/{//!d}' \
+ ./mlocal/checks/project-post.chk
+ GOOS=linux GOARCH=$(go env | grep GOHOSTARCH | sed "s/GOHOSTARCH=//" | tr -d '"') ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+post_configure() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOOS=linux GOARCH=amd64 srcdir=$PWD make -C builddir old_config=
+ fi
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (6 preceding siblings ...)
2023-03-06 22:16 ` [PR PATCH] [Updated] " snwnde
@ 2023-03-06 22:17 ` snwnde
2023-03-07 19:01 ` snwnde
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-06 22:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3350 bytes --]
From 065d8e1467d0a80c1d4f8edb8718bf542fbf2cdf Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 ++++++
srcpkgs/singularity/template | 67 ++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..92d72621544c
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,67 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=configure
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ vsed -i \
+ -e '/feature: NO_NEW_PRIVS/,/feature: MS_SLAVE/{//!d}' \
+ ./mlocal/checks/project-post.chk
+ GOOS=linux GOARCH=$(go env | grep GOHOSTARCH | sed "s/GOHOSTARCH=//" | tr -d '"') ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+post_configure() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+}
+
+do_build() {
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOOS=linux GOARCH=$(go env | grep GOHOSTARCH | sed "s/GOHOSTARCH=//" | tr -d '"') srcdir=$PWD make -C builddir old_config=
+ fi
+ srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (7 preceding siblings ...)
2023-03-06 22:17 ` snwnde
@ 2023-03-07 19:01 ` snwnde
2023-03-07 19:06 ` snwnde
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
There is an updated pull request by snwnde against master on the void-packages repository
https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592
[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-singularity-42592.patch --]
[-- Type: text/x-diff, Size: 3789 bytes --]
From c8dd70d14db7ec7f48988c10b87e89d9b0349004 Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0
---
srcpkgs/singularity/INSTALL | 10 +++++
srcpkgs/singularity/template | 80 ++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+)
create mode 100644 srcpkgs/singularity/INSTALL
create mode 100644 srcpkgs/singularity/template
diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+ if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+ exit 1
+ else
+ chown root:_singularity usr/libexec/singularity/bin/starter-suid
+ chmod 4755 usr/libexec/singularity/bin/starter-suid
+ fi
+ ;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..f65543252294
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,80 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --libexecdir=/usr/libexec \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --without-conmon \
+ -v"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+post_configure() {
+ # cannot run binary built for another architecture
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ vsed -i \
+ -e '/feature: NO_NEW_PRIVS/,/feature: MS_SLAVE/{//!d}' \
+ ./mlocal/checks/project-post.chk
+ # host go is needed to run mconfig
+ GOARCH=$(go env | grep GOHOSTARCH | sed "s/GOHOSTARCH=//" | tr -d '"') ${configure_script} ${configure_args} -c cc -x c++ -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+ else
+ ${configure_script} ${configure_args}
+ fi
+}
+
+pre_build() {
+ # Fixup Makefile
+ # * Force use of vendored packages
+ # * Don't install bash completions into /etc/bash_completion.d
+ vsed -i \
+ -e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+ -e "s/ldflags=\"/ldflags=\" -extld=${LD} /" \
+ -e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+ builddir/Makefile
+
+ # target ld needs to be specified for go build in flags
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ vsed -i \
+ -e "s/ldflags=\"/ldflags=\" -extld=${LD} /" \
+ builddir/Makefile
+ fi
+}
+
+do_build() {
+ # host go is needed to generate some prerequisite codes
+ if ! [[ -z ${CROSS_BUILD} ]]; then
+ GOARCH=$(go env | grep GOHOSTARCH | sed "s/GOHOSTARCH=//" | tr -d '"') srcdir=$PWD make -C builddir old_config= codegen
+ fi
+ PATH="$PATH:/usr/aarch64-linux-gnu/usr/bin/" srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+ make DESTDIR="${DESTDIR}" -C builddir install all
+ chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+ vlicense LICENSE.md
+ vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+ # XXX: tests require sudo, so skip for now.
+ # make -C builddir unit-test integration-test e2e-test
+ : "Pass"
+}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (8 preceding siblings ...)
2023-03-07 19:01 ` snwnde
@ 2023-03-07 19:06 ` snwnde
2023-03-07 19:07 ` snwnde
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Several difficulties with cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run.
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (9 preceding siblings ...)
2023-03-07 19:06 ` snwnde
@ 2023-03-07 19:07 ` snwnde
2023-03-07 19:07 ` snwnde
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Tweaks needed for cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run.
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (10 preceding siblings ...)
2023-03-07 19:07 ` snwnde
@ 2023-03-07 19:07 ` snwnde
2023-03-07 19:09 ` snwnde
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run.
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (11 preceding siblings ...)
2023-03-07 19:07 ` snwnde
@ 2023-03-07 19:09 ` snwnde
2023-03-07 19:10 ` snwnde
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation,
- the configuration script `./mconf` needs host go to run,
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script,
- we can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run,
- cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (12 preceding siblings ...)
2023-03-07 19:09 ` snwnde
@ 2023-03-07 19:10 ` snwnde
2023-03-07 19:11 ` snwnde
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation,
- the configuration script `./mconf` needs host go to run
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script
- we can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run,
- cross compilation with `cgo` requires specifying `-extld` in go `ldflags`
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (13 preceding siblings ...)
2023-03-07 19:10 ` snwnde
@ 2023-03-07 19:11 ` snwnde
2023-03-07 19:12 ` [PR REVIEW] " snwnde
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run,
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (14 preceding siblings ...)
2023-03-07 19:11 ` snwnde
@ 2023-03-07 19:12 ` snwnde
2023-03-07 19:13 ` snwnde
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
New review comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#discussion_r1125571663
Comment:
I was trying to do minimal change to https://github.com/void-linux/void-packages/pull/28129, and I agree there is no need to set it.
Actually, this is needed to get correct `go env` when doing cross compilation.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (15 preceding siblings ...)
2023-03-07 19:12 ` [PR REVIEW] " snwnde
@ 2023-03-07 19:13 ` snwnde
2023-03-07 19:15 ` snwnde
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New review comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#discussion_r1125571663
Comment:
I was trying to do minimal change to https://github.com/void-linux/void-packages/pull/28129, and I agree there is no need to set it.
Edit: actually, this is needed to get correct `go env` when doing cross compilation.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (16 preceding siblings ...)
2023-03-07 19:13 ` snwnde
@ 2023-03-07 19:15 ` snwnde
2023-03-07 19:26 ` snwnde
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 950 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run,
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
Could we make this an x86-64 only package, given that binaries released by upstream are also only in this architecture https://github.com/sylabs/singularity/releases.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (17 preceding siblings ...)
2023-03-07 19:15 ` snwnde
@ 2023-03-07 19:26 ` snwnde
2023-03-07 19:31 ` snwnde
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs host go to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host go to run,
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
This does not solve all the problems, and I am unwilling to go down the rabbit hole. If someone is interested in that, this [template file](https://github.com/void-linux/void-packages/blob/c8dd70d14db7ec7f48988c10b87e89d9b0349004/srcpkgs/singularity/template) is a good start.
@classabbyamp Could we make this an x86-64 only package? Given that binaries released by upstream are also only in this architecture (https://github.com/sylabs/singularity/releases). If a native build for aarch64 can be tested, this can also be included.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (18 preceding siblings ...)
2023-03-07 19:26 ` snwnde
@ 2023-03-07 19:31 ` snwnde
2023-03-07 19:32 ` snwnde
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1347 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs `GOARCH=host arch` to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs `GOARCH=host arch`,
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
This does not solve all the problems, and I am unwilling to go down the rabbit hole. If someone is interested in that, this [template file](https://github.com/void-linux/void-packages/blob/c8dd70d14db7ec7f48988c10b87e89d9b0349004/srcpkgs/singularity/template) should be a good start.
@classabbyamp Could we make this an x86-64 only package? Given that binaries released by upstream are also only built for this architecture (https://github.com/sylabs/singularity/releases). If a native build for aarch64 can be tested, this can also be included.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (19 preceding siblings ...)
2023-03-07 19:31 ` snwnde
@ 2023-03-07 19:32 ` snwnde
2023-03-07 19:34 ` snwnde
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs `GOARCH=host arch` to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs `GOARCH=host arch`,
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
This does not solve all the problems, and I am unwilling to go down the rabbit hole. If someone is interested in looking at this, this [template file](https://github.com/void-linux/void-packages/blob/c8dd70d14db7ec7f48988c10b87e89d9b0349004/srcpkgs/singularity/template) should be a good start.
@classabbyamp Could we make this an x86-64 only package? Given that binaries released by upstream are also only built for this architecture (https://github.com/sylabs/singularity/releases). If a native build for aarch64 can be tested, this can also be included.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (20 preceding siblings ...)
2023-03-07 19:32 ` snwnde
@ 2023-03-07 19:34 ` snwnde
2023-06-06 2:05 ` github-actions
2023-06-21 1:57 ` [PR PATCH] [Closed]: " github-actions
23 siblings, 0 replies; 25+ messages in thread
From: snwnde @ 2023-03-07 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
New comment by snwnde on void-packages repository
https://github.com/void-linux/void-packages/pull/42592#issuecomment-1457061551
Comment:
Caution and tweaks for cross compilation.
- The configuration script `./mconf` needs `GOARCH` set to the host architecture to run.
- `./mconf` tries to build and run some test codes. While building can be done with another architecture, the execution is not possible AFAIK. See [this line](https://github.com/sylabs/singularity/blob/47809b518ec412896fe668cbb3674a6bed6e4548/mlocal/checks/project-post.chk#L202). We have to remove this block from the check script.
- We can remove that block to proceed and get a Makefile. A Makefile target called `codegen` again needs host `GOARCH`.
- Cross compilation with `cgo` requires specifying `-extld` in go `ldflags`.
This does not solve all the problems, and I am unwilling to go down the rabbit hole. If someone is interested in looking at this, this [template file](https://github.com/void-linux/void-packages/blob/c8dd70d14db7ec7f48988c10b87e89d9b0349004/srcpkgs/singularity/template) should be a good start.
@classabbyamp Could we make this an x86-64 only package? Given that binaries released by upstream are also only built for this architecture (https://github.com/sylabs/singularity/releases). If a native build for aarch64 can be tested, this can also be included.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (21 preceding siblings ...)
2023-03-07 19:34 ` snwnde
@ 2023-06-06 2:05 ` github-actions
2023-06-21 1:57 ` [PR PATCH] [Closed]: " github-actions
23 siblings, 0 replies; 25+ messages in thread
From: github-actions @ 2023-06-06 2:05 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/42592#issuecomment-1577782896
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] 25+ messages in thread
* Re: [PR PATCH] [Closed]: New package: singularity-3.11.0
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
` (22 preceding siblings ...)
2023-06-06 2:05 ` github-actions
@ 2023-06-21 1:57 ` github-actions
23 siblings, 0 replies; 25+ messages in thread
From: github-actions @ 2023-06-21 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There's a closed pull request on the void-packages repository
New package: singularity-3.11.0
https://github.com/void-linux/void-packages/pull/42592
Description:
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2023-06-21 1:57 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-04 22:49 [PR PATCH] New package: singularity-3.11.0 snwnde
2023-03-04 22:53 ` [PR REVIEW] " classabbyamp
2023-03-04 23:14 ` snwnde
2023-03-06 20:50 ` [PR PATCH] [Updated] [WIP] " snwnde
2023-03-06 20:59 ` snwnde
2023-03-06 21:40 ` snwnde
2023-03-06 21:55 ` snwnde
2023-03-06 22:16 ` [PR PATCH] [Updated] " snwnde
2023-03-06 22:17 ` snwnde
2023-03-07 19:01 ` snwnde
2023-03-07 19:06 ` snwnde
2023-03-07 19:07 ` snwnde
2023-03-07 19:07 ` snwnde
2023-03-07 19:09 ` snwnde
2023-03-07 19:10 ` snwnde
2023-03-07 19:11 ` snwnde
2023-03-07 19:12 ` [PR REVIEW] " snwnde
2023-03-07 19:13 ` snwnde
2023-03-07 19:15 ` snwnde
2023-03-07 19:26 ` snwnde
2023-03-07 19:31 ` snwnde
2023-03-07 19:32 ` snwnde
2023-03-07 19:34 ` snwnde
2023-06-06 2:05 ` github-actions
2023-06-21 1:57 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).