From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7097485294514995200 X-Received: by 2002:a05:600c:1151:b0:394:6816:d4f2 with SMTP id z17-20020a05600c115100b003946816d4f2mr18261445wmz.195.1652512076071; Sat, 14 May 2022 00:07:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:ad8:b0:394:2fc9:9c19 with SMTP id c24-20020a05600c0ad800b003942fc99c19ls7209360wmr.3.canary-gmail; Sat, 14 May 2022 00:07:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVsdEV4UsK64NlIQwpnop2wU90Ltwv1KT+5Y5WDa6NNaebBZ8P0unjYo8Zk5kOU3w5Wwyx X-Received: by 2002:a7b:c106:0:b0:394:19aa:4f91 with SMTP id w6-20020a7bc106000000b0039419aa4f91mr18303518wmi.68.1652512075139; Sat, 14 May 2022 00:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652512075; cv=none; d=google.com; s=arc-20160816; b=Xohf92I2RUUOb21Ip1ZvsEhOp95d/MuYHV/S32XK1R3U/xEwfM98mk9geTcLbRf+yb 9UTd95nzUaGIRSPQ7StLWIQjgd/Uiuun+qTLWuQcbl9Y8Yl+yLPdL7Bap7sOEW5edORT TraOrgKlTGWg7kp+YL8O9Uqy26aepOsDciQ0IL+Do28sMC0hfpLG+hXDTlD+i+Tc715u A2ZoTk+uWGwApSKgNXwxBYxZqw9eM/5TNNuihoqEOU/dQakULbBIUteLf6qwTb7fAAYB rZJUAYUbaFrOq6wj5I/K/EPYuAmPYXiEjQZiaZSqvCNpeQaXw5nD1dBDj9kA0iL1omBK eBjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=jzUnZJuerhkMJfPTHJ8Tn9JfJ3NOHv/jBOBcTaJ7y0A=; b=EdMrcSmY/Hl6RfjFE5HiGSNVCMVv1A0szYt1n1TSqKriDwwhld6yvhQXnhHfULELJE 2V0eIG8XjAD/Ma49asm9Lrp1xQKHAK0R0zq+gwE9CO/1gLiWfGlqZslE9wXPFxo0dG1J Vjvy27VOdZFm2T2odq9fw8C+1LYxlLzsZmnG534J44AxMr4fhxALKNB/IRRlTI57p8Gk FIMs2P1P1Ely3aOhBthFyug0c/cvJqlON7vLVygbSRFJSG8kCWyEVXVOJrKpKK5gSr7H ubPO1mHfqXfRMa2YuAdg7Um2nY4VPCQXl5AqNXJ0yuFleZIFHhWNsz3Xt2Qh1gUAv5Cs wDEg== 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 q7-20020adfcd87000000b0020c9eedfe67si173943wrj.3.2022.05.14.00.07.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 14 May 2022 00:07:55 -0700 (PDT) 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 localhost.localdomain (mm-235-31-214-37.mgts.dynamic.pppoe.byfly.by [37.214.31.235] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24E77k0C025368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 14 May 2022 09:07:53 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH 6/6] meta: Remove buildchroot Date: Sat, 14 May 2022 10:07:36 +0300 Message-Id: <20220514070736.12997-7-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220514070736.12997-1-amikan@ilbers.de> References: <20220514070736.12997-1-amikan@ilbers.de> 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: 7v50zI18KbLm 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/dpkg-base.bbclass | 28 ------ meta/classes/image.bbclass | 15 ---- meta/classes/isar-events.bbclass | 1 - meta/conf/bitbake.conf | 3 - .../buildchroot/buildchroot-host.bb | 24 ------ .../buildchroot/buildchroot-target.bb | 15 ---- .../buildchroot/buildchroot.inc | 85 ------------------- .../buildchroot/files/build.sh | 17 ---- .../buildchroot/files/common.sh | 32 ------- .../buildchroot/files/configscript.sh | 15 ---- .../buildchroot/files/deps.sh | 47 ---------- 13 files changed, 1 insertion(+), 354 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 58f3e1a..469f036 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 dd8f420..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 or \ - (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch == "i386"): - dep = "buildchroot-target:do_build" - rootfs = d.getVar('BUILDCHROOT_TARGET_DIR', True) - else: - dep = "buildchroot-host:do_build" - rootfs = d.getVar('BUILDCHROOT_HOST_DIR', True) - - 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} - 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 --rbind /dev '${BUILDCHROOT_DIR}/dev' - mount --make-rslave '${BUILDCHROOT_DIR}/dev' - 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/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index c543eb2..bff9779 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -5,7 +5,6 @@ # SPDX-License-Identifier: MIT inherit sbuild -inherit buildchroot inherit debianize inherit terminal inherit repository @@ -124,9 +123,6 @@ do_apt_fetch() { addtask apt_fetch after do_unpack before do_apt_unpack do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -# Add dependency from the correct buildchroot: host or target -do_apt_fetch[depends] = "${BUILDCHROOT_DEP}" - # Add dependency from the correct schroot: host or target do_apt_fetch[depends] += "${SCHROOT_DEP}" @@ -190,30 +186,6 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build do_prepare_build[deptask] = "do_deploy_deb" do_prepare_build[depends] = "${SCHROOT_DEP}" -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" - -dpkg_do_mounts() { - mkdir -p ${BUILDROOT} - sudo mount --bind ${WORKDIR} ${BUILDROOT} - - buildchroot_do_mounts -} - -dpkg_undo_mounts() { - i=0 - while ! sudo umount ${BUILDROOT}; do - sleep 0.1 - if [ `expr $i % 100` -eq 0 ] ; then - bbwarn "${BUILDROOT}: Couldn't unmount ($i), retrying..." - fi - if [ $i -ge 10000 ]; then - bbfatal "${BUILDROOT}: Couldn't unmount after timeout" - fi - i=`expr $i + 1` - done - sudo rmdir ${BUILDROOT} -} - do_prepare_build_append() { # Make a local copy of isar-apt repo that is not affected by other parallel builds mkdir -p ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9b4b67b..b2651a1 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") @@ -58,16 +53,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 generate-manifest export-dpkg-status clean-log-files" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index f1e9dcb..cbddff4 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -11,7 +11,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 07f199d..ed65984 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}/${DISTRO}-${DISTRO_ARCH}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb deleted file mode 100644 index d8498a5..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ /dev/null @@ -1,24 +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}" - -BUILDCHROOT_PREINSTALL ?= " \ - ${BUILDCHROOT_PREINSTALL_COMMON} \ - libc6:${DISTRO_ARCH} \ - crossbuild-essential-${DISTRO_ARCH}" - -BUILDCHROOT_PREINSTALL_riscv64 ?= " \ - ${BUILDCHROOT_PREINSTALL_COMMON} \ - libc6:${DISTRO_ARCH} \ - gcc-riscv64-linux-gnu \ - g++-riscv64-linux-gnu \ - dpkg-cross" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb deleted file mode 100644 index be77044..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb +++ /dev/null @@ -1,15 +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 - -BUILDCHROOT_PREINSTALL ?= " \ - ${BUILDCHROOT_PREINSTALL_COMMON} \ - gcc \ - build-essential" diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc deleted file mode 100644 index aa190e9..0000000 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ /dev/null @@ -1,85 +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_COMPAT_PREINSTALL_compat-arch = " \ - libc6:${COMPAT_DISTRO_ARCH} \ - crossbuild-essential-${COMPAT_DISTRO_ARCH}" - -BUILDCHROOT_PREINSTALL_COMMON = " \ - ${BUILDCHROOT_COMPAT_PREINSTALL} \ - make \ - debhelper \ - autotools-dev \ - ccache \ - dpkg \ - locales \ - docbook-to-man \ - apt \ - automake \ - devscripts \ - 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.17.1