From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6564350107498577920 X-Received: by 2002:a1c:168d:: with SMTP id 135-v6mr232306wmw.1.1528381860812; Thu, 07 Jun 2018 07:31:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4085:: with SMTP id o5-v6ls545486wrp.6.gmail; Thu, 07 Jun 2018 07:31:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLFyVuFZinnKodrVXyrziBG867dz4iAGiuuAq51IFH6ZmuHuCHPcp6DeKPJn2hJ4oRi9WYW X-Received: by 2002:adf:c707:: with SMTP id k7-v6mr206805wrg.18.1528381860268; Thu, 07 Jun 2018 07:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528381860; cv=none; d=google.com; s=arc-20160816; b=KMjtYgTz13N6Iv1eF91OEXV8hdWMC2OUKZyeir39Mp5SOdW6H+zcQXRtpEmSSpZxAk kmf9E1NH+TPwTmt3R84gBJMosBg3Ef+aFrWY7nWb9rLI1B4kjcF9w2YDGMV0ffBKgwem PLXFr2Hud+AjoKk4yB29Rrjc/lOf/ElezvyjASbaNlGSEGuydRAg5tplLJCuU4iq/GEc TR2Qloc2EpU16rzgqfZFDFYvqKLEzJITKlndaoRowc6gcHvI4A1VivWTzLQurHYm/Mwx DKaCbwGOAzKZeAvKGJXyqeoQrcWt0VzA8XkcrmKmuurblop+cZ56zZRygBw7sjJd4H6h FBow== 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:arc-authentication-results; bh=bO4Tlr3f8LQ3wyqatoVX20G2nx/NtyLyI8TqKurazmM=; b=xERZtv88bjpClN5bZWKMcrCir97gk9GFMe4XUjAJ+3HziFBZXTyvepI8bvAUmCxnRn oaI6CqG81cpATelEVXPRegmP3VAcEKTuBNYJLonW5pfZ1Aobg9AgMjEbvK8MIWJKKqDH JjaYNIvSvvPnv44xwCMLRTbFN3wgISpyCmW+T38RL40a0AW+p64H9kEOYONukHzd27Xa 7YHuLNCZniK72vpDzWQzmGZQEE9rSj+5rq7zqK6pY5YXjeKoOLxz/UrG99wkNGUZ5U5q yHe7O0DFuDkJtWaIiAFB3jmbJYsctM8qoe6dhhb7s3AqxfJlmnOZj466D0L9ddHEHWGi x5wQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c18-v6si1380076wrq.5.2018.06.07.07.31.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 07:31:00 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w57EUx9K008117 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Jun 2018 16:30:59 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w57EUxNU019240 for ; Thu, 7 Jun 2018 16:30:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 3/6] isar-bootstrap: Use options for setup_root_file_system() Date: Thu, 7 Jun 2018 16:30:56 +0200 Message-Id: <5c44a2e334fff90e56936036108202a91e87a78a.1528381858.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: References: In-Reply-To: References: X-TUID: cdoPwmu56XGV From: Jan Kiszka Convert the clean/noclean control into an option --clean. We can expand this pattern later on. Signed-off-by: Jan Kiszka --- meta-isar/recipes-core/images/isar-image-base.bb | 2 +- meta/classes/isar-bootstrap-helper.bbclass | 15 +++++++++++---- meta/recipes-devtools/buildchroot/buildchroot.bb | 3 +-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index f91dfb0..891f80a 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -28,7 +28,7 @@ do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \ ${IMAGE_ROOTFS}/isar-apt" do_rootfs() { - setup_root_file_system "${IMAGE_ROOTFS}" "clean" \ + setup_root_file_system --clean "${IMAGE_ROOTFS}" \ ${IMAGE_PREINSTALL} ${IMAGE_INSTALL} # Configure root filesystem diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index a3f1686..91dfc1a 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -15,9 +15,16 @@ def reverse_bb_array(d, varname): return " ".join(i for i in array) setup_root_file_system() { + CLEAN="" + while true; do + case "$1" in + --clean) CLEAN=1 ;; + -*) bbfatal "$0: invalid option specified: $1" ;; + *) break ;; + esac + shift + done ROOTFSDIR="$1" - CLEAN="$2" - shift shift PACKAGES="$@" APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -51,7 +58,7 @@ setup_root_file_system() { sudo -E chroot "$ROOTFSDIR" \ /usr/bin/apt-get ${APT_ARGS} --download-only $PACKAGES \ ${IMAGE_TRANSIENT_PACKAGES} - [ "clean" = ${CLEAN} ] && sudo rm -f ${CLEAN_FILES} + [ ${CLEAN} ] && sudo rm -f ${CLEAN_FILES} sudo -E chroot "$ROOTFSDIR" \ /usr/bin/apt-get ${APT_ARGS} $PACKAGES for pkg in ${IMAGE_TRANSIENT_PACKAGES}; do @@ -62,7 +69,7 @@ setup_root_file_system() { sudo -E chroot "$ROOTFSDIR" \ /usr/bin/apt-get purge --yes $pkg done - if [ "clean" = ${CLEAN} ]; then + if [ ${CLEAN} ]; then sudo -E chroot "$ROOTFSDIR" \ /usr/bin/apt-get autoremove --purge --yes sudo -E chroot "$ROOTFSDIR" \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index e405509..538c577 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -69,8 +69,7 @@ do_build[root_cleandirs] = "${BUILDCHROOT_DIR} \ do_build[depends] = "isar-apt:do_cache_config isar-bootstrap:do_deploy" do_build() { - setup_root_file_system "${BUILDCHROOT_DIR}" "noclean" \ - ${BUILDCHROOT_PREINSTALL} + setup_root_file_system "${BUILDCHROOT_DIR}" ${BUILDCHROOT_PREINSTALL} # Install package builder script sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder" -- 2.13.7