From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7199542182322110464 X-Received: by 2002:a37:b683:0:b0:71f:617e:2bd3 with SMTP id g125-20020a37b683000000b0071f617e2bd3mr2380605qkf.287.1676274049013; Sun, 12 Feb 2023 23:40:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:1863:b0:56e:9f70:6724 with SMTP id eh3-20020a056214186300b0056e9f706724ls3253114qvb.8.-pod-prod-gmail; Sun, 12 Feb 2023 23:40:48 -0800 (PST) X-Google-Smtp-Source: AK7set8Wnf9vDd/IR+/qPRw4xr8d5sT3ikIQrP5r+M/4eESJHNgmITa+ls2X/F+NCn6BYminY2eY X-Received: by 2002:a05:6214:e8b:b0:56b:ec30:67eb with SMTP id hf11-20020a0562140e8b00b0056bec3067ebmr36959946qvb.39.1676274048381; Sun, 12 Feb 2023 23:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676274048; cv=none; d=google.com; s=arc-20160816; b=T6a34eLb8MEeq8eyBqyCMZMVfEI5nEAtZd0UNXA1b25rfsZAPNrpXAcxM6kEighic7 R6X+53cZ504zAdo5GTUpD9TEBvNlZY8m9hr4ffYXji92BGStzjDW+pH6e1BCHh7HDIz9 zTrDCm/D/3G79HcbZHUOZWORgUl2XSyaX99zSlIBVnahcCCJf6A3GOwhnhBI1PXVF+m3 lP6sl2zkYV+4ixDLO5L/3AGIC4/i/wRaoasRy3b5mJqx1qJiO5BmiSdJLbW5yZgYUIX9 fVyd2uWdZy9ZcENhaDK1nFaKxcMUG3r+yzGHK1a53vswU7Cm8hexrja1y8/Tvb4d6nZc WaWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=UnP/0YpyJ8jrIUFmO4NpTjoLAQc9paF2rUX+xEc0dRM=; b=tm1+KKdfl8pvC6pw1xMVQ/J1piSaS3b2SlyOrO5152kSee6a7l56DlUxCPUtMr1/M8 ecFcNkvH32Qa0jAz6Leuf3QFtuVmgJAWELlzTIvyGnQRkXMcErrp1vJRFBEk/3w0XkU/ w52sNx5KO8NQ5iyIpGsRd1tQL7fdwJJ727rAX/TphdzDqiFbRQJA2BYvZAn5JEsyBD5a /XMviIgMOXiAwryKrlVODbJHzjwz8LdryRdWEjHv8DKLlBPT5DkG70T99JSS/ZhVIBj1 2hvXaGAaLRGUHvf+9sHw9CJnFkbJ7Q6A1o3E1By1BCtDjOlKuMNVjz1UmxVvQMh3OHoq 1/6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b3-20020a05620a270300b0071da5397385si982824qkp.4.2023.02.12.23.40.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2023 23:40:48 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.. ([85.254.74.215]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31D7eaq2003492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Feb 2023 08:40:45 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 6/6] meta: Remove buildchroot Date: Mon, 13 Feb 2023 09:40:34 +0200 Message-Id: <20230213074034.3949-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230213074034.3949-1-amikan@ilbers.de> References: <20230213074034.3949-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED, T_FILL_THIS_FORM_SHORT autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: B0VYeGHmlWuW Buildchroot is not used anywhere so remove it. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 2 +- meta/classes/buildchroot.bbclass | 71 ------------------ meta/classes/image.bbclass | 15 ---- meta/classes/isar-events.bbclass | 1 - meta/conf/bitbake.conf | 3 - .../buildchroot/buildchroot-host.bb | 13 ---- .../buildchroot/buildchroot-target.bb | 10 --- .../buildchroot/buildchroot.inc | 73 ------------------- .../buildchroot/files/build.sh | 17 ----- .../buildchroot/files/common.sh | 32 -------- .../buildchroot/files/configscript.sh | 15 ---- .../buildchroot/files/deps.sh | 47 ------------ 12 files changed, 1 insertion(+), 298 deletions(-) delete mode 100644 meta/classes/buildchroot.bbclass delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot-host.bb delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot-target.bb delete mode 100644 meta/recipes-devtools/buildchroot/buildchroot.inc delete mode 100644 meta/recipes-devtools/buildchroot/files/build.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/common.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/configscript.sh delete mode 100644 meta/recipes-devtools/buildchroot/files/deps.sh diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7e0184e..1c8e156 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -24,7 +24,7 @@ MACHINE ??= "qemuarm" # Isar Configuration Selection # # You need to select a specific distribution configuration which will used for both: -# generation of buildchroot environment and target root filesystem. +# generation of schroot environment and target root filesystem. # # This sets the default distribution configuration: DISTRO ??= "debian-bullseye" diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass deleted file mode 100644 index 5abd533..0000000 --- a/meta/classes/buildchroot.bbclass +++ /dev/null @@ -1,71 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2018 Siemens AG -# -# SPDX-License-Identifier: MIT - -ISAR_CROSS_COMPILE ??= "0" - -# Choose the correct buildchroot: host or target -python __anonymous() { - mode = d.getVar('ISAR_CROSS_COMPILE', True) - distro_arch = d.getVar('DISTRO_ARCH') - if mode == "0" or d.getVar('HOST_ARCH') == distro_arch: - dep = "buildchroot-target:do_build" - rootfs = d.getVar('BUILDCHROOT_TARGET_DIR', False) - else: - dep = "buildchroot-host:do_build" - rootfs = d.getVar('BUILDCHROOT_HOST_DIR', False) - - d.setVar('BUILDCHROOT_DEP', dep) - d.setVar('BUILDCHROOT_DIR', rootfs) -} - -MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock" - -buildchroot_do_mounts() { - if [ "${USE_CCACHE}" = "1" ]; then - mkdir -p ${CCACHE_DIR}/debug - fi - - sudo -s <<'EOSUDO' - ( flock 9 - set -e - - mountpoint -q '${BUILDCHROOT_DIR}/isar-apt' || - mount --bind '${REPO_ISAR_DIR}/${DISTRO}' '${BUILDCHROOT_DIR}/isar-apt' - mountpoint -q '${BUILDCHROOT_DIR}/downloads' || - mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads' - if [ "${USE_CCACHE}" = "1" ]; then - mkdir -p '${BUILDCHROOT_DIR}/ccache' - mountpoint -q '${BUILDCHROOT_DIR}/ccache' || - mount --bind '${CCACHE_DIR}' '${BUILDCHROOT_DIR}/ccache' - fi - mountpoint -q '${BUILDCHROOT_DIR}/dev' || - ( mount -o bind,private /dev '${BUILDCHROOT_DIR}/dev' && - mount -t tmpfs none '${BUILDCHROOT_DIR}/dev/shm' && - mount --bind /dev/pts '${BUILDCHROOT_DIR}/dev/pts' ) - mountpoint -q '${BUILDCHROOT_DIR}/proc' || - mount -t proc none '${BUILDCHROOT_DIR}/proc' - mountpoint -q '${BUILDCHROOT_DIR}/sys' || - mount --rbind /sys '${BUILDCHROOT_DIR}/sys' - mount --make-rslave '${BUILDCHROOT_DIR}/sys' - - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] - then - mkdir -p '${BUILDCHROOT_DIR}/base-apt' - mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ - mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' - fi - - # Refresh or remove /etc/resolv.conf at this chance - if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ] - then - rm -rf '${BUILDCHROOT_DIR}/etc/resolv.conf' - else - cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' - fi - - ) 9>'${MOUNT_LOCKFILE}' -EOSUDO -} diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 34b1d61..9b05713 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -32,11 +32,6 @@ PP_DEPLOY = "${PP}/deploy" PP_ROOTFS = "${PP}/rootfs" PP_WORK = "${PP}/work" -BUILDROOT = "${BUILDCHROOT_DIR}${PP}" -BUILDROOT_DEPLOY = "${BUILDCHROOT_DIR}${PP_DEPLOY}" -BUILDROOT_ROOTFS = "${BUILDCHROOT_DIR}${PP_ROOTFS}" -BUILDROOT_WORK = "${BUILDCHROOT_DIR}${PP_WORK}" - python(){ if (d.getVar('IMAGE_TRANSIENT_PACKAGES')): bb.warn("IMAGE_TRANSIENT_PACKAGES is set and no longer supported") @@ -69,16 +64,6 @@ DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" -image_do_mounts() { - sudo flock ${MOUNT_LOCKFILE} -c ' \ - mkdir -p "${BUILDROOT_DEPLOY}" "${BUILDROOT_ROOTFS}" "${BUILDROOT_WORK}" - mount --bind "${DEPLOY_DIR_IMAGE}" "${BUILDROOT_DEPLOY}" - mount --bind "${IMAGE_ROOTFS}" "${BUILDROOT_ROOTFS}" - mount --bind "${WORKDIR}" "${BUILDROOT_WORK}" - ' - buildchroot_do_mounts -} - ROOTFSDIR = "${IMAGE_ROOTFS}" ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-log-files clean-debconf-cache" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index f52b234..7b960f3 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -9,7 +9,6 @@ addhandler build_started python build_started() { bb.utils.remove(d.getVar('TMPDIR') + "/work/*/*/*/temp/once.*") bb.utils.remove(d.getVar('TMPDIR') + "/work/*/*/*/rootfs.mount") - bb.utils.remove(d.getVar('TMPDIR') + "/deploy/buildchroot-*/*.mount") } build_started[eventmask] = "bb.event.BuildStarted" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 522241a..e96a796 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -50,14 +50,11 @@ GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" -DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" -BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" -BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}" SCHROOT_HOST_DIR = "${DEPLOY_DIR}/schroot-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" SCHROOT_TARGET_DIR = "${DEPLOY_DIR}/schroot-target/${DISTRO}-${DISTRO_ARCH}" SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${DISTRO}-${MACHINE}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb deleted file mode 100644 index e5ce248..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Root filesystem for packages building -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -DESCRIPTION = "Isar development filesystem for host" - -BUILDCHROOT_VARIANT = "host" - -require buildchroot.inc -ROOTFS_ARCH = "${HOST_ARCH}" -ROOTFS_DISTRO = "${HOST_DISTRO}" -ROOTFS_BASE_DISTRO = "${HOST_BASE_DISTRO}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb deleted file mode 100644 index 6613de6..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Root filesystem for packages building -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -DESCRIPTION = "Isar development filesystem for target" - -BUILDCHROOT_VARIANT = "target" - -require buildchroot.inc diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc deleted file mode 100644 index f74896f..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ /dev/null @@ -1,73 +0,0 @@ -# Common part for build chroot filesystem. -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -LICENSE = "gpl-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -FILESPATH:prepend := "${THISDIR}/files:" -SRC_URI = "file://configscript.sh \ - file://build.sh \ - file://common.sh \ - file://deps.sh" -PV = "1.0" - -inherit rootfs - -BUILDCHROOT_DIR = "${WORKDIR}/rootfs" -ROOTFSDIR = "${BUILDCHROOT_DIR}" -ROOTFS_PACKAGES = "${BUILDCHROOT_PREINSTALL}" -ROOTFS_CLEAN_FILES = "" -ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" -ROOTFS_DPKGSTATUS_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" -ROOTFS_FEATURES += "generate-manifest export-dpkg-status" - -BUILDCHROOT_PREINSTALL ?= " \ - dpkg \ - locales \ - apt \ - equivs \ - adduser" - -rootfs_do_mounts:append() { - sudo -s <<'EOSUDO' - set -e - mkdir -p '${BUILDCHROOT_DIR}/downloads' - mountpoint -q '${BUILDCHROOT_DIR}/downloads' || \ - mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads' -EOSUDO -} - -ROOTFS_POSTPROCESS_COMMAND =+ "buildchroot_install_files" -buildchroot_install_files() { - sudo mkdir -p "${BUILDCHROOT_DIR}/home/builder" - # Install package builder script - sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder" - sudo install -m 755 -d ${BUILDCHROOT_DIR}/isar - sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR}/isar/ - sudo install -m 755 ${WORKDIR}/common.sh ${BUILDCHROOT_DIR}/isar/ - sudo install -m 755 ${WORKDIR}/deps.sh ${BUILDCHROOT_DIR}/isar/ - - sudo ln -sf /downloads/git "${BUILDCHROOT_DIR}/home/.git-downloads" - - # Configure root filesystem - sudo install -m 755 ${WORKDIR}/configscript.sh ${BUILDCHROOT_DIR} - USER_ID=$(id -u) - GROUP_ID=$(id -g) - sudo chroot ${BUILDCHROOT_DIR} /configscript.sh $USER_ID $GROUP_ID - -} - -DEPLOY_BUILDCHROOT = "${@d.getVar('BUILDCHROOT_' + d.getVar('BUILDCHROOT_VARIANT').upper() + '_DIR')}" - -do_buildchroot_deploy[dirs] = "${DEPLOY_DIR_BUILDCHROOT}-${BUILDCHROOT_VARIANT}" -do_buildchroot_deploy() { - ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_BUILDCHROOT}" -} -addtask buildchroot_deploy before do_build after do_rootfs - -CLEANFUNCS = "clean_deploy" -clean_deploy() { - rm -f "${DEPLOY_BUILDCHROOT}" -} diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh deleted file mode 100644 index d4709cf..0000000 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH -# Copyright (c) 2018 Siemens AG - -source /isar/common.sh - -# If autotools files have been created, update their timestamp to -# prevent them from being regenerated -for i in configure aclocal.m4 Makefile.am Makefile.in; do - if [ -f "${i}" ]; then - touch "${i}" - fi -done - -${GBP_PREFIX}dpkg-buildpackage -a$target_arch --source-option=-I diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh deleted file mode 100644 index 73226d8..0000000 --- a/meta/recipes-devtools/buildchroot/files/common.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH -# Copyright (c) 2018 Siemens AG - -set -e -printenv | grep -q BB_VERBOSE_LOGS && set -x - -# assert we are either "root:root" or "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:!" >&2 - echo "(Currently running as $(id -un)($(id -u)):$(id -gn)($(id -g)))" >&2 - exit 1 -fi - -# Create human-readable names -target_arch=$2 - -set_arch="--host-arch $target_arch" - -# Go to build directory -cd "$1" - -# To avoid Perl locale warnings: -export LC_ALL=C -export LANG=C -export LANGUAGE=C - -# allow for changes to the PATH variable -export PATH=$PATH_PREPEND:$PATH diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh deleted file mode 100644 index c4d8cf8..0000000 --- a/meta/recipes-devtools/buildchroot/files/configscript.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -set -e - -debconf-set-selections < \ - mk-build-deps.output || true - cat mk-build-deps.output - # we assume success when we find this - grep "mk-build-deps: Unable to install all build-dep packages" mk-build-deps.output - rm -f mk-build-deps.output -else - mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file - - # Upgrade any already installed packages in case we are partially rebuilding - apt-get upgrade -y --allow-downgrades -fi -- 2.34.1