[PATCH] fix inittab install when Xen not in DISTRO_FEATURES

[PATCH] fix inittab install when Xen not in DISTRO_FEATURES

[Riku Voipio]

With the latest patch, OE builds may file like:

https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.8,label=oe_persistent_cloud,rootfs=minimal/127/consoleText

By having the "failing" grep within the if block, set -e
in shell code will not bite configurations where meta-virtualization
is included but xen is not in DISTRO_FEATURES.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
index 2edbedf..1b89aec 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
+++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
@@ -1,6 +1,5 @@
 do_install_append() {
-	echo "${DISTRO_FEATURES}" | grep -q 'xen'
-	if [ $? -eq 0 ]; then
+	if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
 		echo "" >> ${D}${sysconfdir}/inittab
 		echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
 	fi
-- 
1.8.3.1

Re: [PATCH] fix inittab install when Xen not in DISTRO_FEATURES

[Philip Tricca]

Riku,

Looks good to me. Thanks for cleaning this up.

Regards,
- Philip

On 11/13/2013 04:25 AM, Riku Voipio wrote:
> With the latest patch, OE builds may file like:
> 
> https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.8,label=oe_persistent_cloud,rootfs=minimal/127/consoleText
> 
> By having the "failing" grep within the if block, set -e
> in shell code will not bite configurations where meta-virtualization
> is included but xen is not in DISTRO_FEATURES.
> 
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> ---
>  recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> index 2edbedf..1b89aec 100644
> --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> +++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> @@ -1,6 +1,5 @@
>  do_install_append() {
> -	echo "${DISTRO_FEATURES}" | grep -q 'xen'
> -	if [ $? -eq 0 ]; then
> +	if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
>  		echo "" >> ${D}${sysconfdir}/inittab
>  		echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
>  	fi
> 

Re: [PATCH] fix inittab install when Xen not in DISTRO_FEATURES

[Bruce Ashfield]

merged!

Bruce

On Wed, Nov 13, 2013 at 4:25 AM, Riku Voipio <riku.voipio@linaro.org> wrote:
> With the latest patch, OE builds may file like:
>
> https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.8,label=oe_persistent_cloud,rootfs=minimal/127/consoleText
>
> By having the "failing" grep within the if block, set -e
> in shell code will not bite configurations where meta-virtualization
> is included but xen is not in DISTRO_FEATURES.
>
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> ---
>  recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> index 2edbedf..1b89aec 100644
> --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> +++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> @@ -1,6 +1,5 @@
>  do_install_append() {
> -       echo "${DISTRO_FEATURES}" | grep -q 'xen'
> -       if [ $? -eq 0 ]; then
> +       if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
>                 echo "" >> ${D}${sysconfdir}/inittab
>                 echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
>         fi
> --
> 1.8.3.1
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] fix inittab install when Xen not in DISTRO_FEATURES

[Riku Voipio]

With the latest patch, OE builds may file like:

https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.8,label=oe_persistent_cloud,rootfs=minimal/127/consoleText

By having the "failing" grep within the if block, set -e
in shell code will not bite configurations where meta-virtualization
is included but xen is not in DISTRO_FEATURES.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
index 2edbedf..1b89aec 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
+++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
@@ -1,6 +1,5 @@
 do_install_append() {
-	echo "${DISTRO_FEATURES}" | grep -q 'xen'
-	if [ $? -eq 0 ]; then
+	if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
 		echo "" >> ${D}${sysconfdir}/inittab
 		echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
 	fi
-- 
1.8.3.1