From fece330bbb07e652d8917699ee20eb60ae1271c5 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 26 Dec 2014 14:02:20 -0600 Subject: [PATCH] initial import of pungi 3.0.12 to EPEL7 --- ...-Make-our-OS-iso-bootable-on-aarch64.patch | 29 +++++++++++++++++++ 0001-replace-tabs-with-spaces.patch | 29 +++++++++++++++++++ pungi.spec | 29 +++++++++---------- sources | 2 +- 4 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 0001-Make-our-OS-iso-bootable-on-aarch64.patch create mode 100644 0001-replace-tabs-with-spaces.patch diff --git a/0001-Make-our-OS-iso-bootable-on-aarch64.patch b/0001-Make-our-OS-iso-bootable-on-aarch64.patch new file mode 100644 index 00000000..988c4c46 --- /dev/null +++ b/0001-Make-our-OS-iso-bootable-on-aarch64.patch @@ -0,0 +1,29 @@ +From 33ebc4e11f88390a70e4f4b2c24725e8dc2ce741 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 9 Dec 2014 11:48:59 -0500 +Subject: [PATCH] Make our OS iso bootable on aarch64. + +Aarch64 needs to get the el torito image generation code x86 has for +UEFI as well. + +Signed-off-by: Peter Jones +--- + src/pypungi/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py +index 2211513..6a1d474 100644 +--- a/src/pypungi/__init__.py ++++ b/src/pypungi/__init__.py +@@ -1625,6 +1625,8 @@ class Pungi(pypungi.PungiBase): + elif self.tree_arch.startswith('ppc'): + extraargs.extend(ppcbootargs) + extraargs.append(os.path.join(self.topdir, "ppc/mac")) ++ elif self.tree_arch.startswith('aarch64'): ++ extraargs.extend(efibootargs) + + # NOTE: if this doesn't match what's in the bootloader config, the + # image won't be bootable! +-- +2.2.0 + diff --git a/0001-replace-tabs-with-spaces.patch b/0001-replace-tabs-with-spaces.patch new file mode 100644 index 00000000..0b5b4eb7 --- /dev/null +++ b/0001-replace-tabs-with-spaces.patch @@ -0,0 +1,29 @@ +From add538d7b42f50a08c66c0114dd3f021f0235fd8 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Fri, 19 Sep 2014 15:28:05 -0500 +Subject: [PATCH] replace tabs with spaces + +--- + src/bin/pungi.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pungi.py b/src/bin/pungi.py +index 2d1761e..aa831a6 100755 +--- a/src/bin/pungi.py ++++ b/src/bin/pungi.py +@@ -273,10 +273,10 @@ if __name__ == '__main__': + help="Flag to enable processing the BuildInstall stage") + parser.add_option("-I", action="store_true", default=False, dest="do_createiso", + help="Flag to enable processing the CreateISO stage") +- parser.add_option("--relnotepkgs", dest="relnotepkgs", type="string", ++ parser.add_option("--relnotepkgs", dest="relnotepkgs", type="string", + action="callback", callback=set_config, callback_args=(config, ), + help='Rpms which contain the release notes') +- parser.add_option("--relnotefilere", dest="relnotefilere", type="string", ++ parser.add_option("--relnotefilere", dest="relnotefilere", type="string", + action="callback", callback=set_config, callback_args=(config, ), + help='Which files are the release notes -- GPL EULA') + +-- +2.1.0 + diff --git a/pungi.spec b/pungi.spec index d9f4be28..be20b898 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,20 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 3.13 -Release: 1%{?dist} +Version: 3.12 +Release: 3%{?dist} Summary: Distribution compose tool Group: Development/Tools License: GPLv2 URL: https://fedorahosted.org/pungi Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 -Requires: createrepo >= 0.4.11 -Requires: yum => 3.4.3-28 -Requires: lorax >= 22.1 -Requires: repoview -Requires: python-lockfile - +Patch0: 0001-replace-tabs-with-spaces.patch +Patch1: 0001-Make-our-OS-iso-bootable-on-aarch64.patch +Requires: yum => 3.4.3-28, repoview, createrepo >= 0.4.11 +Requires: lorax, python-lockfile BuildRequires: python-devel BuildArch: noarch @@ -25,6 +23,8 @@ A tool to create anaconda based installation trees/isos of a set of rpms. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %{__python} setup.py build @@ -48,7 +48,9 @@ rm -rf $RPM_BUILD_ROOT %doc Authors Changelog COPYING GPL ToDo doc/README # For noarch packages: sitelib %{python_sitelib}/pypungi -%{python_sitelib}/%{name}-%{version}-py?.?.egg-info +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 + %{python_sitelib}/%{name}-%{version}-py?.?.egg-info +%endif %{_bindir}/pungi %{_datadir}/pungi %{_mandir}/man8/pungi.8.gz @@ -56,13 +58,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Dec 12 2014 Dennis Gilmore - 3.13-1 -- Add support for --installpkgs (bcl) -- Add a cmdline option to set the lorax config file (bcl) -- Add python-lockfile requires and drop python-devel (bcl) -- Make our OS iso bootable on aarch64. (pjones) -- fix up typo (dennis) -- replace tabs with spaces (dennis) +* Mon Dec 15 2014 Dennis Gilmore - 3.12-3 +- add patch to make the dvd bootable on aarch64 * Tue Sep 30 2014 Dennis Gilmore - 3.12-2 - add patch to fix whitespace errors diff --git a/sources b/sources index f8de28ab..38195d13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4609de9057defe74f33c803a2da166a1 pungi-3.13.tar.bz2 +864c411bc1294d88cb2b38f299f1974f pungi-3.12.tar.bz2