Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] runit-void: update os-release information
@ 2019-06-05  4:58 voidlinux-github
  2019-06-05  5:00 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  4:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3061 bytes --]

From d6923343488550b72e3898abd373cd1990528fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..010c0f9ee84 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float=""
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5te*) arch="armv5tel"; float="+soft-float";;
+		armv6tel*) arch="armv6l"; float="+vfp";;
+		armv7tel*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mipsel*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
  2019-06-05  5:00 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-05  5:00 ` voidlinux-github
  2019-06-05  5:04 ` voidlinux-github
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3053 bytes --]

From 051b4836198f964030622627a464f315830df244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..eafd56157ad 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float=""
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mipsel*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
@ 2019-06-05  5:00 ` voidlinux-github
  2019-06-05  5:00 ` voidlinux-github
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3053 bytes --]

From 051b4836198f964030622627a464f315830df244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..eafd56157ad 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float=""
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mipsel*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
  2019-06-05  5:00 ` [PR PATCH] [Updated] " voidlinux-github
  2019-06-05  5:00 ` voidlinux-github
@ 2019-06-05  5:04 ` voidlinux-github
  2019-06-05  5:04 ` voidlinux-github
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3050 bytes --]

From 3405b7e481f8fef2995030e59528ec5a8733b69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..44da7b71a47 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mipsel*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (2 preceding siblings ...)
  2019-06-05  5:04 ` voidlinux-github
@ 2019-06-05  5:04 ` voidlinux-github
  2019-06-05  5:09 ` voidlinux-github
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3050 bytes --]

From 3405b7e481f8fef2995030e59528ec5a8733b69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..44da7b71a47 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mipsel*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (3 preceding siblings ...)
  2019-06-05  5:04 ` voidlinux-github
@ 2019-06-05  5:09 ` voidlinux-github
  2019-06-05  5:09 ` voidlinux-github
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3048 bytes --]

From 80a070be7048ee62e8e1e73a9b1d01123975beb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..805ccc992e4 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (4 preceding siblings ...)
  2019-06-05  5:09 ` voidlinux-github
@ 2019-06-05  5:09 ` voidlinux-github
  2019-06-05  5:13 ` voidlinux-github
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3048 bytes --]

From 80a070be7048ee62e8e1e73a9b1d01123975beb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 33 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..805ccc992e4 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (5 preceding siblings ...)
  2019-06-05  5:09 ` voidlinux-github
@ 2019-06-05  5:13 ` voidlinux-github
  2019-06-05  5:13 ` voidlinux-github
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3370 bytes --]

From e8734e0490f96f7874c3754a2d2a0eb5d40637c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (6 preceding siblings ...)
  2019-06-05  5:13 ` voidlinux-github
@ 2019-06-05  5:13 ` voidlinux-github
  2019-06-05  6:54 ` voidlinux-github
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  5:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3370 bytes --]

From e8734e0490f96f7874c3754a2d2a0eb5d40637c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (8 preceding siblings ...)
  2019-06-05  6:54 ` voidlinux-github
@ 2019-06-05  6:54 ` voidlinux-github
  2019-06-05 15:45 ` voidlinux-github
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  6:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3370 bytes --]

From 1a49f7df272a46098eb5ddf40fbc7aeac3357fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (7 preceding siblings ...)
  2019-06-05  5:13 ` voidlinux-github
@ 2019-06-05  6:54 ` voidlinux-github
  2019-06-05  6:54 ` voidlinux-github
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05  6:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3370 bytes --]

From 1a49f7df272a46098eb5ddf40fbc7aeac3357fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..2c20e5b24a8 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="VoidLinux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="VoidLinux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (10 preceding siblings ...)
  2019-06-05 15:45 ` voidlinux-github
@ 2019-06-05 15:45 ` voidlinux-github
  2019-06-05 15:56 ` voidlinux-github
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05 15:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3374 bytes --]

From 6fb6a7a3dcfb5b1ec16a0e1f17f87d590c1bcbf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..8a28793f941 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="Void Linux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (9 preceding siblings ...)
  2019-06-05  6:54 ` voidlinux-github
@ 2019-06-05 15:45 ` voidlinux-github
  2019-06-05 15:45 ` voidlinux-github
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05 15:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3374 bytes --]

From 6fb6a7a3dcfb5b1ec16a0e1f17f87d590c1bcbf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  8 +++----
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..8a28793f941 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
-NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+NAME="Void Linux"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..065d2347ec8 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="x86_32";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="arm64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (11 preceding siblings ...)
  2019-06-05 15:45 ` voidlinux-github
@ 2019-06-05 15:56 ` voidlinux-github
  2019-06-06  8:48 ` [PR PATCH] [Updated] [NOMERGE] " voidlinux-github
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-05 15:56 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12160#issuecomment-499144909
Comment:
+1

El mié., 5 jun. 2019 17:49, Jürgen Buchmüller <notifications@github.com>
escribió:

> *@pullmoll* commented on this pull request.
> ------------------------------
>
> In srcpkgs/runit-void/files/os-release
> <https://github.com/void-linux/void-packages/pull/12160#discussion_r290811208>
> :
>
> > @@ -1,4 +1,4 @@
> -NAME="void"
> -ID="void"
> -DISTRIB_ID="void"
> -PRETTY_NAME="void"
> +NAME="VoidLinux"
>
> Well, I first changed it to a single word but you are right, NAME and
> PRETTY_NAME can contain spaces. I changed it. Let's wait and see what
> @void-linux/pkg-committers
> <https://github.com/orgs/void-linux/teams/pkg-committers> think about
> this PR in general and the name(s) in detail.
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/12160?email_source=notifications&email_token=AAGR7KKY7T35HQ6LTUYHXFLPY7OABA5CNFSM4HTPF5O2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB2VSYHQ#discussion_r290811208>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AAGR7KNB6LU5HQ64VZ525ULPY7OABANCNFSM4HTPF5OQ>
> .
>


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] [NOMERGE] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (13 preceding siblings ...)
  2019-06-06  8:48 ` [PR PATCH] [Updated] [NOMERGE] " voidlinux-github
@ 2019-06-06  8:48 ` voidlinux-github
  2019-06-22 16:28 ` voidlinux-github
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-06  8:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

[NOMERGE] runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3353 bytes --]

From 00e92081ea22b60d22ae2fa7d141ad11966cb6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  6 ++---
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..ab9fbb52c9a 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
 NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..677df7838d1 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="i686";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="aarch64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] [NOMERGE] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (12 preceding siblings ...)
  2019-06-05 15:56 ` voidlinux-github
@ 2019-06-06  8:48 ` voidlinux-github
  2019-06-06  8:48 ` voidlinux-github
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-06  8:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

[NOMERGE] runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3353 bytes --]

From 00e92081ea22b60d22ae2fa7d141ad11966cb6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  6 ++---
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..ab9fbb52c9a 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
 NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..677df7838d1 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="i686";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="aarch64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] [NOMERGE] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (15 preceding siblings ...)
  2019-06-22 16:28 ` voidlinux-github
@ 2019-06-22 16:28 ` voidlinux-github
  2019-06-29 19:08 ` [PR PATCH] [Closed]: " voidlinux-github
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-22 16:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

[NOMERGE] runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3353 bytes --]

From 412209b10a4012ad97613a594da695f76f03dc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  6 ++---
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..ab9fbb52c9a 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
 NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..677df7838d1 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="i686";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="aarch64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] [NOMERGE] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (14 preceding siblings ...)
  2019-06-06  8:48 ` voidlinux-github
@ 2019-06-22 16:28 ` voidlinux-github
  2019-06-22 16:28 ` voidlinux-github
  2019-06-29 19:08 ` [PR PATCH] [Closed]: " voidlinux-github
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-22 16:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pullmoll/void-packages osrel
https://github.com/void-linux/void-packages/pull/12160

[NOMERGE] runit-void: update os-release information
The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osrel-12160.patch --]
[-- Type: application/text/x-diff, Size: 3353 bytes --]

From 412209b10a4012ad97613a594da695f76f03dc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 5 Jun 2019 06:47:37 +0200
Subject: [PATCH] runit-void: update os-release information

The file `/etc/os-release` is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html
---
 srcpkgs/runit-void/files/os-release |  6 ++---
 srcpkgs/runit-void/template         | 35 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e..ab9fbb52c9a 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,4 @@
 NAME="void"
-ID="void"
-DISTRIB_ID="void"
-PRETTY_NAME="void"
+VERSION="rolling"
+ID="void_@arch@_@libc@"
+PRETTY_NAME="Void Linux (@arch@@float@ @libc@)"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 4b322b6a189..677df7838d1 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,13 +1,13 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20180623
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
-homepage="https://github.com/void-linux/void-runit"
 short_desc="Void Linux runit scripts"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="Public Domain"
+homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
 checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
 
@@ -27,10 +27,39 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	local arch="x86_64" libc="glibc" float
+
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) libc="musl";;
+		*) libc="glibc";;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch="i686";;
+		x86_64*) arch="x86_64";;
+		aarch64*) arch="aarch64"; float="+neon";;
+		armv5*) arch="armv5tel"; float="+soft-float";;
+		armv6*) arch="armv6l"; float="+vfp";;
+		armv7*) arch="armv7l"; float="+neon";;
+		ppc64le*) arch="powerpc64le";;
+		ppc64*) arch="powerpc64";;
+		ppc*) arch="powerpc";;
+		mipselhf*) arch="mipsel"; float="+hard-float";;
+		mipsel*) arch="mipsel"; float="+soft-float";;
+		mipshf*) arch="mips"; float="+hard-float";;
+		mips*) arch="mips"; float="+soft-float";;
+	esac
+
+	sed ${FILESDIR}/os-release \
+		-e "s;@arch@;$arch;" \
+		-e "s;@float@;$float;" \
+		-e "s;@libc@;$libc;" \
+		> os-release
+
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
+	vconf os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Closed]: [NOMERGE] runit-void: update os-release information
  2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
                   ` (16 preceding siblings ...)
  2019-06-22 16:28 ` voidlinux-github
@ 2019-06-29 19:08 ` voidlinux-github
  17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-06-29 19:08 UTC (permalink / raw)
  To: ml

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

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

[NOMERGE] runit-void: update os-release information
https://github.com/void-linux/void-packages/pull/12160
Description: The file /etc/os-release is used by e.g. os-prober (for grub) to extract
information for both, grub labels and user information.
For multiple boot partitions like glibc vs. musl libc, big vs. little
endian the user could not tell which partition contained which variant
because their names was always just "void".

This update creates an individual /etc/os-release containing information
about the libc (glibc or musl), the CPU architecture and endianness, and
the floating point options, if they are relevant.

The variable DISTRIB_ID is not defined in the description at:
https://www.freedesktop.org/software/systemd/man/os-release.html

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2019-06-29 19:08 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05  4:58 [PR PATCH] runit-void: update os-release information voidlinux-github
2019-06-05  5:00 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-05  5:00 ` voidlinux-github
2019-06-05  5:04 ` voidlinux-github
2019-06-05  5:04 ` voidlinux-github
2019-06-05  5:09 ` voidlinux-github
2019-06-05  5:09 ` voidlinux-github
2019-06-05  5:13 ` voidlinux-github
2019-06-05  5:13 ` voidlinux-github
2019-06-05  6:54 ` voidlinux-github
2019-06-05  6:54 ` voidlinux-github
2019-06-05 15:45 ` voidlinux-github
2019-06-05 15:45 ` voidlinux-github
2019-06-05 15:56 ` voidlinux-github
2019-06-06  8:48 ` [PR PATCH] [Updated] [NOMERGE] " voidlinux-github
2019-06-06  8:48 ` voidlinux-github
2019-06-22 16:28 ` voidlinux-github
2019-06-22 16:28 ` voidlinux-github
2019-06-29 19:08 ` [PR PATCH] [Closed]: " voidlinux-github

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).