From patchwork Thu May 11 10:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2806 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 11 May 2023 12:50:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f189.google.com (mail-yw1-f189.google.com [209.85.128.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34BAojIw011910 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:46 +0200 Received: by mail-yw1-f189.google.com with SMTP id 00721157ae682-559c416b024sf93072167b3.1; Thu, 11 May 2023 03:50:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683802240; cv=pass; d=google.com; s=arc-20160816; b=T83JTnZ/Rq736didaVoyU0/2PR/wGaaGXaSS2f+JhiLmWcobIGvKuoRFCDyw7nYUA/ +lekkAJfmi++An+RzooGRtydspWWET6mCGl8I8sUvxMWM6kvRUOtq1VS0Dn51Z50V+xc t3M9CDAHue/6VsRmfsMdCeQO3JeoHGWGKJZs8JDFllJUmyQyxXpGyaDan63zWpZ+Swkw WP4uZdEx58+6kQzIHG1ffvCKjmkf1VwLqtMxkgHltDVRHHL6+XmynbWeJNUixGyCCe2P VPG4uqg/pF0kk9LAaCZzHnAl5ydAes+6urdZgTG2fkvXY8X4bm/jZrrnW6xfGYa1uHGr Kh5w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=EfrOLsproWClMp5qyJ3mgsKRnJoxrDvhDCykYazsWiNtybzwbwm4ylwNylqwExVm1S HfKYWvgSsEfaUvbuC5AqsVo9ivyc+957cfzyyD8yQeCK55ER5fIxBpJJse/GQJksS/to HL0YZWPy2RqTHbdwKq5hWqEuEya952TD3BPITJG7x63IXY38hYJ0vXdeKpyE1wkKTern zcygva3akmwh5QqwN5mQPyiq0CExGykBatAwIKsb34YmVIijZN2NjdbvGwwgs2fWbna8 WUFGYH/Wd+9ruBzPH3eKdTZk/Y3Ud0cahLuc5S6Ve3BYwTIU/lMxpQB9p92EzugEiI// e3yQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1683802240; x=1686394240; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=EZBXvyfBndLpAhS3ZS7nMiOBFXWT5HvzdCq8PFvgtr2QZk6K2QMWWJPyVu0VmITop0 jn5z+1L0s5OIcVAdasE0YFBYqsFjVDWZCGmo8HkC5OYr3epbRJBMLb5ftkOxyjMjhRNj 06UYfHIimIN6GLkzkoSCC6Ns0izQelDcF6sw7MS23ptm0zYU0bmbc4UtQTt0Dg3o993g zpEj4F9FmJw3ANOZDXG6rVTaEJ1WxdLXL4P/B/FdAJLm+Oh2oRmqCMDRE45lgL6Adzqv WOiaZyb5RlnXaAp5GT+gc4Jz73si4qt2XS6ywsIiD4M8Sk2u33EO+XhO21H5PzD18Jbz ZmOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683802240; x=1686394240; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=5j4hklj5lvXeuj586cOpfLCWVT1nmruT944Tulec5Is=; b=hP70ZVlXdoP/f+wcGY1k/t92xKiU6E36Sn7/ddCn/MPhMOMKNl7ZH4aLGg1ZiKmJGs CHw2NAU3elTvREFqI8JtHFWU0epnsA6ogxEdIzmI5EH03EJQZXOTPtN0bZzIvc/6KQcn M3LfhoAthKH1tAUav/nmvfbV+P+vqsW0iw6Dp8uR9nwK3dUNhIe/GjORKoSQReunvEk+ TkcHohp4Oe7Wp3GiCdYs8IQAS9oW3IugB6mB6KlQwPhQEmS/0eM8qfBAqC/HjKsxdT3T QvfEDoTOF+gUmLAuNY26Ih7gH2KT5ZBdxL0FBO43jQOTMgQ6B2IYpOx/N7nryC2JluAu Q5Vg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDyWAbNiqV67BVaaBTAnM81q7f83iGXAcgJ53Rc0/+hYm5K+4Klc Tb/kvMi9hnG44CCUWt7TLXA= X-Google-Smtp-Source: ACHHUZ6NYMMY1M5Suo+mKIX/tdXKvbI7c7101jYtHGmIuji7VM679htlDZx51dtclDKnimoR2YPnhg== X-Received: by 2002:a25:874f:0:b0:b9d:fe66:a424 with SMTP id e15-20020a25874f000000b00b9dfe66a424mr13115185ybn.2.1683802240190; Thu, 11 May 2023 03:50:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:9a84:0:b0:b8f:4672:7434 with SMTP id s4-20020a259a84000000b00b8f46727434ls23753371ybo.10.-pod-prod-gmail; Thu, 11 May 2023 03:50:39 -0700 (PDT) X-Received: by 2002:a25:d345:0:b0:b8f:3202:4491 with SMTP id e66-20020a25d345000000b00b8f32024491mr21986464ybf.30.1683802239574; Thu, 11 May 2023 03:50:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683802239; cv=none; d=google.com; s=arc-20160816; b=P76Zx4raEmKgWQVFHLTt3pOPgba86ihY1w5rULv1h66agHjq4WjMVNi0YBb43UQgZV rhOgaLyOK2v1hDN9D8NUcUNFLReoWbQIVYfl0zlmqkvgCfRpLR0cW4MTxRG286BjV+tQ oGgVwPl23oOFZsWF9x4PVsfUZvmna9Zs58DwUOVXegjKkLfjPJEeFE3OYsmwcij29rEp B5iqeqoBIW1Hrg1vNvCf3g+ZQ2b5FUtKDC+vSQIE8MW1rloDsiict5YFb98EFusXHksy u63PGoqYlMllWE/ODek3kf5QaqBBBGif774cGiNxE513Oy639A/a7htRG4qRuZenehoa Exfg== 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=+26LaFIqrqPqimKlbLbzdcbJfGXwBtOL3CDa86xBzKc=; b=sC+uQnRzNRM0Kij8HyEATcmCve9zmvyVAwwXbMbdN+WAUohK8OtwZN6STQrpj/3A7R Dw3Z/gJ0g8UL359YagfxoNADhwJjoDadFFFnNFi6htnoNiRH+rwjCAWVrv9yBqLmi/Sd mkFVeEM4UROznXOKsijrX0OqPPMwUeoE30tD4lvJqO7pMfOhA0ctwSx00CeELmZsiGuO WmbwLOFNrcebifiUoSWTuHZpJL69AhW2YycANjFpDhp20bDbjTKuA7fmzYX5Ee8CoUab sbj5idLM0rU0eTco24IpLrcx5p+SC5KB1292N/UQ3j+PkxOZkzHt25Rsd5CA6+MgapCX LQrw== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x187-20020a25e0c4000000b00b95bf79bf9dsi1274314ybg.2.2023.05.11.03.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 03:50:39 -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; Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34BAoQ06011851 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 12:50:33 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 6/7] meta: Remove buildchroot Date: Thu, 11 May 2023 13:50:19 +0300 Message-Id: <20230511105020.1881496-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511105020.1881496-1-amikan@ilbers.de> References: <20230511105020.1881496-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Buildchroot is not used anywhere so remove it. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 2 +- meta/classes/buildchroot.bbclass | 59 --------------- meta/classes/crossvars.bbclass | 6 -- meta/classes/deb-dl-dir.bbclass | 4 +- 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 ------------ scripts/contrib/convert-overrides.py | 2 +- 15 files changed, 3 insertions(+), 296 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 7e0184e4..1c8e1562 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 e4a7a571..00000000 --- a/meta/classes/buildchroot.bbclass +++ /dev/null @@ -1,59 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2018 Siemens AG -# -# SPDX-License-Identifier: MIT - -inherit crossvars - -MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock" - -buildchroot_do_mounts() { - if [ "${USE_CCACHE}" = "1" ]; then - mkdir -p "${CCACHE_DIR}" - if [ "${CCACHE_DEBUG}" = "1" ]; then - mkdir -p "${CCACHE_DIR}/debug" - fi - 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/crossvars.bbclass b/meta/classes/crossvars.bbclass index 201d460f..e6a085b1 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -15,20 +15,14 @@ python __anonymous() { d.setVar('BUILD_HOST_ARCH', distro_arch) schroot_dir = d.getVar('SCHROOT_TARGET_DIR', False) sbuild_dep = "sbuild-chroot-target:do_build" - buildchroot_dir = d.getVar('BUILDCHROOT_TARGET_DIR', False) - buildchroot_dep = "buildchroot-target:do_build" sdk_toolchain = "build-essential" else: d.setVar('BUILD_HOST_ARCH', d.getVar('HOST_ARCH')) schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host:do_build" - buildchroot_dir = d.getVar('BUILDCHROOT_HOST_DIR', False) - buildchroot_dep = "buildchroot-host:do_build" sdk_toolchain = "crossbuild-essential-" + distro_arch d.setVar('SCHROOT_DIR', schroot_dir) d.setVar('SCHROOT_DEP', sbuild_dep) - d.setVar('BUILDCHROOT_DIR', buildchroot_dir) - d.setVar('BUILDCHROOT_DEP', buildchroot_dep) if isar_can_build_compat(d): sdk_toolchain += " crossbuild-essential-" + d.getVar('COMPAT_DISTRO_ARCH') d.setVar('SDK_TOOLCHAIN', sdk_toolchain) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f0ab9714..d36b7190 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -17,9 +17,7 @@ is_not_part_of_current_build() { "${SCHROOT_HOST_DIR}"/var/log/dpkg.log \ "${SCHROOT_TARGET_DIR}"/var/log/dpkg.log \ "${SCHROOT_HOST_DIR}"/tmp/dpkg_common.log \ - "${SCHROOT_TARGET_DIR}"/tmp/dpkg_common.log \ - "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \ - "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )" + "${SCHROOT_TARGET_DIR}"/tmp/dpkg_common.log | head -1 )" [ -z "${output}" ] } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b9d3d411..e0c0a3cf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -35,11 +35,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") @@ -72,16 +67,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 -} - inherit multiarch inherit essential diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index 4f3c87dd..a6ba0a9e 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 fe9d7f64..42a8fb8e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -54,14 +54,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 e5ce248e..00000000 --- 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 6613de63..00000000 --- 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 f74896fb..00000000 --- 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 d4709cf5..00000000 --- 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 73226d8d..00000000 --- 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 c4d8cf83..00000000 --- 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 diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 6551aaa8..57f166ca 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -65,7 +65,7 @@ skips = skips + ["self._removePatch", "self._removePatchFile", "self._appendPatc imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"] imagevars = imagevars + ["TOOLCHAIN", "BOOTSTRAP_SRC", "IMAGE_FSTYPES", "IMAGE_SRC_URI", "IMAGE_TEMPLATE_FILES", "IMAGE_TEMPLATE_VARS", "IMAGE_CMD_REQUIRED_ARGS"] -imagevars = imagevars + ["IMAGE_FULLNAME", "CONVERSION_DEPS", "BUILDCHROOT_PREINSTALL", "IMAGER_BUILD_DEPS", "IMAGER_INSTALL"] +imagevars = imagevars + ["IMAGE_FULLNAME", "CONVERSION_DEPS", "IMAGER_BUILD_DEPS", "IMAGER_INSTALL"] packagevars = packagevars + imagevars vars_re = {}