From 5323da2528d2c4de0048a9391821266ab6674dec Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 20 Sep 2017 13:37:59 -0400 Subject: [PATCH 1/8] Include the modular server templates Signed-off-by: Stephen Gallagher --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f4b58c3..034632e 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ /lorax-27.8.tar.gz /lorax-27.9.tar.gz /lorax-27.10.tar.gz +/lorax-templates-gitdcac902.tar.gz diff --git a/lorax.spec b/lorax.spec index 6a6431f..fe6a231 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 27.10 -Release: 1%{?dist} +Release: boltron.3%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -16,6 +16,12 @@ URL: https://github.com/rhinstaller/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Boltron templates +# Generated from: +# git clone https://github.com/fedora-modularity/lorax-templates +# git archive --prefix=templates.d/00-boltron/ --format=tgz -o lorax-templates-gitdcac902.tar.gz dcac902 +Source1: lorax-templates-gitdcac902.tar.gz + BuildRequires: python3-devel Requires: lorax-templates @@ -120,6 +126,8 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +rm -rf share/templates.d +tar xvf %{SOURCE1} -C share %build @@ -152,6 +160,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Wed Sep 20 2017 Stephen Gallagher - 27.10-boltron.3 +- Include the modular server templates + * Mon Sep 18 2017 Brian C. Lane 27.10-1 - Restore all of the grub2-tools on x86_64 and i386 (#1492197) (bcl@redhat.com) diff --git a/sources b/sources index a7b39ba..0aef19d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (lorax-27.10.tar.gz) = a6caead1e2ad3e09d151fedea66e37ce1a73a77a5bbdd137e176a6085d59ff0457a6625562720c604d7ad557f995f827164e259b91ced3d5baddbddc2c0679dc +SHA512 (lorax-templates-gitdcac902.tar.gz) = 2d0749eec8ee4820abc8fc54a392324b2214d2249468a22594fe8fbadbce75f5167319626f9c481226dc5003ffe31d96c8d928d39590ca3515f1830cadc7ca64 From a52dfc677dbd733f2775a8745ed7fa4002e8a07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 22 Sep 2017 18:04:23 +0200 Subject: [PATCH 2/8] Updating the templates to install all dracut modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- .gitignore | 1 + lorax.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 034632e..8f9cda9 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ /lorax-27.9.tar.gz /lorax-27.10.tar.gz /lorax-templates-gitdcac902.tar.gz +/lorax-templates-git619e686.tar.gz diff --git a/lorax.spec b/lorax.spec index fe6a231..788ee04 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 27.10 -Release: boltron.3%{?dist} +Release: boltron.4%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -19,8 +19,9 @@ Source0: %{name}-%{version}.tar.gz # Boltron templates # Generated from: # git clone https://github.com/fedora-modularity/lorax-templates -# git archive --prefix=templates.d/00-boltron/ --format=tgz -o lorax-templates-gitdcac902.tar.gz dcac902 -Source1: lorax-templates-gitdcac902.tar.gz +# git archive --prefix=templates.d/00-boltron/ --format=tgz -o +# lorax-templates-git619e686.tar.gz 619e686 +Source1: lorax-templates-git619e686.tar.gz BuildRequires: python3-devel @@ -160,6 +161,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Fri Sep 22 2017 Petr Šabata - 27.10-boltron.4 +- Updating the templates to install dracut modules + * Wed Sep 20 2017 Stephen Gallagher - 27.10-boltron.3 - Include the modular server templates diff --git a/sources b/sources index 0aef19d..7dd0a32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (lorax-27.10.tar.gz) = a6caead1e2ad3e09d151fedea66e37ce1a73a77a5bbdd137e176a6085d59ff0457a6625562720c604d7ad557f995f827164e259b91ced3d5baddbddc2c0679dc -SHA512 (lorax-templates-gitdcac902.tar.gz) = 2d0749eec8ee4820abc8fc54a392324b2214d2249468a22594fe8fbadbce75f5167319626f9c481226dc5003ffe31d96c8d928d39590ca3515f1830cadc7ca64 +SHA512 (lorax-templates-git619e686.tar.gz) = c4d89bc2f5a58f3fd199b8bca1cf8f05747761cef1cc8d8c04875023da99b18ff1e4f803722db12bd513a80f238941e2d003e4fd736a03c90042d49a769a78d4 From cc53b84c4b416836025b4374876783c58b8a6467 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 26 Sep 2017 22:41:30 -0400 Subject: [PATCH 3/8] Don't remove libmenu.so library during cleanup on PowerPC Signed-off-by: Stephen Gallagher --- .gitignore | 1 + lorax.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f9cda9..9ffa07e 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ /lorax-27.10.tar.gz /lorax-templates-gitdcac902.tar.gz /lorax-templates-git619e686.tar.gz +/lorax-templates-git4e7dd97.tar.gz diff --git a/lorax.spec b/lorax.spec index 788ee04..d9c097f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 27.10 -Release: boltron.4%{?dist} +Release: boltron.5%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -17,11 +17,11 @@ URL: https://github.com/rhinstaller/lorax Source0: %{name}-%{version}.tar.gz # Boltron templates +%define boltron_commit 4e7dd97 # Generated from: # git clone https://github.com/fedora-modularity/lorax-templates -# git archive --prefix=templates.d/00-boltron/ --format=tgz -o -# lorax-templates-git619e686.tar.gz 619e686 -Source1: lorax-templates-git619e686.tar.gz +# git archive --prefix=templates.d/00-boltron/ --format=tgz -o lorax-templates-git%{boltron_commit}.tar.gz %{boltron_commit} +Source1: lorax-templates-git%{boltron_commit}.tar.gz BuildRequires: python3-devel @@ -161,6 +161,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Tue Sep 26 2017 Stephen Gallagher - 27.10-boltron.5 +- Don't remove libmenu.so library during cleanup on PowerPC + * Fri Sep 22 2017 Petr Šabata - 27.10-boltron.4 - Updating the templates to install dracut modules diff --git a/sources b/sources index 7dd0a32..800b33e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (lorax-templates-git4e7dd97.tar.gz) = 73d8b4d04f1e22fd1467508fb1883bfe6e1f0fb4354c4f3c4052ccb398ef554927c0efcaf296aa860f46bb1113efbbec1958250a8775db5c3bc43cdc76e77731 SHA512 (lorax-27.10.tar.gz) = a6caead1e2ad3e09d151fedea66e37ce1a73a77a5bbdd137e176a6085d59ff0457a6625562720c604d7ad557f995f827164e259b91ced3d5baddbddc2c0679dc -SHA512 (lorax-templates-git619e686.tar.gz) = c4d89bc2f5a58f3fd199b8bca1cf8f05747761cef1cc8d8c04875023da99b18ff1e4f803722db12bd513a80f238941e2d003e4fd736a03c90042d49a769a78d4 From 255459586bc710c1854b6e76b72be0efe9b97e18 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 19 Oct 2017 13:45:46 -0400 Subject: [PATCH 4/8] Add fix for s390 --- .gitignore | 2 ++ lorax.spec | 3 ++- sources | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9ffa07e..b51b3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,5 @@ /lorax-templates-gitdcac902.tar.gz /lorax-templates-git619e686.tar.gz /lorax-templates-git4e7dd97.tar.gz +/lorax-27.11.tar.gz +/lorax-templates-gitd580bf2.tar.gz diff --git a/lorax.spec b/lorax.spec index ab725d3..c7e89a2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -17,7 +17,7 @@ URL: https://github.com/rhinstaller/lorax Source0: %{name}-%{version}.tar.gz # Boltron templates -%define boltron_commit 4e7dd97 +%define boltron_commit d580bf2 # Generated from: # git clone https://github.com/fedora-modularity/lorax-templates # git archive --prefix=templates.d/00-boltron/ --format=tgz -o lorax-templates-git%{boltron_commit}.tar.gz %{boltron_commit} @@ -164,6 +164,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog * Thu Oct 19 2017 Stephen Gallagher - 27.11-boltron.6 - Rebase to 27.11 +- Backport fix for s390 * Wed Sep 27 2017 Brian C. Lane 27.11-1 - s390 doesn't need to graft product.img and updates.img into /images (#1496461) (bcl@redhat.com) diff --git a/sources b/sources index 1a1468d..2153ae3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (lorax-templates-git4e7dd97.tar.gz) = 73d8b4d04f1e22fd1467508fb1883bfe6e1f0fb4354c4f3c4052ccb398ef554927c0efcaf296aa860f46bb1113efbbec1958250a8775db5c3bc43cdc76e77731 SHA512 (lorax-27.11.tar.gz) = e008daf6ef44ece0b7c65a5854b447c74a7cadbf5734ede3ef2fb9e435cf216181aaf34130cc35fb1bf2788d64b21f3fb72c07fb1ad28558966c22a483ca5d6d +SHA512 (lorax-templates-gitd580bf2.tar.gz) = 870efad370efeb81170308a6c86a124d4e84726bac3eecc1638b7236e616aadae89931a9412cf4f3e7174844164e6ab4967107a45652326bb1a5c07d77060967 From b0153769011b323ec7dba43dc2de468a971f59e3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 20 Oct 2017 13:17:47 -0400 Subject: [PATCH 5/8] Merge in all template changes from F27 branch --- .gitignore | 1 + lorax.spec | 25 ++++++++++--------------- sources | 3 +-- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index b51b3ad..2d475b3 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ /lorax-templates-git4e7dd97.tar.gz /lorax-27.11.tar.gz /lorax-templates-gitd580bf2.tar.gz +/lorax-27.11.boltron.7.tar.gz diff --git a/lorax.spec b/lorax.spec index c7e89a2..df6d4ef 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,27 +1,21 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} +%define boltron_version boltron.7 Name: lorax Version: 27.11 -Release: boltron.6%{?dist} +Release: %{boltron_version}%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System License: GPLv2+ URL: https://github.com/rhinstaller/lorax -# To generate Source0 do: -# git clone https://github.com/rhinstaller/lorax -# git checkout -b archive-branch lorax-%%{version}-%%{release} -# tito build --tgz -Source0: %{name}-%{version}.tar.gz - -# Boltron templates -%define boltron_commit d580bf2 # Generated from: -# git clone https://github.com/fedora-modularity/lorax-templates -# git archive --prefix=templates.d/00-boltron/ --format=tgz -o lorax-templates-git%{boltron_commit}.tar.gz %{boltron_commit} -Source1: lorax-templates-git%{boltron_commit}.tar.gz +# git clone https://github.com/fedora-modularity/lorax +# git checkout -b archive-branch lorax-27.11.boltron.7-1 +# make archive +Source0: %{name}-%{version}.%{boltron_version}.tar.gz BuildRequires: python3-devel @@ -126,9 +120,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%setup -q -n %{name}-%{version} -rm -rf share/templates.d -tar xvf %{SOURCE1} -C share +%setup -q -n %{name}-%{version}.%{boltron_version} %build @@ -162,6 +154,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Fri Oct 20 2017 Stephen Gallagher - 27.11-boltron.7 +- Merge in all template changes from F27 branch + * Thu Oct 19 2017 Stephen Gallagher - 27.11-boltron.6 - Rebase to 27.11 - Backport fix for s390 diff --git a/sources b/sources index 2153ae3..ff5973e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (lorax-27.11.tar.gz) = e008daf6ef44ece0b7c65a5854b447c74a7cadbf5734ede3ef2fb9e435cf216181aaf34130cc35fb1bf2788d64b21f3fb72c07fb1ad28558966c22a483ca5d6d -SHA512 (lorax-templates-gitd580bf2.tar.gz) = 870efad370efeb81170308a6c86a124d4e84726bac3eecc1638b7236e616aadae89931a9412cf4f3e7174844164e6ab4967107a45652326bb1a5c07d77060967 +SHA512 (lorax-27.11.boltron.7.tar.gz) = fe2ba11654a442bc2297663610ee27790f9cdce491da9ce6d75db267e2cd169edc54eacf1ddc506627ed2f9ccdbb6930036a9e7822f5e716bd0aad39849c6d8f From 375bdd9f7468bec9d1d7b95ad742f999203e96e4 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 23 Oct 2017 15:51:52 -0400 Subject: [PATCH 6/8] Add support for graphical anaconda Reduce the diff from upstream templates --- .gitignore | 1 + lorax.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d475b3..d47bec0 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ /lorax-27.11.tar.gz /lorax-templates-gitd580bf2.tar.gz /lorax-27.11.boltron.7.tar.gz +/lorax-27.11.boltron.8.tar.gz diff --git a/lorax.spec b/lorax.spec index df6d4ef..6925695 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,7 +1,7 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} -%define boltron_version boltron.7 +%define boltron_version boltron.8 Name: lorax Version: 27.11 @@ -13,7 +13,7 @@ License: GPLv2+ URL: https://github.com/rhinstaller/lorax # Generated from: # git clone https://github.com/fedora-modularity/lorax -# git checkout -b archive-branch lorax-27.11.boltron.7-1 +# git checkout -b archive-branch lorax-27.11.boltron.8-1 # make archive Source0: %{name}-%{version}.%{boltron_version}.tar.gz @@ -154,6 +154,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Mon Oct 23 2017 Stephen Gallagher - 27.11-boltron.8 +- Add support for graphical anaconda +- Reduce the diff from upstream templates + * Fri Oct 20 2017 Stephen Gallagher - 27.11-boltron.7 - Merge in all template changes from F27 branch diff --git a/sources b/sources index ff5973e..271763f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-27.11.boltron.7.tar.gz) = fe2ba11654a442bc2297663610ee27790f9cdce491da9ce6d75db267e2cd169edc54eacf1ddc506627ed2f9ccdbb6930036a9e7822f5e716bd0aad39849c6d8f +SHA512 (lorax-27.11.boltron.8.tar.gz) = 0e74b93faec02e0b3ed424edc4083164482aed8c54df9bd20387eef0f2b0e202f9f397e053f998a2cba27066975eec6aa2a124ef9d6c69c403eb3146d2f65ede From 7a22a385d383dd6e5fa7ca8775381fca97041ec5 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 24 Oct 2017 16:14:49 -0400 Subject: [PATCH 7/8] Make some things optional that we don't have yet --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d47bec0..0f4ec64 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ /lorax-templates-gitd580bf2.tar.gz /lorax-27.11.boltron.7.tar.gz /lorax-27.11.boltron.8.tar.gz +/lorax-27.11.boltron.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 6925695..5342266 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,7 +1,7 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} -%define boltron_version boltron.8 +%define boltron_version boltron.9 Name: lorax Version: 27.11 @@ -154,6 +154,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Tue Oct 24 2017 Stephen Gallagher - 27.11-boltron.9 +- Make some things optional that we don't have yet + * Mon Oct 23 2017 Stephen Gallagher - 27.11-boltron.8 - Add support for graphical anaconda - Reduce the diff from upstream templates diff --git a/sources b/sources index 271763f..e66d5ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-27.11.boltron.8.tar.gz) = 0e74b93faec02e0b3ed424edc4083164482aed8c54df9bd20387eef0f2b0e202f9f397e053f998a2cba27066975eec6aa2a124ef9d6c69c403eb3146d2f65ede +SHA512 (lorax-27.11.boltron.9.tar.gz) = 3eef7157388ae5270cee02497f3fce69970fe851b16f9693d87e3543c4e8e00b4d65dd94cab2740fae2e4aba0cc3fea7689491f30bb390ace4ccdaaca9613494 From d743d7850273a5f9ea4c94a3c41d147717491da2 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 26 Oct 2017 13:17:22 -0400 Subject: [PATCH 8/8] Add spice-vdagent --- .gitignore | 1 + lorax.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0f4ec64..0f05500 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ /lorax-27.11.boltron.7.tar.gz /lorax-27.11.boltron.8.tar.gz /lorax-27.11.boltron.9.tar.gz +/lorax-27.11.boltron.10.tar.gz diff --git a/lorax.spec b/lorax.spec index 5342266..84222ba 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,7 +1,7 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} -%define boltron_version boltron.9 +%define boltron_version boltron.10 Name: lorax Version: 27.11 @@ -13,7 +13,7 @@ License: GPLv2+ URL: https://github.com/rhinstaller/lorax # Generated from: # git clone https://github.com/fedora-modularity/lorax -# git checkout -b archive-branch lorax-27.11.boltron.8-1 +# git checkout -b archive-branch lorax-27.11.boltron.10-1 # make archive Source0: %{name}-%{version}.%{boltron_version}.tar.gz @@ -154,6 +154,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Thu Oct 26 2017 Stephen Gallagher - 27.11-boltron.10 +- Add spice-vdagent + * Tue Oct 24 2017 Stephen Gallagher - 27.11-boltron.9 - Make some things optional that we don't have yet diff --git a/sources b/sources index e66d5ae..497794e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-27.11.boltron.9.tar.gz) = 3eef7157388ae5270cee02497f3fce69970fe851b16f9693d87e3543c4e8e00b4d65dd94cab2740fae2e4aba0cc3fea7689491f30bb390ace4ccdaaca9613494 +SHA512 (lorax-27.11.boltron.10.tar.gz) = 687d57ab6f986dfd96b84e521bfd929826915119b6696aa3199dbe49e650a5a680ae99e89206006e6a259d0c327c6e57372fb44f88d8d2ea3be1bb3beae97102