Fix builds

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

12 files changed, 11 insertions, 24 deletions

diff --git a/class/DEBIAN.var b/class/DEBIAN.var
index 940b7da..cadf6c0 100644
--- a/class/DEBIAN.var
+++ b/class/DEBIAN.var
@@ -1,4 +1,3 @@
-release=stretch
 apt_cdn=http://deb.debian.org
 FAI_DEBOOTSTRAP="$release $apt_cdn/debian/"
 KEYMAP=us-latin1
diff --git a/files/etc/apt/sources.list.d/backports.list/BACKPORTS b/files/etc/apt/sources.list.d/backports.list/BACKPORTS
deleted file mode 100644
index 7046e1d..0000000
--- a/files/etc/apt/sources.list.d/backports.list/BACKPORTS
+++ /dev/null
@@ -1,2 +0,0 @@
-deb ${cdn}/debian ${release}-backports main
-deb-src ${cdn}/debian ${release}-backports main
diff --git a/files/etc/apt/sources.list.d/backports.list/preinst b/files/etc/apt/sources.list.d/backports.list/preinst
deleted file mode 100755
index ee32e3a..0000000
--- a/files/etc/apt/sources.list.d/backports.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/DEBIAN b/files/etc/apt/sources.list/SID
index 5fdee74..5fdee74 100644
--- a/files/etc/apt/sources.list/DEBIAN
+++ b/files/etc/apt/sources.list/SID
diff --git a/package_config/ALIP b/package_config/ALIP
index 35e1b01..6fd0f0a 100644
--- a/package_config/ALIP
+++ b/package_config/ALIP
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 bluedevil
 breeze
 chromium
@@ -71,14 +71,14 @@ xserver-xorg-video-fbdev
 xserver-xorg-video-modesetting
 xterm
 
-PACKAGES install STRETCH
+PACKAGES install-norec STRETCH
 nodejs-legacy
 
-PACKAGES install BUSTER
+PACKAGES install-norec BUSTER
 nodejs
 
-PACKAGES install SID
+PACKAGES install-norec SID
 nodejs
 
-PACKAGES install QCOM
+PACKAGES install-norec QCOM
 96boards-artwork
diff --git a/package_config/BLEND b/package_config/BLEND
index ea184a9..1b92c73 100644
--- a/package_config/BLEND
+++ b/package_config/BLEND
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 build-essential
 dbus-x11
 dhcpcd5
diff --git a/package_config/DEBIAN b/package_config/DEBIAN
index 224e4b5..799050a 100644
--- a/package_config/DEBIAN
+++ b/package_config/DEBIAN
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 adduser
 apt
 apt-utils
diff --git a/package_config/DEVELOPER b/package_config/DEVELOPER
index 6e0839d..a9c12ab 100644
--- a/package_config/DEVELOPER
+++ b/package_config/DEVELOPER
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 babeltrace
 bluez
 build-essential
diff --git a/package_config/INSTALLER b/package_config/INSTALLER
index 4966617..27b6557 100644
--- a/package_config/INSTALLER
+++ b/package_config/INSTALLER
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 96boards-installer-session
 android-tools-fsutils
 grub-common
diff --git a/package_config/LINARO b/package_config/LINARO
index da06a2b..2887b9f 100644
--- a/package_config/LINARO
+++ b/package_config/LINARO
@@ -1,3 +1,3 @@
-PACKAGES install
+PACKAGES install-norec
 linaro-overlay-minimal
 96boards-tools-common
diff --git a/package_config/QCOM b/package_config/QCOM
index 003b124..76e98c9 100644
--- a/package_config/QCOM
+++ b/package_config/QCOM
@@ -1,4 +1,4 @@
-PACKAGES install
+PACKAGES install-norec
 u-boot-menu
 u-boot
 linux-image-4.9.47-00529-g487f36cde580
diff --git a/scripts/BACKPORTS/10-apt b/scripts/STRETCH/10-apt
index bdb7a7a..bdb7a7a 100755
--- a/scripts/BACKPORTS/10-apt
+++ b/scripts/STRETCH/10-apt