From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:a1c:2bc7:: with SMTP id r190mr11917942wmr.143.1569176237429; Sun, 22 Sep 2019 11:17:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c143:: with SMTP id r64ls3350422wmf.0.canary-gmail; Sun, 22 Sep 2019 11:17:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqzomlvUqbPhCCGnttvuSntgg5vo1jEwyTCLRi6bk6b/e6wR8TSKUkRFgkuV46QqEK4R/9QB X-Received: by 2002:a1c:c78f:: with SMTP id x137mr11845116wmf.42.1569176236934; Sun, 22 Sep 2019 11:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569176236; cv=none; d=google.com; s=arc-20160816; b=uHiTfHbr7sT5MFNYi83lKMAGykRDKaDgRr0KBzPqnuVUUxTTNEC1MBkPsE+hM6PBYT VJux8BAfioXg0+BD+euAsr5lnEMNlmu5WB7mH+tEsKOpFkkbZskX2bgDrpQuz8hhXSNj ULPAdDGaICk7O25JK7jM74fCcNFkb5/uPINP1FpMri2siQTM8iKyXypnR2ygE63VLC8T NNKFnEO2VbPa3sN6wyj3Bcu94IWmmH4KvqMKHq7eUsXQKRRcQ2k1FMCfnZqAUIdtI5M7 TR90IB0ozdNVs/DTcV/sn4ayzzdPsVIr+ogUFDSFqGLUP9CUZwD2YKShoEcfgUXrehil wHow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=p5pDp4LAgecIoS7tDAKVqlKTGJnxGGd5op8KpJ5mVdM=; b=bOO8DgZtlRA/X/NVCsX4D7JagYCNPtVsojWHB+XKf+0nS5rjTbFNajz145ShiJNkBC GEWVW5RNMr+6zhbWF4RA0hl+T360z9vznBbkLI2E0iIXgg09KrGUzLqgF+ayNW3bAC80 2OY3WEZzBjabJGj88Nn42MuCQ3dbPKxJSnphmNBwd1jjqLiJTWU1YV+xwHBzcN6bm/3D k0o1TwFtKOXbgmZasCfG5F647VHV09QyLc8/t8luh3tURhZQOhidQgtFAwhmJitDwqvv yrgLKg1LRVmIC5QC7Z5GoPu8a/P2XZd4Zso58LMG8XPtK2E5dkFNsXBSH+02U9g3GwA1 l/6A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l3si984176wmg.0.2019.09.22.11.17.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 11:17:16 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x8MIHGEb020168 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Sep 2019 20:17:16 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.37.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8MIHB99005761 for ; Sun, 22 Sep 2019 20:17:16 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v5 21/27] buildchroot: Factor out common packages Date: Sun, 22 Sep 2019 20:17:05 +0200 Message-Id: <78a568a8fb7a039da00b047fd69ad504e862aa32.1569176231.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: ai6TPquF7LuT 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