From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6738017390170210304 X-Received: by 2002:a2e:9586:: with SMTP id w6mr2311226ljh.47.1568816925799; Wed, 18 Sep 2019 07:28:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4190:: with SMTP id z16ls715709lfh.7.gmail; Wed, 18 Sep 2019 07:28:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdfhSkzhkTGZ3jiem9Cb4i8pWiOkA1VojpAEi5MhabYjDSxunXSrMcKIXJAtz8m9rrk8a1 X-Received: by 2002:ac2:4a89:: with SMTP id l9mr2272129lfp.122.1568816925160; Wed, 18 Sep 2019 07:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568816925; cv=none; d=google.com; s=arc-20160816; b=jtLhdWTOorGXIYsna2KSqq+ybzrGG7I4YXpb84qtFnxyMKdS/Do6xOkst15cbmzZ0Y EG/7Zfa//FwHr5xxco8fKEFJvIh9kBBvWhq31t3roxhNtTxY8oYSNyL/tlC0ArZaRiki S+YZrMCz0tpXcd5dXaQzjKPELGJWCkDdEUI85duilOaLxBWadOgfaIowG1XQLA+yytwn kQr22ZkWqKadTGtgQxxvIuzWEXsnozSjXgn4lswV4rswYmQRq2DK07tn4WP/e7awjeZk zz6ONNbZwoYSqTd0N6Uluv077k1Ngid4M5dEBDxd29nQGfPUKPQTcYfVtN7jsgfW4dBz 29Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=p5pDp4LAgecIoS7tDAKVqlKTGJnxGGd5op8KpJ5mVdM=; b=xF8/T0ZEibA6yNiLGPI34MPVLyaI62lHXZMcLaL0m2nGaX1+LcbUtS60qGaO8UzHqA terDwNls4syetfdFlrrYxUzxYay7rg4gC9wP2+QnORHE/cwPZDCoQhQpd9p/4un2sOZQ amupDf3+OnAAPDUusb/PzxrsFsMf0yWrUr0l6UCPm4FuPCDTdUpeTEzVHCGjX/m9r/W4 NBZArcMi1CDSx5GK7XWpXX3yCdqRfChwl3CgCwqeqPheXewyYEFEdEEhEXgpC7zP9CSd K8VlZDe8oGV8X/jmouvXlzGm9l+58DreVHH2Ugupva1DAWa+gp+k+kZJ1XOb9eCvai5+ i0ow== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id q7si370328lji.5.2019.09.18.07.28.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 07:28:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x8IESiw7030456 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Sep 2019 16:28:44 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x8IESi2k003886 for ; Wed, 18 Sep 2019 16:28:44 +0200 From: Jan Kiszka Subject: [PATCH] buildchroot: Factor out common packages To: isar-users Message-ID: <8955207e-fab6-002c-abda-182f2d4842de@siemens.com> Date: Wed, 18 Sep 2019 16:28:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 0cEmEmJDx/ME From: Jan Kiszka 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 --- 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