* Re: [PR PATCH] [Updated] shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
@ 2021-01-09 1:01 ` olafmersmann
2021-01-09 1:03 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 1:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages master
https://github.com/void-linux/void-packages/pull/27779
shutils/chroot.sh: move homedir to /tmp/fake-home.
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
A patch file from https://github.com/void-linux/void-packages/pull/27779.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-27779.patch --]
[-- Type: text/x-diff, Size: 4200 bytes --]
From dccefd67847566208fa9d5849efc924a2ce54c0d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:44:35 +0100
Subject: [PATCH 1/4] shutils/chroot.sh: move homedir to /tmp/fake-home.
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
---
common/xbps-src/shutils/chroot.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 8646d758549..e4bf4129826 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -88,7 +88,7 @@ PATH=/void-packages:/usr/bin
exec env -i -- SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" \
${XBPS_ARCH+XBPS_ARCH=$XBPS_ARCH} ${XBPS_CHECK_PKGS+XBPS_CHECK_PKGS=$XBPS_CHECK_PKGS} \
- CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
+ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp/fake-home" \
PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
_EOF
@@ -119,7 +119,9 @@ chroot_prepare() {
# Copy /etc/passwd and /etc/group from base-files.
cp -f $XBPS_SRCPKGDIR/base-files/files/passwd $XBPS_MASTERDIR/etc
- echo "$(whoami):x:$(id -u):$(id -g):$(whoami) user:/tmp:/bin/xbps-shell" \
+ mkdir -p $XBPS_MASTERDIR/tmp/fake-home
+ chown $(id -u):$(id -g) $XBPS_MASTERDIR/tmp/fake-home
+ echo "$(whoami):x:$(id -u):$(id -g):$(whoami) user:/tmp/fake-home:/bin/xbps-shell" \
>> $XBPS_MASTERDIR/etc/passwd
cp -f $XBPS_SRCPKGDIR/base-files/files/group $XBPS_MASTERDIR/etc
echo "$(whoami):x:$(id -g):" >> $XBPS_MASTERDIR/etc/group
@@ -166,7 +168,7 @@ chroot_handler() {
rv=$?
else
env -i -- PATH="/usr/bin:$PATH" SHELL=/bin/sh \
- HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
+ HOME=/tmp/fake-home IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
${HTTP_PROXY:+HTTP_PROXY="${HTTP_PROXY}"} \
${HTTPS_PROXY:+HTTPS_PROXY="${HTTPS_PROXY}"} \
${FTP_PROXY:+FTP_PROXY="${FTP_PROXY}"} \
From 92bc76e4361963c0b4cc2534d44be60311dd27c6 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:56:44 +0100
Subject: [PATCH 2/4] starship: cleanup do_check.
---
srcpkgs/starship/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 0eae193aece..cdf8bcc97dd 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -22,11 +22,7 @@ post_build() {
}
do_check() {
- mkdir -p fake-home
- local OLDHOME=$HOME
- export HOME=$(pwd)/fake-home
cargo test -q --release --target ${RUST_TARGET}
- export HOME=$OLDHOME
}
post_install() {
From 6101e4de3a203bf99c956fb0854694dfa2694b85 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:58:12 +0100
Subject: [PATCH 3/4] passmenu: simplify do_check.
---
srcpkgs/pass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index 33f0811c76d..82fae4d661f 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -16,7 +16,7 @@ checksum=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4
do_check() {
mkdir -p fake-home
- HOME=$(pwd)/fake-home make test
+ make test
}
passmenu_package() {
From 066fe8c0f49ae57e9bf66d63b51a4477bcf57257 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:59:23 +0100
Subject: [PATCH 4/4] pygtk: simplify do_check.
---
srcpkgs/pygtk/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 41554b81763..e205ca332fc 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -28,10 +28,7 @@ pre_configure() {
}
do_check() {
- export HOME="$(mktemp -d)"
- mkdir -p "$HOME/.local/share"
xvfb-run make check
- rm -r "$HOME"
}
post_install() {
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR REVIEW] shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
2021-01-09 1:01 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-09 1:03 ` ericonr
2021-01-09 1:07 ` [PR PATCH] [Updated] " olafmersmann
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-09 1:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27779#discussion_r554266107
Comment:
You can remove this.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
2021-01-09 1:01 ` [PR PATCH] [Updated] " olafmersmann
2021-01-09 1:03 ` [PR REVIEW] " ericonr
@ 2021-01-09 1:07 ` olafmersmann
2021-01-09 1:07 ` [PR REVIEW] " olafmersmann
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages master
https://github.com/void-linux/void-packages/pull/27779
shutils/chroot.sh: move homedir to /tmp/fake-home.
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
A patch file from https://github.com/void-linux/void-packages/pull/27779.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-27779.patch --]
[-- Type: text/x-diff, Size: 4842 bytes --]
From dccefd67847566208fa9d5849efc924a2ce54c0d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:44:35 +0100
Subject: [PATCH 1/5] shutils/chroot.sh: move homedir to /tmp/fake-home.
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
---
common/xbps-src/shutils/chroot.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 8646d758549..e4bf4129826 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -88,7 +88,7 @@ PATH=/void-packages:/usr/bin
exec env -i -- SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" \
${XBPS_ARCH+XBPS_ARCH=$XBPS_ARCH} ${XBPS_CHECK_PKGS+XBPS_CHECK_PKGS=$XBPS_CHECK_PKGS} \
- CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
+ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp/fake-home" \
PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
_EOF
@@ -119,7 +119,9 @@ chroot_prepare() {
# Copy /etc/passwd and /etc/group from base-files.
cp -f $XBPS_SRCPKGDIR/base-files/files/passwd $XBPS_MASTERDIR/etc
- echo "$(whoami):x:$(id -u):$(id -g):$(whoami) user:/tmp:/bin/xbps-shell" \
+ mkdir -p $XBPS_MASTERDIR/tmp/fake-home
+ chown $(id -u):$(id -g) $XBPS_MASTERDIR/tmp/fake-home
+ echo "$(whoami):x:$(id -u):$(id -g):$(whoami) user:/tmp/fake-home:/bin/xbps-shell" \
>> $XBPS_MASTERDIR/etc/passwd
cp -f $XBPS_SRCPKGDIR/base-files/files/group $XBPS_MASTERDIR/etc
echo "$(whoami):x:$(id -g):" >> $XBPS_MASTERDIR/etc/group
@@ -166,7 +168,7 @@ chroot_handler() {
rv=$?
else
env -i -- PATH="/usr/bin:$PATH" SHELL=/bin/sh \
- HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
+ HOME=/tmp/fake-home IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
${HTTP_PROXY:+HTTP_PROXY="${HTTP_PROXY}"} \
${HTTPS_PROXY:+HTTPS_PROXY="${HTTPS_PROXY}"} \
${FTP_PROXY:+FTP_PROXY="${FTP_PROXY}"} \
From 92bc76e4361963c0b4cc2534d44be60311dd27c6 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:56:44 +0100
Subject: [PATCH 2/5] starship: cleanup do_check.
---
srcpkgs/starship/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 0eae193aece..cdf8bcc97dd 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -22,11 +22,7 @@ post_build() {
}
do_check() {
- mkdir -p fake-home
- local OLDHOME=$HOME
- export HOME=$(pwd)/fake-home
cargo test -q --release --target ${RUST_TARGET}
- export HOME=$OLDHOME
}
post_install() {
From 6101e4de3a203bf99c956fb0854694dfa2694b85 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:58:12 +0100
Subject: [PATCH 3/5] passmenu: simplify do_check.
---
srcpkgs/pass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index 33f0811c76d..82fae4d661f 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -16,7 +16,7 @@ checksum=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4
do_check() {
mkdir -p fake-home
- HOME=$(pwd)/fake-home make test
+ make test
}
passmenu_package() {
From 066fe8c0f49ae57e9bf66d63b51a4477bcf57257 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 01:59:23 +0100
Subject: [PATCH 4/5] pygtk: simplify do_check.
---
srcpkgs/pygtk/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 41554b81763..e205ca332fc 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -28,10 +28,7 @@ pre_configure() {
}
do_check() {
- export HOME="$(mktemp -d)"
- mkdir -p "$HOME/.local/share"
xvfb-run make check
- rm -r "$HOME"
}
post_install() {
From be7041bebbadbdb342f1ab23f2e4840e11380b7b Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 02:06:59 +0100
Subject: [PATCH 5/5] pass: simplify do_check.
---
srcpkgs/pass/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index 82fae4d661f..57493f0862c 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -15,7 +15,6 @@ distfiles="https://git.zx2c4.com/password-store/snapshot/password-store-${versio
checksum=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4
do_check() {
- mkdir -p fake-home
make test
}
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR REVIEW] shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
` (2 preceding siblings ...)
2021-01-09 1:07 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-09 1:07 ` olafmersmann
2021-01-09 1:08 ` olafmersmann
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by olafmersmann on void-packages repository
https://github.com/void-linux/void-packages/pull/27779#discussion_r554267103
Comment:
Done
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
` (3 preceding siblings ...)
2021-01-09 1:07 ` [PR REVIEW] " olafmersmann
@ 2021-01-09 1:08 ` olafmersmann
2021-01-09 1:08 ` ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by olafmersmann on void-packages repository
https://github.com/void-linux/void-packages/pull/27779#issuecomment-757068947
Comment:
The xlint fail for `pygtk` is ok according to a template comment:
```
# This is required to avoid compiling all of gtk-2.0
# Ignore xlint on this one
```
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
` (4 preceding siblings ...)
2021-01-09 1:08 ` olafmersmann
@ 2021-01-09 1:08 ` ericonr
2021-01-09 23:47 ` [PR PATCH] [Closed]: " olafmersmann
2021-01-09 23:47 ` [PR PATCH] [Updated] " olafmersmann
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-09 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27779#issuecomment-757069023
Comment:
Sure, no worries about it.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Closed]: shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
` (5 preceding siblings ...)
2021-01-09 1:08 ` ericonr
@ 2021-01-09 23:47 ` olafmersmann
2021-01-09 23:47 ` [PR PATCH] [Updated] " olafmersmann
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
There's a closed pull request on the void-packages repository
shutils/chroot.sh: move homedir to /tmp/fake-home.
https://github.com/void-linux/void-packages/pull/27779
Description:
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] shutils/chroot.sh: move homedir to /tmp/fake-home.
2021-01-09 0:52 [PR PATCH] shutils/chroot.sh: move homedir to /tmp/fake-home olafmersmann
` (6 preceding siblings ...)
2021-01-09 23:47 ` [PR PATCH] [Closed]: " olafmersmann
@ 2021-01-09 23:47 ` olafmersmann
7 siblings, 0 replies; 9+ messages in thread
From: olafmersmann @ 2021-01-09 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages master
https://github.com/void-linux/void-packages/pull/27779
shutils/chroot.sh: move homedir to /tmp/fake-home.
starship tests fail if /tmp is $HOME because they create files inside
/tmp and compare the shortend path to an expected path. If /tmp is
$HOME, starship contracts it to ~ which does not match the expected
value.
A patch file from https://github.com/void-linux/void-packages/pull/27779.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-27779.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread