[PATCH] buildchroot: Factor out common packages

[PATCH] buildchroot: Factor out common packages

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

No need to maintain this list twice.

At this chance, make adduser a common package. be291cd991bd added it
only to the target buildchroot, while it is used by both. That fact
indicates that we only list it here for future cases when it is no
longer implicitly installed.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-devtools/buildchroot/buildchroot-host.bb   | 16 ++++------------
 meta/recipes-devtools/buildchroot/buildchroot-target.bb | 17 ++++-------------
 meta/recipes-devtools/buildchroot/buildchroot.inc       | 13 +++++++++++++
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
index 795b77a..408ad39 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
@@ -11,15 +11,7 @@ require buildchroot.inc
 ROOTFS_ARCH = "${HOST_ARCH}"
 ROOTFS_DISTRO = "${HOST_DISTRO}"
 
-BUILDCHROOT_PREINSTALL ?= "make \
-                           debhelper \
-                           autotools-dev \
-                           dpkg \
-                           locales \
-                           docbook-to-man \
-                           apt \
-                           automake \
-                           devscripts \
-                           equivs \
-                           libc6:${DISTRO_ARCH} \
-                           crossbuild-essential-${DISTRO_ARCH}"
+BUILDCHROOT_PREINSTALL ?= " \
+    ${BUILDCHROOT_PREINSTALL_COMMON} \
+    libc6:${DISTRO_ARCH} \
+    crossbuild-essential-${DISTRO_ARCH}"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb
index 68aedaa..be77044 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot-target.bb
@@ -9,16 +9,7 @@ BUILDCHROOT_VARIANT = "target"
 
 require buildchroot.inc
 
-BUILDCHROOT_PREINSTALL ?= "gcc \
-                           make \
-                           build-essential \
-                           debhelper \
-                           autotools-dev \
-                           dpkg \
-                           locales \
-                           docbook-to-man \
-                           apt \
-                           automake \
-                           devscripts \
-                           equivs \
-                           adduser"
+BUILDCHROOT_PREINSTALL ?= " \
+    ${BUILDCHROOT_PREINSTALL_COMMON} \
+    gcc \
+    build-essential"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc
index e704137..fc29690 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.inc
+++ b/meta/recipes-devtools/buildchroot/buildchroot.inc
@@ -20,6 +20,19 @@ ROOTFSDIR = "${BUILDCHROOT_DIR}"
 ROOTFS_PACKAGES = "${BUILDCHROOT_PREINSTALL}"
 ROOTFS_CLEAN_FILES = ""
 
+BUILDCHROOT_PREINSTALL_COMMON = " \
+    make \
+    debhelper \
+    autotools-dev \
+    dpkg \
+    locales \
+    docbook-to-man \
+    apt \
+    automake \
+    devscripts \
+    equivs \
+    adduser"
+
 rootfs_do_mounts_append() {
     sudo -s <<'EOSUDO'
     mkdir -p '${BUILDCHROOT_DIR}/downloads'
-- 
2.16.4