[diskimage-builder] Move busybox binary-dep to ramdisk element

[slagle]

commit b7ccb27f7b5daac37168beb6121de3a5e4d1dfad
Author: James Slagle <jslagle at redhat.com>
Date:   Wed Oct 22 11:32:58 2014 -0400

    Move busybox binary-dep to ramdisk element

 ...ove-busybox-binary-dep-to-ramdisk-element.patch |   59 ++++++++++++++++++++
 diskimage-builder.spec                             |    7 ++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/0003-Move-busybox-binary-dep-to-ramdisk-element.patch b/0003-Move-busybox-binary-dep-to-ramdisk-element.patch
new file mode 100644
index 0000000..92210bf
--- /dev/null
+++ b/0003-Move-busybox-binary-dep-to-ramdisk-element.patch
@@ -0,0 +1,59 @@
+From eacf84e6d979497578ebb919d93f828199a33030 Mon Sep 17 00:00:00 2001
+From: Ben Nemec <bnemec at redhat.com>
+Date: Tue, 21 Oct 2014 16:01:19 -0500
+Subject: [PATCH] Move busybox binary-dep to ramdisk element
+
+Busybox should be installed and managed from the ramdisk element,
+since that is common to all elements that need busybox.  In
+addition, we do not want busybox installed when building Dracut
+ramdisks, so it can't be in the deploy-* elements.
+
+Change-Id: I2656d20b466138f7f6dfcf558ba90c6909151d3c
+---
+ elements/deploy-baremetal/binary-deps.d/deploy                        | 1 -
+ elements/deploy-baremetal/install.d/package-installs-deploy-baremetal | 1 -
+ elements/deploy-ironic/binary-deps.d/deploy-ironic                    | 1 -
+ elements/deploy-ironic/install.d/package-installs-deploy-ironic       | 1 -
+ elements/ramdisk/binary-deps.d/ramdisk                                | 1 +
+ 5 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/elements/deploy-baremetal/binary-deps.d/deploy b/elements/deploy-baremetal/binary-deps.d/deploy
+index 74d8980..8e5be60 100644
+--- a/elements/deploy-baremetal/binary-deps.d/deploy
++++ b/elements/deploy-baremetal/binary-deps.d/deploy
+@@ -1,4 +1,3 @@
+-busybox
+ bash
+ tgtd
+ tgtadm
+diff --git a/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal b/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal
+index a2b9d70..786509c 100644
+--- a/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal
++++ b/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal
+@@ -1,2 +1 @@
+-busybox
+ tgt
+diff --git a/elements/deploy-ironic/binary-deps.d/deploy-ironic b/elements/deploy-ironic/binary-deps.d/deploy-ironic
+index dee62a0..1bb3f38 100644
+--- a/elements/deploy-ironic/binary-deps.d/deploy-ironic
++++ b/elements/deploy-ironic/binary-deps.d/deploy-ironic
+@@ -1,4 +1,3 @@
+-busybox
+ curl
+ tgtadm
+ tgtd
+diff --git a/elements/deploy-ironic/install.d/package-installs-deploy-ironic b/elements/deploy-ironic/install.d/package-installs-deploy-ironic
+index 8948f65..3da7a78 100644
+--- a/elements/deploy-ironic/install.d/package-installs-deploy-ironic
++++ b/elements/deploy-ironic/install.d/package-installs-deploy-ironic
+@@ -1,3 +1,2 @@
+-busybox
+ curl
+ tgt
+diff --git a/elements/ramdisk/binary-deps.d/ramdisk b/elements/ramdisk/binary-deps.d/ramdisk
+index 5d468f9..e56a617 100644
+--- a/elements/ramdisk/binary-deps.d/ramdisk
++++ b/elements/ramdisk/binary-deps.d/ramdisk
+@@ -1 +1,2 @@
+ dhclient
++busybox
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 8bbe708..c69506b 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,7 +1,7 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
 Version:	0.1.34
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
@@ -9,6 +9,7 @@ Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.
 
 Patch0001: 0001-svc-map-requires-PyYAML.patch
 Patch0002: 0002-Enable-dracut-deploy-ramdisks.patch
+Patch0003: 0003-Move-busybox-binary-dep-to-ramdisk-element.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -29,6 +30,7 @@ Requires: dib-utils
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 %build
 %{__python} setup.py build
@@ -69,6 +71,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Wed Oct 22 2014 James Slagle <jslagle at redhat.com> 0.1.34-4
+- Move busybox binary-dep to ramdisk element
+
 * Tue Oct 21 2014 James Slagle <jslagle at redhat.com> 0.1.34-3
 - Remove requirement on busybox, we use dracut now.