From 21799254a7d55ac94efbd1595b4dc1caea057b40 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Thu, 5 Feb 2015 19:49:09 -0800 Subject: [PATCH] Use package-installs for ubuntu and base elements Both ccache and linux-image-generic were being installed by install-packages rather than using a package-installs.yaml. Change-Id: Ib54c5b51d605278bb9d046a897be989c17c6fb0f --- elements/base/install.d/00-ccache | 6 ------ elements/base/package-installs.yaml | 1 + elements/ubuntu/install.d/10-support-physical-hardware | 8 -------- elements/ubuntu/package-installs.yaml | 1 + 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 elements/base/install.d/00-ccache create mode 100644 elements/base/package-installs.yaml delete mode 100755 elements/ubuntu/install.d/10-support-physical-hardware create mode 100644 elements/ubuntu/package-installs.yaml diff --git a/elements/base/install.d/00-ccache b/elements/base/install.d/00-ccache deleted file mode 100755 index 8a581105..00000000 --- a/elements/base/install.d/00-ccache +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -install-packages -m base ccache_package diff --git a/elements/base/package-installs.yaml b/elements/base/package-installs.yaml new file mode 100644 index 00000000..afe7c77a --- /dev/null +++ b/elements/base/package-installs.yaml @@ -0,0 +1 @@ +ccache_package: diff --git a/elements/ubuntu/install.d/10-support-physical-hardware b/elements/ubuntu/install.d/10-support-physical-hardware deleted file mode 100755 index 08d4d543..00000000 --- a/elements/ubuntu/install.d/10-support-physical-hardware +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -# Ubuntu's cloud images don't include drivers for real hardware. -install-packages linux-image-generic - diff --git a/elements/ubuntu/package-installs.yaml b/elements/ubuntu/package-installs.yaml new file mode 100644 index 00000000..83f64fcc --- /dev/null +++ b/elements/ubuntu/package-installs.yaml @@ -0,0 +1 @@ +linux-image-generic: