Switch to fai 5.6 and add deb-src

While adding deb-src stanzas, add switch to fai 5.6 variables. This
means we no longer need preinst scripts nor fcopy for apt files.

Change-Id: I86e3da6d6d11f525e14c6a030135796c8585905a

11 files changed, 18 insertions, 49 deletions

diff --git a/files/etc/apt/sources.list.d/linaro.list/HIKEY b/files/etc/apt/sources.list.d/linaro.list/HIKEY
index 22e1ef2..95ffaba 100644
--- a/files/etc/apt/sources.list.d/linaro.list/HIKEY
+++ b/files/etc/apt/sources.list.d/linaro.list/HIKEY
@@ -1,3 +1,5 @@
-deb http://obs.linaro.org/linaro-overlay-${release}/${obs_release}/ ./
-deb http://obs.linaro.org/hikey/${release}/ ./
+deb http://obs.linaro.org/linaro-overlay-{%release%}/{%obs_release%}/ ./
+deb-src http://obs.linaro.org/linaro-overlay-{%release%}/{%obs_release%}/ ./
+deb http://obs.linaro.org/hikey/{%release%}/ ./
+deb-src http://obs.linaro.org/hikey/{%release%}/ ./
 
diff --git a/files/etc/apt/sources.list.d/linaro.list/LINARO b/files/etc/apt/sources.list.d/linaro.list/LINARO
index 2dd2841..f5f0b78 100644
--- a/files/etc/apt/sources.list.d/linaro.list/LINARO
+++ b/files/etc/apt/sources.list.d/linaro.list/LINARO
@@ -1,3 +1,3 @@
-deb http://obs.linaro.org/linaro-overlay-${release}/${obs_release}/ ./
-deb-src http://obs.linaro.org/linaro-overlay-${release}/${obs_release}/ ./
+deb http://obs.linaro.org/linaro-overlay-{%release%}/{%obs_release%}/ ./
+deb-src http://obs.linaro.org/linaro-overlay-{%release%}/{%obs_release%}/ ./
 
diff --git a/files/etc/apt/sources.list.d/linaro.list/preinst b/files/etc/apt/sources.list.d/linaro.list/preinst
deleted file mode 100755
index ee32e3a..0000000
--- a/files/etc/apt/sources.list.d/linaro.list/preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-# template expansion
-
-# $1 is the class name used
-# $2 is the path to the file copied
-
-envsubst < $2 > $2.tmp
-mv $2.tmp $2
-
diff --git a/files/etc/apt/sources.list/BUSTER b/files/etc/apt/sources.list/BUSTER
index 57f2150..6d020d7 100644
--- a/files/etc/apt/sources.list/BUSTER
+++ b/files/etc/apt/sources.list/BUSTER
@@ -1,2 +1,2 @@
-deb ${apt_cdn}/debian ${release} main contrib non-free
-deb-src ${apt_cdn}/debian ${release} main contrib non-free
+deb {%apt_cdn%}/debian {%release%} main contrib non-free
+deb-src {%apt_cdn%}/debian {%release%} main contrib non-free
diff --git a/files/etc/apt/sources.list/SID b/files/etc/apt/sources.list/SID
index c05aac4..6d020d7 100644
--- a/files/etc/apt/sources.list/SID
+++ b/files/etc/apt/sources.list/SID
@@ -1 +1,2 @@
-deb ${apt_cdn}/debian ${release} main contrib non-free
+deb {%apt_cdn%}/debian {%release%} main contrib non-free
+deb-src {%apt_cdn%}/debian {%release%} main contrib non-free
diff --git a/files/etc/apt/sources.list/STRETCH b/files/etc/apt/sources.list/STRETCH
index 51b0f81..7757629 100644
--- a/files/etc/apt/sources.list/STRETCH
+++ b/files/etc/apt/sources.list/STRETCH
@@ -1,3 +1,6 @@
-deb ${apt_cdn}/debian ${release} main contrib non-free
-deb http://security.debian.org/ ${release}/updates main contrib non-free
-deb ${apt_cdn}/debian ${release}-updates main contrib non-free
+deb {%apt_cdn%}/debian {%release%} main contrib non-free
+deb-src {%apt_cdn%}/debian {%release%} main contrib non-free
+deb http://security.debian.org/ {%release%}/updates main contrib non-free
+deb-src http://security.debian.org/ {%release%}/updates main contrib non-free
+deb {%apt_cdn%}/debian {%release%}-updates main contrib non-free
+deb-src {%apt_cdn%}/debian {%release%}-updates main contrib non-free
diff --git a/files/etc/apt/sources.list/preinst b/files/etc/apt/sources.list/preinst
deleted file mode 100755
index ee32e3a..0000000
--- a/files/etc/apt/sources.list/preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-# template expansion
-
-# $1 is the class name used
-# $2 is the path to the file copied
-
-envsubst < $2 > $2.tmp
-mv $2.tmp $2
-
diff --git a/files/etc/hosts/DEBIAN b/files/etc/hosts/DEBIAN
index b087251..8aa3fe5 100644
--- a/files/etc/hosts/DEBIAN
+++ b/files/etc/hosts/DEBIAN
@@ -1,5 +1,5 @@
 127.0.0.1       localhost
-127.0.1.1       ${HOSTNAME}
+127.0.1.1       {%HOSTNAME%}
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     localhost ip6-localhost ip6-loopback
diff --git a/files/etc/hosts/preinst b/files/etc/hosts/preinst
deleted file mode 100755
index ee32e3a..0000000
--- a/files/etc/hosts/preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-# template expansion
-
-# $1 is the class name used
-# $2 is the path to the file copied
-
-envsubst < $2 > $2.tmp
-mv $2.tmp $2
-
diff --git a/scripts/DEBIAN/21-hostname b/scripts/DEBIAN/21-hostname
index adacd67..12ce886 100755
--- a/scripts/DEBIAN/21-hostname
+++ b/scripts/DEBIAN/21-hostname
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
-fcopy -M /etc/hosts
+fcopy -S -M /etc/hosts
 echo $HOSTNAME > $target/etc/hostname
diff --git a/scripts/LINARO/10-apt b/scripts/LINARO/10-apt
deleted file mode 100755
index 554f153..0000000
--- a/scripts/LINARO/10-apt
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-fcopy -M /etc/apt/sources.list.d/linaro.list
-#fcopy -M /etc/apt/apt.conf.d/linaro.conf
-
-