diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-10-16 10:33:29 -0400 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-16 10:33:29 -0400 |
| commit | e0edf470ccc37b38f1c1f67de9061fe6006eee32 (patch) | |
| tree | 468d55b7a61ed19d5aa9db4fa061bcdaf66f3245 | |
| parent | 0c3a21c1fb0c1fc8289a7c87b9c7f04ee9df350e (diff) | |
| download | third_party-cobbler-e0edf470ccc37b38f1c1f67de9061fe6006eee32.tar.gz third_party-cobbler-e0edf470ccc37b38f1c1f67de9061fe6006eee32.tar.xz third_party-cobbler-e0edf470ccc37b38f1c1f67de9061fe6006eee32.zip | |
Tru's patch to specfile & adding test fodder for import code.
5 files changed, 4 insertions, 4 deletions
diff --git a/cobbler.spec b/cobbler.spec index dd3ae12..43530e2 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -28,14 +28,14 @@ last two modes require 'koan' to be run on the remote system. %setup -q %build -python setup.py build +%{__python} setup.py build %install -rm -rf $RPM_BUILD_ROOT -python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT +test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT %clean -rm -rf $RPM_BUILD_ROOT +test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) diff --git a/tests/import_testdata/core/5/i386/os/images/pxeboot/initrd.img b/tests/import_testdata/core/5/i386/os/images/pxeboot/initrd.img new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/import_testdata/core/5/i386/os/images/pxeboot/initrd.img diff --git a/tests/import_testdata/core/5/i386/os/images/pxeboot/vmlinuz b/tests/import_testdata/core/5/i386/os/images/pxeboot/vmlinuz new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/import_testdata/core/5/i386/os/images/pxeboot/vmlinuz diff --git a/tests/import_testdata/core/5/i386/os/images/xen/initrd.img b/tests/import_testdata/core/5/i386/os/images/xen/initrd.img new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/import_testdata/core/5/i386/os/images/xen/initrd.img diff --git a/tests/import_testdata/core/5/i386/os/images/xen/vmlinuz b/tests/import_testdata/core/5/i386/os/images/xen/vmlinuz new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/import_testdata/core/5/i386/os/images/xen/vmlinuz |