[PATCH 2/2] buildchroot: Fix not checking group

[Harald Seiler <hws@denx.de>]

The previous code checked the username twice instead of the user
AND group-names.  This patch changes the check to behave correctly
and also adds a more comprehensive error message.

Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/recipes-devtools/buildchroot/files/common.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh
index 8caa4f4..9e6adbc 100644
--- a/meta/recipes-devtools/buildchroot/files/common.sh
+++ b/meta/recipes-devtools/buildchroot/files/common.sh
@@ -8,7 +8,12 @@ set -e
 printenv | grep -q BB_VERBOSE_LOGS && set -x
 
 # assert we are either "root:root" or "builder:builder"
-[ $( id -un ) = "builder" -a $( id -un ) = "builder" ] || [ $( id -un ) = "root" -a $( id -un ) = "root" ]
+if ([ "$(id -un)" != "builder" ] || [ "$(id -gn)" != "builder" ]) &&
+   ([ "$(id -un)" != "root"    ] || [ "$(id -gn)" != "root"    ]); then
+    echo "This script can only be run as root:root or builder:builder!" >&2
+    echo "(Currently running as $(id -un)($(id -u)):$(id -gn)($(id -g)))" >&2
+    exit 1
+fi
 
 # Create human-readable names
 target_arch=$2
-- 
2.14.1