[PATCH 1/4] apt: Generate configs for apt

[Alexander Smirnov <asmirnov@ilbers.de>]

Generate reprepro configuration files for apt deployment.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta-isar/conf/layer.conf                            | 10 ++++++++--
 meta-isar/recipes-core/images/files/distributions.in |  3 +++
 meta/classes/image.bbclass                           | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 meta-isar/recipes-core/images/files/distributions.in

diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf
index 72a103c..0950a34 100644
--- a/meta-isar/conf/layer.conf
+++ b/meta-isar/conf/layer.conf
@@ -1,5 +1,5 @@
 # This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
+# Copyright (C) 2015-2017 ilbers GmbH
 
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
@@ -13,6 +13,12 @@ BBFILE_PRIORITY_isar = "5"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_isar = "2"
+LAYERVERSION_isar = "3"
 
 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"
diff --git a/meta-isar/recipes-core/images/files/distributions.in b/meta-isar/recipes-core/images/files/distributions.in
new file mode 100644
index 0000000..cd214c6
--- /dev/null
+++ b/meta-isar/recipes-core/images/files/distributions.in
@@ -0,0 +1,3 @@
+Codename: {DISTRO_NAME}
+Architectures: i386 armhf amd64 source
+Components: main
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5bf9524..57705a7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,5 +1,5 @@
 # This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
+# Copyright (C) 2015-2017 ilbers GmbH
 
 KERNEL_IMAGE ?= ""
 INITRD_IMAGE ?= ""
@@ -10,6 +10,21 @@ IMAGE_ROOTFS   = "${WORKDIR}/rootfs"
 
 inherit ${IMAGE_TYPE}
 
+CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${DISTRO}/conf"
+do_cache_config[dirs] = "${CACHE_CONF_DIR}"
+do_cache_config[stamp-extra-info] = "${DISTRO}"
+
+# Generate reprepro config for current distro if it doesn't exist. Once it's
+# generated, this task should do nothing.
+do_cache_config() {
+    if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then
+        sed -e "s#{DISTRO_NAME}#"${DEBDISTRONAME}"#g" \
+            ${FILESDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions
+    fi
+}
+
+addtask cache_config before do_fetch
+
 do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}"
 
 # Install Debian packages, that were built from sources
-- 
2.1.4