[Ovirt-devel] [PATCH node-image] Remove pxe subpackage from ovirt-node-image

[Perry Myers]

pxe just duplicated for the most part what was in base package
Instead users should just run ovirt-pxe script after installing
ovirt-node-image package

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-node-image.spec.in |   29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 440ba2f..a30ea94 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -18,10 +18,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://ovirt.org/
 BuildRequires: livecd-tools >= 017.1-2ovirt
 BuildRequires: syslinux
-BuildRequires: appliance-tools >= 002-3
 
 %define app_root %{_datadir}/%{name}
-%define tftpboot %{_var}/lib/tftpboot
 
 #  disable debuginfo, makes no sense for boot image and it is created empty anyway
 %define debug_package %{nil}
@@ -30,16 +28,11 @@ BuildRequires: appliance-tools >= 002-3
 The ISO boot image for oVirt Node booting from CDROM device.
 At the moment, this RPM just packages prebuilt ISO.
 
-%package pxe
-Summary: oVirt Node PXE image
-Group: Applications/System
-
-%description pxe
-The PXE boot image for oVirt Node network boot from oVirt Server.
-
 %prep
 %setup -q
+%if ! %{source_iso}
 ./configure
+%endif
 
 %build
 %if ! %{source_iso}
@@ -48,19 +41,11 @@ make %{?ovirt_cache_dir: OVIRT_CACHE_DIR=%{ovirt_cache_dir}} \
      %{?ovirt_url: OVIRT_URL=%{ovirt_url}} \
      %{name}.iso
 %endif
-sudo su - -c "cd $(pwd) && ./ovirt-pxe %{image_iso}"
-sudo su - -c "cd $(pwd) && chown -R $USER ."
 
 %install
 %{__rm} -rf %{buildroot}
 mkdir %{buildroot}
 
-%{__install} -d -m0755 %{buildroot}%{tftpboot}
-%{__install} -d -m0755 %{buildroot}%{tftpboot}/pxelinux.cfg
-%{__install} -p -m0644 tftpboot/pxelinux.cfg/default %{buildroot}%{tftpboot}/pxelinux.cfg/default
-%{__install} -p -m0644 tftpboot/pxelinux.0 %{buildroot}%{tftpboot}
-%{__install} -p -m0644 tftpboot/initrd0.img %{buildroot}%{tftpboot}
-%{__install} -p -m0644 tftpboot/vmlinuz0 %{buildroot}%{tftpboot}
 %{__install} -d -m0755 %{buildroot}%{app_root}
 %{__install} -p -m0644 %{image_iso} %{buildroot}%{app_root}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
@@ -74,9 +59,6 @@ mkdir %{buildroot}
 %clean
 %{__rm} -rf %{buildroot}
 
-%post pxe
-cobbler sync > /dev/null 2>&1 || :
-
 %files
 %defattr(-,root,root,0644)
 %{app_root}/%{name}.iso
@@ -88,13 +70,6 @@ cobbler sync > /dev/null 2>&1 || :
 %{_sbindir}/edit-livecd
 %{_sbindir}/livecd-setauth
 
-%files pxe
-%defattr(-,root,root,0644)
-%config(noreplace) %{tftpboot}/pxelinux.cfg/default
-%{tftpboot}/pxelinux.0
-%{tftpboot}/initrd0.img
-%{tftpboot}/vmlinuz0
-
 %changelog
 * Thu Jul 03 2008 Perry Myers <pmyers at redhat.com> 0.92-0
 - Only store ISO in SRPM, and generate PXE from that during build
-- 
1.6.0.3