[PATCH] buildchroot: do not assume group of "builder" to be "builder"

[Henning Schild <henning.schild@siemens.com>]

From: Henning Schild <henning.schild@siemens.com>

We try to align the user and group ids of the user running bitbake with
the users inside the chroots. If that outside user happens to be in a
group that already exists in a fresh installation (i.e. users:100) we
will not create a group called "builder" so checking the group name
later will fail. Just check that the gid is the gid of "builder" instead
of checking that the group name is "builder".

Reported-by: Michael Adler <michael.adler@siemens.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/recipes-devtools/buildchroot/files/common.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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