diff mbox series

[RFC] initscripts: dont use /tmp symlink if ptest is enabled

Message ID 20230317060342.386014-1-f_l_k@t-online.de
State New
Headers show
Series [RFC] initscripts: dont use /tmp symlink if ptest is enabled | expand

Commit Message

Markus Volk March 17, 2023, 6:03 a.m. UTC
glib-2.0 ptest will fail if /tmp is a symlink to /var/tmp

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexander Kanavin March 17, 2023, 7:27 a.m. UTC | #1
This is not suitable unfortunately. Having ptest should not be affecting
completely unrelated files. The problem should be solved without using it
as a decision point.

Alex

On Fri 17. Mar 2023 at 7.04, Markus Volk <f_l_k@t-online.de> wrote:

> glib-2.0 ptest will fail if /tmp is a symlink to /var/tmp
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
> b/meta/recipes-core/initscripts/initscripts_1.0.bb
> index 4dc477bb8d..51a90ddf58 100644
> --- a/meta/recipes-core/initscripts/initscripts_1.0.bb
> +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
> @@ -108,7 +108,7 @@ do_install () {
>                 sed -i -e '\@^d root root 0755 /var/volatile/log none$@
> a\l root root 0755 /var/log /var/volatile/log' \
>                         ${D}${sysconfdir}/default/volatiles/00_core
>         fi
> -       if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then
> +       if [ "${VOLATILE_TMP_DIR}" != "yes" ]  ||
> ${@bb.utils.contains('DISTRO_FEATURES','ptest','true','false',d)}; then
>                 sed -i -e "/\<tmp\>/d"
> ${D}${sysconfdir}/default/volatiles/00_core
>         fi
>         install -m 0755    ${WORKDIR}/dmesg.sh
> ${D}${sysconfdir}/init.d
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#178739):
> https://lists.openembedded.org/g/openembedded-core/message/178739
> Mute This Topic: https://lists.openembedded.org/mt/97667599/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Richard Purdie March 17, 2023, 8:02 a.m. UTC | #2
On Fri, 2023-03-17 at 07:03 +0100, Markus Volk wrote:
> glib-2.0 ptest will fail if /tmp is a symlink to /var/tmp
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
> index 4dc477bb8d..51a90ddf58 100644
> --- a/meta/recipes-core/initscripts/initscripts_1.0.bb
> +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
> @@ -108,7 +108,7 @@ do_install () {
>  		sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \
>  			${D}${sysconfdir}/default/volatiles/00_core
>  	fi
> -	if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then
> +	if [ "${VOLATILE_TMP_DIR}" != "yes" ]  || ${@bb.utils.contains('DISTRO_FEATURES','ptest','true','false',d)}; then
>  		sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core
>  	fi
>  	install -m 0755    ${WORKDIR}/dmesg.sh		${D}${sysconfdir}/init.d

Having a delta between what we ship and what we test on is asking for a
ton of trouble so this isn't an option.

We can't change a key image behaviour just to make some ptests pass.

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 4dc477bb8d..51a90ddf58 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -108,7 +108,7 @@  do_install () {
 		sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \
 			${D}${sysconfdir}/default/volatiles/00_core
 	fi
-	if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then
+	if [ "${VOLATILE_TMP_DIR}" != "yes" ]  || ${@bb.utils.contains('DISTRO_FEATURES','ptest','true','false',d)}; then
 		sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core
 	fi
 	install -m 0755    ${WORKDIR}/dmesg.sh		${D}${sysconfdir}/init.d