[appliance-tools/f16] add a hack to work around grub so we can make ec2 images
Dennis Gilmore
ausil at fedoraproject.org
Sat Oct 29 13:23:19 UTC 2011
commit b0b385185935c887439c7523fd96c3178ba5e426
Author: Dennis Gilmore <dennis at ausil.us>
Date: Sat Oct 29 08:22:43 2011 -0500
add a hack to work around grub so we can make ec2 images
appliance-tools-005-nogrub-hack.patch | 19 +++++++++++++++++++
appliance-tools.spec | 7 ++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/appliance-tools-005-nogrub-hack.patch b/appliance-tools-005-nogrub-hack.patch
new file mode 100644
index 0000000..f9fa5ec
--- /dev/null
+++ b/appliance-tools-005-nogrub-hack.patch
@@ -0,0 +1,19 @@
+diff -uNr appliance-tools-005-orig/appcreate/appliance.py appliance-tools-005/appcreate/appliance.py
+--- appliance-tools-005-orig/appcreate/appliance.py 2010-09-06 18:43:21.000000000 -0500
++++ appliance-tools-005/appcreate/appliance.py 2011-10-29 08:19:04.000000000 -0500
+@@ -253,11 +253,10 @@
+ for f in files:
+ path = imgpath + "/" + f
+ if not os.path.isfile(path):
+- raise CreatorError("grub not installed : "
+- "%s not found" % path)
+-
+- logging.debug("Copying %s to %s/boot/grub/%s" %(path, self._instroot, f))
+- shutil.copy(path, self._instroot + "/boot/grub/" + f)
++ logging.debug("grub file %s not found assume we are ok " % path)
++
++ logging.debug("Not Copying %s to %s/boot/grub/%s" %(path, self._instroot, f))
++ #shutil.copy(path, self._instroot + "/boot/grub/" + f)
+
+ def _install_grub(self):
+ (bootdevnum, rootdevnum, rootdev, prefix) = self._get_grub_boot_config()
diff --git a/appliance-tools.spec b/appliance-tools.spec
index 73cf3c5..a1224d1 100644
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@ -5,7 +5,7 @@
Summary: Tools for building Appliances
Name: appliance-tools
Version: 005
-Release: 1%{?dist}
+Release: 1.nogrubhack%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://thincrust.org/
@@ -16,6 +16,7 @@ URL: http://thincrust.org/
# git checkout appliance-tools-005
# make dist
Source0: %{name}-%{version}.tar.bz2
+Patch0: appliance-tools-005-nogrub-hack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: livecd-tools >= 020 curl rsync kpartx
Requires: zlib
@@ -40,6 +41,7 @@ Tool that helps remove unwanted files from the appliance image.
%prep
%setup -q
+%patch0 -p1
%build
make
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/image-minimizer
%changelog
+* Sat Oct 29 2011 Dennis Gilmore <dennis at ausil.us> - 005-2
+- add a hack to work around no grub being installed so we can compose ec2 images
+
* Mon Apr 04 2011 Alan Pevec <apevec at redhat.com> 005-1
- image-minimizer: support drop-keep-drop
- image-minimizer: add droprpm/keeprpm
More information about the scm-commits
mailing list