From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a1c:9c06:: with SMTP id f6-v6mr263309wme.4.1539276807610; Thu, 11 Oct 2018 09:53:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:b72b:: with SMTP id l43-v6ls1882800wre.5.gmail; Thu, 11 Oct 2018 09:53:27 -0700 (PDT) X-Google-Smtp-Source: ACcGV638J+iuzI2IqYH44M9IBVxT7WGmpSrCOpfqw9qP98DXODG+myuD5WR3j+hnx0GfCNRdzoxj X-Received: by 2002:adf:f989:: with SMTP id f9-v6mr240942wrr.0.1539276807088; Thu, 11 Oct 2018 09:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539276807; cv=none; d=google.com; s=arc-20160816; b=aB8v7BM6FsNRfdfoE1KPvqu4zlzmnzJuA0CjcvKtjHKhVFWOQdhla6NpKksw83GvF2 5qixznh+lD3FJO4m0ZEbZLY84zjpoeNAb2DCYub1EwdgKVy9gF56W+q7l1UwVY7Haf6i HzGSrOxpkaGXEJfGzbENwH3g+kn3CmeByHcO845hiyJoUqiQACJkG03wGOammwfWic4t uwn2J6Ju/O7Uf4UfnNLlkJXJVyK86OValQyuBX0wRf6pKwzyelCx6RwOtNDa1w9FJAT4 zLJWBMBb0R/97g1KR8lXMovceAKBWUDdY5N5Wz98/KZVn5es2UDu6osqIkL13kZlfmM+ x4hQ== 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:to:from; bh=ZzpIo3J21Ui0qiXM370PChsBlJtO5S4xluBNQRG1ZRc=; b=TInVSxJ7KnwPWCNc0Iylysp8z2FAKnb57Yiesa0IZaKHWrZe8ZVQ3oqsZyWdYu47vR ZHPaQX8l4tq9fDnAmNZPYPj9fZ9eH2Pm6t2CZuem2V43M6fV9kZHNkW7htMbAiqtofZo dbDTa7eHz1qA6z1KBPJrGBcjdiZOAtoBBVr5pIx+HHYJ/ubMHkBEh91dHv5aPHliX1Cg p31RtC+CGDHrqFb/CuxaDoOpAEG0xIzQkpjZLoRaog8AIXBW2lmHp2wNZ47jZiCpUEYl /OGoy1drCUhHUN4nYIz+pqg+qOtjAHvYNx9hNsdwMCT/X3LtAgplsHcXryVP2o8qUVO+ tykw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id h137-v6si69258wmd.1.2018.10.11.09.53.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 09:53:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w9BGr67Y015654 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 11 Oct 2018 18:53:26 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2 02/10] meta: Unify path names to local repositories Date: Thu, 11 Oct 2018 18:52:57 +0200 Message-Id: <20181011165305.1622-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181011165305.1622-1-mosipov@ilbers.de> References: <20181011165305.1622-1-mosipov@ilbers.de> X-TUID: MZ8f+aboIRjq Rename DEPLOY_DIR_APT, DEPLOY_DIR_APT to REPO_ISAR_DIR and REPO_ISAR_DB_DIR correspondingly to unify with cached base repository names REPO_BASE_DIR and REPO_BASE_DB_DIR. Suggested-by: Claudius Heine Signed-off-by: Maxim Yu. Osipov --- meta-isar/conf/layer.conf | 8 +++----- meta/classes/base-apt-helper.bbclass | 2 +- meta/classes/buildchroot.bbclass | 2 +- meta/classes/dpkg-base.bbclass | 10 +++++----- meta/classes/dpkg.bbclass | 2 +- meta/classes/image.bbclass | 4 ++-- meta/classes/isar-bootstrap-helper.bbclass | 4 ++-- meta/recipes-devtools/isar-apt/isar-apt.bb | 8 ++++---- meta/recipes-kernel/linux/linux-custom.inc | 2 +- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf index 22b2ff2..4aa1cf1 100644 --- a/meta-isar/conf/layer.conf +++ b/meta-isar/conf/layer.conf @@ -20,11 +20,9 @@ LAYERDIR_isar = "${LAYERDIR}" # Codename of the repository created by the caching class DEBDISTRONAME = "isar" -# Path to the Isar apt repository -DEPLOY_DIR_APT ?= "${DEPLOY_DIR}/apt" - -# Path to the Isar databases used by `reprepro` -DEPLOY_DIR_DB ?= "${DEPLOY_DIR}/db" +# Isar apt repository paths +REPO_ISAR_DIR ?= "${DEPLOY_DIR}/isar-apt/apt" +REPO_ISAR_DB_DIR ?= "${DEPLOY_DIR}/isar-apt/db" # Base apt repository paths REPO_BASE_DIR ?= "${DEPLOY_DIR}/base-apt/apt" diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 9c03a7e..ff4a3d5 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -16,7 +16,7 @@ populate_base_apt() { # Check if this package is taken from Isar-apt, if so - ingore it. base_name=${package##*/} - isar_package=$(find ${DEPLOY_DIR_APT}/${DISTRO} -name $base_name) + isar_package=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name) if [ -n "$isar_package" ]; then # Check if MD5 sums are identical. This helps to avoid the case # when packages is overridden from another repo. diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index f67335e..870d27c 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -25,7 +25,7 @@ buildchroot_do_mounts() { sudo flock ${MOUNT_LOCKFILE} -c ' \ set -e if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then - mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt + mount --bind ${REPO_ISAR_DIR}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev mount -t proc none ${BUILDCHROOT_DIR}/proc diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index edd111b..f1b127c 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -76,8 +76,8 @@ CLEANFUNCS += "repo_clean" repo_clean() { PACKAGES=$(cd ${S}/..; ls *.deb | sed 's/\([^_]*\).*/\1/') if [ -n "${PACKAGES}" ]; then - reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ - --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ + reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \ + --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \ -C main -A ${DISTRO_ARCH} \ remove ${DEBDISTRONAME} \ ${PACKAGES} @@ -87,8 +87,8 @@ repo_clean() { # Install package to Isar-apt do_deploy_deb() { repo_clean - reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ - --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ + reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \ + --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \ -C main \ includedeb ${DEBDISTRONAME} \ ${S}/../*.deb @@ -96,6 +96,6 @@ do_deploy_deb() { addtask deploy_deb after do_build do_deploy_deb[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" -do_deploy_deb[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock" +do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[depends] = "isar-apt:do_cache_config" do_deploy_deb[dirs] = "${S}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index da0b40d..f74c9c9 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -13,7 +13,7 @@ do_install_builddeps() { addtask install_builddeps after do_prepare_build before do_build # apt and reprepro may not run in parallel, acquire the Isar lock -do_install_builddeps[lockfiles] += "${DEPLOY_DIR_APT}/isar.lock" +do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_builddeps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" # Build package from sources using build script diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ea8cbf5..e948dea 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -102,7 +102,7 @@ SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO do_populate_sdk() { # Copy isar-apt with deployed Isar packages - sudo cp -Trpfx ${DEPLOY_DIR_APT}/${DISTRO} ${SDKCHROOT_DIR}/rootfs/isar-apt + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/rootfs/isar-apt # Purge apt cache to make image slimmer sudo rm -rf ${SDKCHROOT_DIR}/rootfs/var/cache/apt/* @@ -158,7 +158,7 @@ do_install_imager_deps() { do_install_imager_deps[depends] = "buildchroot-target:do_build" do_install_imager_deps[deptask] = "do_deploy_deb" -do_install_imager_deps[lockfiles] += "${DEPLOY_DIR_APT}/isar.lock" +do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_imager_deps[stamp-extra-info] = "${DISTRO}-${MACHINE}" addtask install_imager_deps before do_build diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 597f6b1..f046216 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -93,9 +93,9 @@ setup_root_file_system() { sudo tee "$ROOTFSDIR/etc/apt/preferences.d/isar" >/dev/null if [ ${COPYISARAPT} ]; then - sudo cp -Trpfx ${DEPLOY_DIR_APT}/${DISTRO} $ROOTFSDIR/isar-apt + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} $ROOTFSDIR/isar-apt else - sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} $ROOTFSDIR/isar-apt + sudo mount --bind ${REPO_ISAR_DIR}/${DISTRO} $ROOTFSDIR/isar-apt fi sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs $ROOTFSDIR/dev sudo mount -t proc none $ROOTFSDIR/proc diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb index 9c31d12..a959691 100644 --- a/meta/recipes-devtools/isar-apt/isar-apt.bb +++ b/meta/recipes-devtools/isar-apt/isar-apt.bb @@ -3,10 +3,10 @@ SRC_URI = "file://distributions.in" -CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${DISTRO}/conf" +CACHE_CONF_DIR = "${REPO_ISAR_DIR}/${DISTRO}/conf" do_cache_config[dirs] = "${CACHE_CONF_DIR}" do_cache_config[stamp-extra-info] = "${DISTRO}" -do_cache_config[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock" +do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" # Generate reprepro config for current distro if it doesn't exist. Once it's # generated, this task should do nothing. @@ -16,8 +16,8 @@ do_cache_config() { ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions fi - path_cache="${DEPLOY_DIR_APT}/${DISTRO}" - path_databases="${DEPLOY_DIR_DB}/${DISTRO}" + path_cache="${REPO_ISAR_DIR}/${DISTRO}" + path_databases="${REPO_ISAR_DB_DIR}/${DISTRO}" if [ ! -d "${path_databases}" ]; then reprepro -b ${path_cache} \ diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 7c6b624..8c89637 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -36,7 +36,7 @@ do_install_builddeps() { addtask install_builddeps after do_prepare_build before do_build # apt and reprepro may not run in parallel, acquire the Isar lock -do_install_builddeps[lockfiles] += "${DEPLOY_DIR_APT}/isar.lock" +do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_builddeps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" dpkg_runbuild() { -- 2.11.0