diff --git a/Makefile b/Makefile index c7ab376..63bdf7e 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ FIRSTBOOT_VERSION := $(call spec_version,firstboot/firstboot.spec) QBSLOGOS_VERSION := $(call spec_version,qubes-logos/qubes-logos.spec) QBSRELEASE_VERSION := $(call spec_version,qubes-release/qubes-release.spec) LORAXQBS_VERSION := $(call spec_version,lorax-templates-qubes/lorax-templates-qubes.spec) +PUNGI_VERSION := $(call spec_version,pungi/pungi.spec) +PYKICKSTART_VERSION := $(call spec_version,pykickstart/pykickstart.spec) PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages ifdef QUBES_RELEASE @@ -61,9 +63,10 @@ help: exit 0; .PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_lorax \ + rpms_pungi rpms_pykickstart \ update-repo update-repo-testing clean iso -rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_lorax +rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_lorax rpms_pungi rpms_pykickstart rpm --addsign `ls -d rpm/x86_64/*.rpm rpm/i686/*.rpm rpm/noarch/*.rpm 2>/dev/null` rpms-dom0: rpms @@ -91,6 +94,12 @@ rpms_anaconda: rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2 rpms_lorax: rpm/SOURCES/lorax-templates-qubes-$(LORAXQBS_VERSION).tar.bz2 rpmbuild $(RPMBUILD_DEFINES) -bb lorax-templates-qubes/lorax-templates-qubes.spec +rpms_pungi: pungi/pungi-$(PUNGI_VERSION).tar.bz2 pungi/pungi.spec + rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/pungi" -bb pungi/pungi.spec + +rpms_pykickstart: pykickstart/pykickstart-$(PYKICKSTART_VERSION).tar.gz pykickstart/pykickstart.spec + rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/pykickstart" -bb pykickstart/pykickstart.spec + rpms_firstboot: rpm/SOURCES/firstboot-$(FIRSTBOOT_VERSION).tar.bz2 rpmbuild $(RPMBUILD_DEFINES) -bb firstboot/firstboot.spec @@ -104,6 +113,8 @@ RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/qubes-release-notes-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/lorax-templates-qubes-$(LORAXQBS_VERSION)-*.rpm \ + rpm/noarch/pungi-$(PUNGI_VERSION)-*.rpm \ + rpm/noarch/pykickstart-$(PYKICKSTART_VERSION)-*.rpm \ rpm/noarch/anaconda*-$(ANACONDA_VERSION)-*.rpm \ rpm/x86_64/anaconda*-$(ANACONDA_VERSION)-*.rpm \ rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm diff --git a/pungi/pungi-2.13.tar.bz2 b/pungi/pungi-2.13.tar.bz2 new file mode 100644 index 0000000..8fee39b Binary files /dev/null and b/pungi/pungi-2.13.tar.bz2 differ diff --git a/pungi/pungi.spec b/pungi/pungi.spec new file mode 100644 index 0000000..64e5343 --- /dev/null +++ b/pungi/pungi.spec @@ -0,0 +1,551 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: pungi +Version: 2.13 +Release: 1.2%{?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 +Patch0: support-verify-downloaded-packages.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11 +Requires: lorax +BuildRequires: python-devel + +BuildArch: noarch + +%description +A tool to create anaconda based installation trees/isos of a set of rpms. + + +%prep +%setup -q + +%patch0 -p1 + +%build +%{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__install} -d $RPM_BUILD_ROOT/var/cache/pungi +%{__install} -d $RPM_BUILD_ROOT/%{_mandir}/man8 +%{__install} doc/pungi.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +%{__mv} $RPM_BUILD_ROOT/%{_bindir}/pungi.py $RPM_BUILD_ROOT/%{_bindir}/pungi + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc Authors Changelog COPYING GPL ToDo doc/README +# For noarch packages: sitelib +%{python_sitelib}/pypungi +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 + %{python_sitelib}/%{name}-%{version}-py?.?.egg-info +%endif +%{_bindir}/pungi +%{_datadir}/pungi +%{_mandir}/man8/pungi.8.gz +/var/cache/pungi + + +%changelog +* Fri Dec 21 2012 Dennis Gilmore - 2.13-1 +- strip groups from comps not listed in the kickstart +- fix ppc64 runtime installation (#888887) +- dont make isos on arm +- include ppc64 checksums (#888517) + +* Fri Aug 31 2012 Dennis Gilmore - 2.12-1 +- ppc64p7 support +- update locations for ppc files for image composition bz#849731 +- add 32 bit arm arches + +* Sat Jul 21 2012 Fedora Release Engineering - 2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Dennis Gilmore - 2.11-2 +- add patch for bz#816315 + +* Mon Apr 16 2012 Dennis Gilmore - 2.11-1 +- upstream 2.11 release + +* Thu Feb 09 2012 Dennis Gilmore - 2.10-1 +- drop all the patches merged into upstream 2.10 release + +* Thu Feb 09 2012 Dennis Gilmore - 2.9-3 +- hash the Packages dir for consistency between Fedora and Everything trees + +* Tue Jan 31 2012 Dennis Gilmore - 2.9-2 +- add patch from will woods for yaboot on ppc + +* Mon Jan 30 2012 Dennis Gilmore - 2.9-1 +- pass isfinal rather than is_beta to lorax + +* Sat Jan 14 2012 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Oct 27 2011 Will Woods - 2.8-2 +- Fix DVD builds for ppc/ppc64 +- Use a consistent ISO label so the bootloader will work (#732298) + +* Mon Jul 18 2011 Jesse Keating - 2.8-1 +- Always re-init the yum object (#717089) + +* Mon May 16 2011 Dennis Gilmore - 2.7-1 +- add --isfinal for turning off the betanag + +* Fri Apr 29 2011 Jesse Keating - 2.6-1 +- Make sure lorax makes use of our gathered repo + +* Wed Jan 12 2011 Jesse Keating - 2.5-1 +- Use Lorax instead of buildinstall (mgracik) + +* Tue Dec 21 2010 Jesse Keating - 2.4-1 +- Enable EFI booting on x86_64 media + +* Mon Nov 15 2010 Jesse Keating - 2.3-1 +- Drop split-media support + +* Thu Oct 14 2010 Jesse Keating - 2.1.4-1 +- Further fix the pkgorder issue + +* Wed Oct 13 2010 Jesse Keating - 2.1.3-1 +- Fix a pkgorder issue + +* Tue Jun 29 2010 Jesse Keating - 2.1.2-1 +- Fix a yumconf traceback (thanks James!) + +* Fri Jun 04 2010 Jesse Keating - 2.1.1-1 +- Don't do multilib gathering. +- fixes --force when compose fails during split-tree process. (npetrov) +- fix pkgorder (npetrov) + +* Wed Apr 14 2010 Jesse Keating - 2.1.0-1 +- Update paths for new anaconda layout +- Drop hints about checksum type +- Add proxy support from the repo line in the kickstart file +- Catch all kernel packages + +* Tue Sep 15 2009 Jesse Keating - 2.0.20-1 +- One more upstream pkgorder fix + +* Tue Sep 15 2009 Jesse Keating - 2.0.19-1 +- More upstream fixes for pkgorder and selfhosting composes + +* Mon Sep 14 2009 Jesse Keating - 2.0.18-1 +- Search for dracut for pkgorder + +* Mon Aug 10 2009 Jesse Keating - 2.0.17-1 +- Fix pkgorder to not conflict with yum internals. +- Remove dead code from splittree + +* Thu May 21 2009 Jesse Keating - 2.0.16-1 +- Fix boot.iso being on DVD images + +* Tue May 19 2009 Jesse Keating - 2.0.15-1 +- Split media on demand rather than via guess work. + +* Mon Apr 13 2009 Jesse Keating - 2.0.14-1 +- Fix package excludes in kickstart files +- Correctly account for ppc bootable isofs overhead +- Wire in support for composing 'full' trees with all subpackages + +* Tue Mar 24 2009 Jesse Keating - 2.0.13-1 +- Add online-docs to pkgorder + +* Wed Mar 11 2009 Jesse Keating - 2.0.12-1 +- Update for yum API change + +* Mon Mar 09 2009 Jesse Keating - 2.0.11-1 +- Fix size estimation in splittree +- Disable arch test in splittree for now + +* Wed Feb 11 2009 Jesse Keating - 2.0.10-1 +- Fix CD1 overflow issue +- Name the checksum file after the isos being generated. +- Use sha256 for checksums +- Use unique md file names for repodata. +- Do not include boot.iso on any disc +- Add the packages that anaconda forces to be installed into the pkgorder + +* Thu Dec 04 2008 Jesse Keating - 2.0.9-1 +- Fix for python-2.6 ('default' is no longer a valid config section) +- Fix splitting srpms + +* Tue Nov 4 2008 Jesse Keating - 2.0.8-1 +- Set default disc size to 695 + +* Tue Nov 4 2008 Jesse Keating - 2.0.7-1 +- Fix splittree to actually use the iso size defined in kickstarts +- Use https url for bugzilla by default. + +* Thu Oct 09 2008 Jesse Keating - 2.0.6-1 +- Handle %packages --default to pick up the default groups. +- Set iso name to be the same as --name +- Make sure we don't include the 'sha1:' in the iso SHA1SUM file. +- Fix .treeinfo to have proper case in file names + +* Thu Sep 11 2008 Jesse Keating - 2.0.5-1 +- Add input-methods to pkgorder. It's a new group, need to get ordering right. +- Make sure we output sha1sums in binary mode. This helps windows. +- Yum api changed, follow so that we don't break. + +* Mon Aug 11 2008 Jesse Keating 2.0.4-1 +- Remove unused discs option +- Don't try to make debuginfo repo for source arch +- Change the checksum output for images checksumming +- Get ppc boot images in checksum list +- Only get repodata and init yum object when needed +- Fix path issues in info files + +* Tue Jul 15 2008 Jesse Keating 2.0.3-1 +- Checksum various files from buildinstall output and put them in .treeinfo +- Use new hashsum utility to generate sha1sums + +* Fri Jul 11 2008 Jesse Keating 2.0.2-1 +- add ability to gather debuginfo. It is default. + +* Tue Jun 24 2008 Jesse Keating - 2.0.1-1 +- Take on splittree and pkgorder from anaconda. + +* Fri Jun 13 2008 Jesse Keating - 2.0.0-1 +- New major release +- Collapse the two classes into one Pungi class +- Create a pypungi.util module for utility functions +- Pass along repos/mirrorlists configured in ks file to buildinstall +- Repo cost is now "cost" in pykickstart + +* Tue May 06 2008 Jesse Keating - 1.2.18-1 +- Manifest change for F9, drop syslog-ng + +* Thu May 01 2008 Jesse Keating - 1.2.17-1 +- Add a config file for Fedora 9. + +* Wed Apr 16 2008 jkeating 1.2.16-1 +- Fix another issue with source repo stuff. + +* Wed Apr 16 2008 jkeating 1.2.15-1 +- Disable comps cleanup until xslt is fixed +- Add support for yum repo costs +- Adjust manifest for Fedora 9 (kernels, languages, flash) + +* Mon Apr 08 2008 Jesse Keating - 1.2.14-1 +- Create repodata for source. +- Fix SRPM splittree making +- Bump anaconda require up for fixed splittree + +* Tue Apr 01 2008 Jesse Keating - 1.2.13-1 +- Use the yum api for merging comps. + +* Fri Mar 14 2008 Jesse Keating - 1.2.12-1 +- Fix source isos +- Send the right options to buildinstall + +* Wed Mar 12 2008 Jesse Keating - 1.2.11-1 +- Make CDs fit again. + +* Tue Mar 11 2008 Jesse Keating - 1.2.10-1 +- Handle netinst.iso being renamed to boot.iso + +* Wed Mar 05 2008 Jesse Keating - 1.2.9-1 +- Fix ppc split iso generation +- Exclude repoview from isos + +* Fri Jan 25 2008 jkeating 1.2.8-1 +- Put createrepo arguments in correct order +- Fix comps mashup to be more lenient with the open/close of 1.2.7-1 +- Rework how repodata gets generated for media. +- use createrepo api + +* Wed Jan 2 2008 jkeating 1.2.6-1 +- Update the url field for new hosted urls. +- Add k3b to the Fedora manifest. + +* Mon Dec 10 2007 Jesse Keating 1.2.4-1 +- Remove extra files from tarball + +* Mon Dec 10 2007 Jesse Keating 1.2.3-1 +- Use a repoview cache. +- Use a createrepo cache. +- Change path to isomd5sum +- Add egg file to spec + +* Tue Dec 4 2007 Jesse Keating 1.2.0-1 +- Make logged output reusable in shell +- Default to making split media of CD size +- Enable repo includes/excludes. +- Put a constraint on flavor values +- Check for selinux enforcing and warn. +- Add a --force option to reuse an existing destdir +- Only check for root if you're doing root level tasks (buildinstall) +- Figure out number of isos on the fly, based on tree size +- Remove -S -P options, as splittree and packageorder are now +called from createIsos, if needed. +- Use downloadPkgs() from yum instead of a homebrew download function. +- Add a callback to show download progress + +* Thu Nov 22 2007 Jesse Keating - 1.1.10-1 +- Print a usage if no options are passed +- Correct a man page typo +- Update the F8 config to use released repos + +* Mon Oct 29 2007 Jesse Keating - 1.1.9-1 +- Remove oversized cached packages (fixes reget problem) + +* Sat Oct 27 2007 Jesse Keating - 1.1.8-1 +- Add eclipse group. + +* Tue Oct 23 2007 Jesse Keating - 1.1.7-1 +- Add java-development to the group set. + +* Fri Oct 19 2007 Jesse Keating - 1.1.6-1 +- Update the manifest + +* Thu Oct 11 2007 Jesse Keating - 1.1.5-1 +- Add a cost to the media repo + +* Tue Oct 02 2007 Jesse Keating - 1.1.4-1 +- Make sure we use strings in the config object + +* Wed Sep 26 2007 Jesse Keating - 1.1.3-1 +- Pull in all the optional Virt stuff +- Don't expire the metadata from Media repo. + +* Tue Sep 25 2007 Jesse Keating - 1.1.2-1 +- Fix location of media.repo file. + +* Tue Sep 18 2007 Jesse Keating - 1.1.1-1 +- Create a media.repo file on the first iso + +* Fri Sep 14 2007 Jesse Keating - 1.1.0-1 +- Create repoview content in the tree +- Move the .composeinfo file into the directory we actually publish +- Remove python2.5 needs (Mark McLoughlin) +- Consolidate the download code for easier maint. (Mark McLoughlin) +- Create a config class that can make using pungi modules easier. (Mark +McLoughlin) +- Use url line in kickstart files as a repo +- Fix a bug with default dest dir (notting) +- Include a man page (dcantrell) +- Fix a bug with file:// based repos + +* Thu Aug 30 2007 Jesse Keating - 1.0.2-1 +- Fix some bugs with source iso creation +- Add source repo to kickstart file +- Add %end to %packages in kickstart file + +* Tue Aug 28 2007 Jesse Keating - 1.0.1-1 +- Default flavor to blank. + +* Mon Aug 27 2007 Jesse Keating - 1.0.0-2 +- Fix the licensing tag. + +* Mon Aug 27 2007 Jesse Keating - 1.0.0-1 +- Add support for $releasever in repo uris. +- Add a kickstart file usable for composing Fedora 8 "Fedora" +- Fix bugs with $basearch and mirrorlist usage. +- Add a cache dir for pungi (/var/cache/pungi) and a cli option to override +- Add root check. +- Use a kickstart file as input now (for cdsize and package manifest) +- Remove a lot of configurable items and hard set them +- Move some items to cli flags only (part of moving to pykickstart) +- hard set product_path to 'Packages' +- Use group metadata from repos instead of our own comps file +- Get group files out of configured repos and create a mashup + of the comps. Filter it and make use of it when creating repos. +- Quiet down creatrepo calls +- Adjust logging to make use of new facility, use right levels +- Drop a note when all done with composing + +* Tue Aug 21 2007 Jesse Keating - 0.5.0-1 +- Rework how source rpms are pulled in + Always pull in 'src' arch packages, just filter them + when not needed. Saves having to reset or create new + yum objects. +- Create a base pungi class that sets logging +- Inherit this class in Gather and Pungi +- Adjust logging to make use of new facility, use right levels +- Drop a note when all done with composing +- Make Gather() no longer a subclass of yum +- Be verbose about what we clean (makefile) +- Create a subclass of yum to work around logging fun + +* Wed Aug 01 2007 Jesse Keating - 0.4.1-1 +- Create a new yum object for source downloads as yum + +* Sat Jul 28 2007 Jesse Keating - 0.4.0-1 +- split createrepo call to it's own function. This enables rawhide + composes to happen once again. Also breaks API. +- When raising an error, print the error too + +* Tue Jul 24 2007 Jesse Keating - 0.3.9-1 +- Add a few more desktopy things to manifest +- Rename f7 files to f8; set up config files for f8test1 +- Don't quote things passed to mkisofs, not a shell +- Always log stdout before checking for stderr output +- Include memtest86+ in the "Fedora" manifest + +* Wed Jun 20 2007 Jesse Keating - 0.3.8-1 +- Only grab the newest of deps. +- Don't use flavor for a log file if no flavor set (Trac #48) +- Point to the right manifest file in pungi.conf +- Add a install target to make (Trac #37) +- Enable the source repo in yum configs (Trac #47) +- Use universal newlines in getting process output (Trac #44) +- Fix logging of broken deps (Trac #39) + +* Wed May 30 2007 Jesse Keating - 0.3.7-1 +- Handle the cdsize variable correctly +- More fixes for cached download stuff +- Fix default CD size storing +- Update comps file with what shipped for F7 + +* Fri May 25 2007 Jesse Keating - 0.3.6-1 +- Handle the cdsize variable correctly + +* Thu May 24 2007 Jesse Keating - 0.3.5-1 +- Use the right flavor in the Everything configs + +* Thu May 24 2007 Jesse Keating - 0.3.4-1 +- Use a package checksum to verify cached download + +* Wed May 23 2007 Jesse Keating - 0.3.3-1 +- Commit config files used for producing Fedora 7 +- Default pungi.conf file to using Fedora 7 stuff + +* Mon May 21 2007 Jesse Keating - 0.3.2-1 +- Don't quote ISO label, not running mkisofs in shell +- Apply sparc patches (spot) +- Fix cached downloads comparing correctly +- Shorten 'development' to 'devel' in default config, more space for mkisofs +- Handle config file missing better (jgranado) + +* Fri Apr 06 2007 Jesse Keating - 0.3.1-1 +- Fix comments in default config file + +* Mon Apr 02 2007 Jesse Keating - 0.3.0-1 +- Remove incompatible fc6 config files +- Update default config file with comments / new options +- Update comps file +- Enable source iso building again. +- Don't try a rescue if the script doesn't exist (prarit) +- Pass flavor off to buildinstall if it is set (wwoods) +- Fix a logic flaw in the depsolving loop +- Use yum's built in exclude handling +- Use yum's built in conditional handling for things from comps +- Do excludes before group handling. +- Get all potential matches for deps, let install time figure + the best one to use. +- Work around false positive 'unmatched' packages (globs are fun) +- Change how depsolving is done + - Get all potential matches for a dep, instead of our 'best' + our 'best' may not be the same as install time best. + - Remove anaconda code, use direct yum functions to get deps + - Use a True/False flag to depsolve instead of iterating over + a dict. + - Log what packages are being added for which reasons. +- Do things faster/smarter if we've only asked for one disc +- log the rpm2cpio stuff for release notes +- correctly capture errors from subprocess + +* Fri Mar 09 2007 Jesse Keating - 0.2.8-1 +- Call createrepo ourselves for the tree, not buildinstall's job +- Convert from commands to subprocess for things we call out +- Add kickstart %packages syntax support to package manifest +- Make the list we hand off to yum to search for as unique as we can + +* Wed Feb 28 2007 Jesse Keating - 0.2.7-1 +- Fix gathering of srpms (thanks skvidal) +- Update comps from F7 Test2 + +* Thu Feb 22 2007 Jesse Keating - 0.2.6-1 +- Don't use TMPDIR with buildinstall, it is broken + +* Wed Feb 21 2007 Jesse Keating - 0.2.5-1 +- Make use of anaconda's TMPDIR support +- Put yum tempdirs in the workdir +- Add a version option to cli arguments +- Make cdsize a config option + +* Thu Feb 15 2007 Jesse Keating - 0.2.4-1 +- Add support for globbing in manifest +- Add new Make targets (Essien Ita Essien) +- Add runtime flags for doing specific stages of the compose (Essien Ita Essien) +- Add ability to define destdir on the cli to override conf file +- Clean up optionparse stuff, print usage if arg list is too small +- Fix part of the patch from Essien +- Add Contributors to the Authors file +- Adjust the Makefile so that srpm doesn't cause a tag +- Merged changes from Will Woods + - Write out some tree description files + - Don't traceback on existing files in download area (not sure this will stay) +- Style fixed some stuff from Will +- Add logging patch from jbowes +- Various logging tweaks +- Use -d flag in createrepo for sqlite blobs +- Add pydoc stuff to various functions +- Support comments in the package manifest + +* Tue Feb 06 2007 Jesse Keating - 0.2.3-1 +- Be able to opt-out of a bugurl since buildinstall supports this +- Make isodir an object of pungi (wwoods) +- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug +- Don't use 'returnSimple' anymore, deprecated in yum api + +* Mon Jan 29 2007 Jesse Keating - 0.2.2-1 +- Update the comps file again from F7 +- Fix the ppc boot flags +- Clean up SRPM-disc junk +- add bugurl config option for anaconda betanag + +* Thu Jan 25 2007 Jesse Keating - 0.2.1-1 +- Add a "flavor" option (such as Desktop) +- Move packageorder file into workdir +- Update the comps file from F7 + +* Wed Jan 24 2007 Jesse Keating - 0.2.0-1 +- Now use a manifest to determine what to pull in, not comps itself +- Add a minimal-manifest for test composes +- Add current F7 comps file for test composes +- Use some anaconda code to depsolve, gets better (and more common) results +- Bump the iso size to what was used in FC6 +- Move splittree workdirs into work/ at the end of the run +- Remove our splittree for rawhide +- Remove old main() sections from pungi.py and gather.py +- Require yum 3.0.3 or newer +- Add rescueCD support + +* Wed Dec 13 2006 Jesse Keating - 0.1.2-1 +- Fix a bug in DVD repodata +- Add correct ppc boot args +- Set ppc arch correctly + +* Mon Dec 11 2006 Jesse Keating - 0.1.1-2 +- Need BR python-devel in rawhide + +* Mon Dec 11 2006 Jesse Keating - 0.1.1-1 +- Update to 0.1.1 +- Add ability to get srpms +- Add ability to get relnote files +- Use a config file system +- Clean up some docs +- Add config files for composing FC6 respins + +* Wed Nov 8 2006 Jesse Keating - 0.1.0-1 +- Initial spec diff --git a/pungi/support-verify-downloaded-packages.patch b/pungi/support-verify-downloaded-packages.patch new file mode 100644 index 0000000..08afa0d --- /dev/null +++ b/pungi/support-verify-downloaded-packages.patch @@ -0,0 +1,58 @@ +Handle "repo --gpgkey" in kickstart to verify downloaded packages + +Especially important for lorax - they will not verified in any way without +setting yum options here. + +Signed-off-by: Marek Marczykowski +Index: pungi-2.13/src/pypungi/__init__.py +=================================================================== +--- pungi-2.13.orig/src/pypungi/__init__.py ++++ pungi-2.13/src/pypungi/__init__.py +@@ -145,7 +145,7 @@ class Pungi(pypungi.PungiBase): + + def _add_yum_repo(self, name, url, mirrorlist=False, groups=True, + cost=1000, includepkgs=[], excludepkgs=[], +- proxy=None): ++ proxy=None, gpgkey=None): + """This function adds a repo to the yum object. + + name: Name of the repo +@@ -189,6 +189,10 @@ class Pungi(pypungi.PungiBase): + thisrepo.exclude = excludepkgs + thisrepo.includepkgs = includepkgs + thisrepo.cost = cost ++ if gpgkey: ++ thisrepo.gpgcheck = True ++ thisrepo.gpgkey = yum.parser.varReplace(gpgkey, ++ self.ayum.conf.yumvar) + # Yum doesn't like proxy being None + if proxy: + thisrepo.proxy = proxy +@@ -219,6 +223,7 @@ class Pungi(pypungi.PungiBase): + yumconf.installroot = os.path.join(self.workdir, 'yumroot') + yumconf.uid = os.geteuid() + yumconf.cache = 0 ++ yumconf.assumeyes = True + yumconf.failovermethod = 'priority' + yumvars = yum.config._getEnvVar() + yumvars['releasever'] = self.config.get('pungi', 'version') +@@ -277,7 +282,8 @@ class Pungi(pypungi.PungiBase): + cost=repo.cost, + includepkgs=repo.includepkgs, + excludepkgs=repo.excludepkgs, +- proxy=repo.proxy) ++ proxy=repo.proxy, ++ gpgkey=repo.gpgkey) + else: + self._add_yum_repo(repo.name, repo.baseurl, + mirrorlist=False, +@@ -285,7 +291,8 @@ class Pungi(pypungi.PungiBase): + cost=repo.cost, + includepkgs=repo.includepkgs, + excludepkgs=repo.excludepkgs, +- proxy=repo.proxy) ++ proxy=repo.proxy, ++ gpgkey=repo.gpgkey) + + self.logger.info('Getting sacks for arches %s' % arches) + self.ayum._getSacks(archlist=arches) diff --git a/pykickstart/pykickstart-1.99.22.tar.gz b/pykickstart/pykickstart-1.99.22.tar.gz new file mode 100644 index 0000000..dd7cc51 Binary files /dev/null and b/pykickstart/pykickstart-1.99.22.tar.gz differ diff --git a/pykickstart/pykickstart.spec b/pykickstart/pykickstart.spec new file mode 100644 index 0000000..b9a2ec0 --- /dev/null +++ b/pykickstart/pykickstart.spec @@ -0,0 +1,872 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Summary: A python library for manipulating kickstart files +Name: pykickstart +Url: http://fedoraproject.org/wiki/pykickstart +Version: 1.99.22 +Release: 1.2%{?dist} +# This is a Red Hat maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +Source0: %{name}-%{version}.tar.gz +Patch0: repo-gpgkey-option.patch + +License: GPLv2 +Group: System Environment/Libraries +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python-devel, gettext, python-setuptools-devel +BuildRequires: transifex-client +Requires: python, python-urlgrabber + +%description +The pykickstart package is a python library for manipulating kickstart +files. + +%prep +%setup -q + +%patch0 -p1 + +%build +make + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} PATH=/usr/bin:/bin:/usr/sbin:/sbin install +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc README ChangeLog COPYING docs/programmers-guide +%doc docs/kickstart-docs.txt +%{python_sitelib}/* +%{_bindir}/ksvalidator +%{_bindir}/ksflatten +%{_bindir}/ksverdiff + +%changelog +* Tue Nov 20 2012 Chris Lumens - 1.99.22-1 +- Add support for url --mirrorlist, needed by anaconda (#868558). (clumens) +- Only write out a logging line if one was provided (#873242). (clumens) +- If no timezone was provided, do not write out an empty timezone command. (clumens) + +* Wed Oct 24 2012 Chris Lumens - 1.99.21-1 +- Add support for layout switching options (vpodzime) + +* Mon Oct 15 2012 Chris Lumens - 1.99.20-1 +- Disable pylint warnings related to the previous patch. (clumens) +- Revert "Fix superclass constructor call in F18_Keyboard." (clumens) +- Fix superclass constructor call in F18_Keyboard. (dlehman) +- Add cipher option for encrypting block devices. (dlehman) +- Change keyboard command to accept VConsole keymap and X layouts (vpodzime) +- add unsupported_hardware command (#824963) (bcl) + +* Fri Sep 14 2012 Chris Lumens - 1.99.19-1 +- bonding support: add network --bondslaves --bondopts options (rvykydal) +- vlan support: add network --vlanid option. (rvykydal) + +* Thu Sep 06 2012 Chris Lumens - 1.99.18-1 +- Fix the multilib package test case. (clumens) +- Add support for --multilib option to %packages. (dlehman) +- Mark --nobase as deprecated. (notting) + +* Tue Aug 28 2012 Chris Lumens - 1.99.17-1 +- Add ksdata.network.hostname (readonly) property (rvykydal) + +* Wed Aug 22 2012 Chris Lumens - 1.99.16-1 +- Add swap --hibernation to logvol command (vpodzime) + +* Thu Aug 09 2012 Chris Lumens - 1.99.15-1 +- No argument needs to be given to rootpw if you're just locking the account. (clumens) + +* Thu Jul 26 2012 Chris Lumens - 1.99.14-1 +- add reboot test (bcl) +- add correct halt command handling (bcl) +- return parsed object from assert_parse (bcl) +- The monitor command has been deprecated since F10. Get rid of it. (clumens) +- Add --hibernation option for swap size specification (vpodzime) +- Add leavebootorder test (hamzy) + +* Tue Jun 19 2012 Chris Lumens - 1.99.13-1 +- Support bootloader --leavebootorder for F18 and RHEL7 (#824801) (pjones) +- Allow %include in %pre and %post (#827269) (bcl) + +* Mon Jun 18 2012 Chris Lumens - 1.99.12-1 +- Add --nontp option and a way to specify NTP servers to the timezone command (vpodzime) +- fix TypeError in network.py with ipv6 static addresses (wwoods) +- Layouts may include spaces, so put them in quotes (vpodzime) + +* Mon May 07 2012 Chris Lumens - 1.99.11-1 +- pylint doesn't like .setter syntax at all. (clumens) +- Modify keyboard command to handle multiple layouts (vpodzime) +- Add support for F18. (vpodzime) +- Fix traceback if modules cannot be loaded when running tests (vpodzime) + +* Mon Apr 02 2012 Chris Lumens - 1.99.10-1 +- Add resize option to partition and logvol commands. (dlehman) +- Add --list= mode to clearpart for explicit list of partitions to remove. (dlehman) + +* Thu Mar 22 2012 Chris Lumens - 1.99.9-1 +- Add __ne__ methods to every object with an __eq__ method. (clumens) +- Use the older exception syntax for python 2.4 compatibility. (clumens) +- Add an __eq__ method to the method command. (clumens) + +* Wed Mar 14 2012 Chris Lumens - 1.99.8-1 +- Add support for RHEL7 (#802369). +- Add a method to set a command back to its initial blank state. +- btrfs likes its raid levels in lower case. (#799154) (dlehman) +- iscsi: add support for interface binding to F17 (rvykydal) +- iscsi: add support for interface binding (#500273) (rvykydal) + +* Wed Jan 11 2012 Chris Lumens - 1.99.7-1 +- Add --type option to autopart command. (dlehman) +- Add btrfs command. (dlehman) + +* Tue Nov 15 2011 Chris Lumens - 1.99.6-1 +- Add --boot-drive option to bootloader command to pick boot drive. (dlehman) +- Add support for F17. (clumens) +- The guts of a script could include a line starting with a % (#746928). (clumens) + +* Wed Oct 19 2011 Chris Lumens - 1.99.5-1 +- Don't error out if raid --useexisting is given with no members (#741728). (clumens) +- When %end is missing, include the unterminated section in the error message. (clumens) + +* Wed Sep 14 2011 Chris Lumens - 1.99.4-1 +- --reserved-space and --reserved-percent should be checked on a callback. (clumens) +- Add a volgroup unit test, and fix a bug it uncovered. (clumens) +- Add support for reserved space in volume group. (dlehman) +- Allow a %include to come in the middle of a section (#733455). (clumens) +- Add a test case for %include inside %packages. (clumens) + +* Mon Aug 22 2011 Chris Lumens - 1.99.3-1 +- Ignore reimport warnings. (clumens) +- Add support for 'autopart --nolvm' (jlaska) +- autopart - Inherit error checking from base class (jlaska) +- Let's just use url.size instead. That's defined for both FTP and HTTP. (clumens) +- It's url.hdr now, not url.info. (clumens) +- Support end-of-line comments in the %packages section (#728563). (clumens) + +* Mon Jun 27 2011 Chris Lumens - 1.99.2-1 +- Don't do "make po-pull" during installation. (clumens) + +* Mon Jun 27 2011 Chris Lumens - 1.99.1-1 +- Fix a couple Makefile typos. (clumens) +- typo fix (vpodzime) +- option for wpa wifi connection specification added (vpodzime) +- Update Makefiles to work with new translation system. (clumens) +- BuildRequires transifex-client. (clumens) +- Ignore po/*.po files. (clumens) +- Remove translation files. (clumens) +- Add transifex-client configuration file. (clumens) +- Fix po files so "msgfmt -c" passes and they can be uploaded to transifex. (clumens) + +* Tue Jun 07 2011 Chris Lumens 1.99.0-1 +- Add a way to tell how often a section has been handled. (clumens) +- Add a NullSection that just ignores any section provided. (clumens) +- Add test cases for the parser itself. (clumens) +- Allow for defining your own kickstart %sections. (clumens) +- The docs need to be fetched from an HTTPS location now. (clumens) +- Write out --onboot=off if it's False. (clumens) + +* Fri Mar 25 2011 Chris Lumens - 1.83-1 +- Add kickstart network --nodefroute option (#668417) (rvykydal) +- Add support for network --bootproto ibft option (#668417) (rvykydal) +- Add network --activate option (#668417) (rvykydal) +- Add support for F16. (clumens) + +* Fri Feb 18 2011 Chris Lumens - 1.82-1 +- Add support for "logvol --label=" (#677571). (clumens) + +* Wed Jan 19 2011 Chris Lumens - 1.81-1 +- Add support for "raid --label=" (#670643). (clumens) +- --baseurl/--mirrorlist are no longer required for the repo command. (clumens) +- Make use of the "interactive" command an error. (clumens) + +* Fri Dec 10 2010 Chris Lumens - 1.80-1 +- Remove preceededInclude= support (#639372). (clumens) +- support noverifyssl on the rhel6-branch (method, repo) (#660340). (akozumpl) +- l10n: Added Low German translation (ncfiedler) + +* Mon Nov 08 2010 Chris Lumens 1.79-1 +- Move from pychecker to pylint, since the latter actually works. +- Lots of minor corrections for pylint. +- Add bootloader --iscrypted (#554870). +- Add support for F15. + +* Fri Sep 10 2010 Chris Lumens - 1.78-1 +- Raise KickstartError instead of IOError (#618002). (clumens) +- It's --biospart, not --biosdisk (#620855). (clumens) +- Translation updates. + +* Tue Jul 20 2010 Chris Lumens - 1.77-1 +- Send the key command down the memory hole. (clumens) +- Deprecate interactive kickstart mode. (clumens) + +* Thu Jul 08 2010 Chris Lumens - 1.76-1 +- method: new parameter '--noverifyssl' after --url. (akozumpl) +- repo: new parameter '--noverifyssl'. (akozumpl) + +* Tue Jun 22 2010 Chris Lumens - 1.75-1 +- Update translation files. (clumens) +- Remove everything from pykickstart that's been deprecated forever. (clumens) +- Using the knowledge of what command supports what option, condense test cases. (clumens) +- Add a method to list all supported options for a command being tested. (clumens) +- Add support for F14. (clumens) +- The %end at the end of a section is now required. (clumens) + +* Thu Jun 10 2010 Chris Lumens - 1.74-1 +- If an option is deprecated, do not care if it takes a value (#602303). (clumens) +- Don't compare the dest ("telnet") with the option string ("--telnet"). (clumens) +- The --connect= parameter wasn't really deprecated in FC6. (clumens) + +* Tue Jun 01 2010 Chris Lumens - 1.73-1 +- Allow "ignoredisk" to explicitly specify interactive usage (#596804) (pjones) + +* Fri Apr 23 2010 Chris Lumens - 1.72-1 +- Return non-zero on error from ksvalidator (#585284). (clumens) + +* Wed Apr 14 2010 Chris Lumens - 1.71-1 +- Don't overwrite the excluded group list after every %packages line (#577334). (clumens) +- Add a bunch of test cases for the packages section. (clumens) + +* Wed Mar 31 2010 Chris Lumens - 1.70-1 +- Add support for RAID4 (#578514). (clumens) +- Escape percent signs in the changelog. (clumens) + +* Wed Mar 10 2010 Chris Lumens - 1.69-1 +- Add driverdisk --biospart= (#570437). (clumens) +- Fix IOError catching in ksflatten (jgregusk, #558650). + +* Thu Jan 14 2010 Chris Lumens - 1.68-1 +- Support removing groups that were included by a glob (#554717). (clumens) +- Make sure that everything in version.versionMap has a handler. (clumens) +- Add support for RHEL6 (#552230). (clumens) +- Don't consider RHEL versions as developmental even if they're latest. (clumens) +- Add lineno to BaseData and derived classes (version 2) (hdegoede) +- Give the non mandatory iscsi --port argument a sane default (hdegoede) +- Change python_sitelib macro to use %%global for new rpm (hdegoede) +- Fix typo in iscsi parsing error message (hdegoede) + +* Thu Dec 03 2009 Chris Lumens - 1.67-1 +- Don't use action="append_const" in firewall.py. +- Make "make archive" depend on test and check passing again. +- versionToString now works in all cases we test for. +- Fix the few pychecker errors outstanding in options.py. +- Fix make docs to make docs dir before trying to download files there (hdegoede) + +* Wed Nov 25 2009 Hans de Goede - 1.66-1 +- Add --dcb option to fcoe command (#513011) +- Remove rhpl from tests +- Port bootloader --hvargs option added in rhel5 +- Ignore comments when looking for %%ksappend lines (#525676) +- Use python 2.x exception syntax + +* Thu Nov 12 2009 Chris Lumens - 1.65-1 +- Add additional arguments to BaseHandler.__init__ for better map control. +- Return the KickstartCommand/KickstartData object from dispatcher. +- Add an "sshpw" command for changing the passwords in anaconda's env. +- Add --proxy support to the url and repo commands. +- Add support for F13. Is it really that time already? + +* Wed Sep 30 2009 Chris Lumens - 1.64-1 +- Update the zfcp command for F12 (#526360). +- Move "make" to %%build (#524215). + +* Wed Sep 16 2009 Chris Lumens - 1.63-1 +- Add encryption key escrow support (mitr, #508963). +- Fix the repo test cases to expect quotes around the repo's name. + +* Thu Sep 10 2009 Chris Lumens - 1.62-1 +- Support translated help text in optparse (#479519). +- If the input kickstart file cannot be read, raise IOError (#519477). + +* Thu Aug 27 2009 Chris Lumens - 1.61-1 +- Include the error messages from URLGrabError in the exception (#518443). + +* Tue Aug 11 2009 Chris Lumens - 1.60-1 +- Put quotes around the repo's name (Marc.Herbert@gmail.com). +- Make duplicate entries warnings, not errors (#516338). + +* Tue Jul 28 2009 Chris Lumens - 1.59-1 +- Handle a few more places where a urlgrabber error could happen (#512951). +- Error out if the same partition/repo/network is defined twice (#512956). +- Call parent class tests first. (jlaska) +- Add KSOptionParser to FC3 upgrade command. (jlaska) +- Correct missing return stmt in _getArgsAsStr() (jlaska) + +* Fri Jul 17 2009 Chris Lumens - 1.58-1 +- Adjust writePriority to fix lvm-on-raid0 test cases (jlaska). +- Add F12 to the version number tests. (clumens) +- F12_User test case. (dcantrell) +- Add --gecos argument to the 'user' command (dcantrell) +- Convert user.py to use _getArgsAsStr() (dcantrell) + +* Fri Jul 10 2009 Chris Lumens - 1.57-1 +- Another patch to make the bootloader test work (jlaska). + +* Thu Jul 09 2009 Chris Lumens - 1.56-1 +- Make sure to import the gettext stuff in fcoe. (clumens) +- Correctly deprecate bootloader --lba32 (jlaska). +- pykickstart: fix zfcp command writepriority (hdegoede) +- pykickstart: Add fcoe command (take 2) (hdegoede) +- Add a test case for RAID (jlaska). + +* Thu Jul 02 2009 Chris Lumens - 1.55-1 +- Add support for the group command to F12 (#509119). +- RHEL5 now supports RAID 10. +- The f12 hander class should be called F12Handler. (jgranado) +- Remove bootloader --lba32. +- Add a new version of the driverdisk command without --type=. +- Add initial support for F12. +- Fetch the programmers-guide from the wiki now. + +* Mon May 18 2009 Chris Lumens - 1.54-1 +- Make sure the F11 handler gets used for "partition" and "part" (#501020). + +* Wed Apr 29 2009 Chris Lumens - 1.53-1 +- Move lineno= from KSOptionParser.__init__ to parse_args (#497149). (clumens) +- Use the F11 version of the partition command. (clumens) +- Remove the --start and --end options since anaconda no longer uses them. (clumens) +- Remove a broken test case. (clumens) + +* Wed Feb 18 2009 Chris Lumens - 1.52-1 +- Add lots more test cases (alindebe, mgracik, stickster). +- Add a skip attribute on key to shut up pychecker. +- Only show autostep command when requested (jlaska) +- Strip spaces from service names, and require an option to be provided. +- Surround services lists in double quotes. +- Remove the extra space from the services __str__ method. +- Fix output formatting bugs in firewall, partition, and repo (mgracik). +- Specifying both or neither of --drives and --only-use should be an error. +- Corrected newline char in return value of FC6_Method. (mgracik) +- Make --drives a required option for FC3, and catch no args on F8. +- Fix final printing of the rescue command (mgracik). +- Surround output strings in double quotes. +- Fix a typo in the deviceprobe command. +- Revert the more strict option processing on displaymode. +- Properly handle erroring on extra args, not just extra options. +- Don't use the logging class since it interferes with the logging test. +- port without host should raise KickstartParseError, not kickstartValueError. +- Add the --key option to option processing, since it's a valid argument. +- Fix test cases that were failing due to the new use of KSOptionParser. +- Teach driverdisk.py command to reject extra partitions (stickster). +- Add KSOptionParser to all commands ... enables more strick option checking (jlaska). +- Use KSOptionParser so we can catch bad command options (jlaska). + +* Thu Jan 29 2009 Chris Lumens - 1.51-1 +- Make a couple changes to how the logging command is handled. +- Add a lot of test cases (clumens, alindebe, jlaska, fcami, adamwill, pfrields). +- Fix output formatting for the rootpw command. +- For commands that take exactly one argument, check and error correctly. +- Surround module options in quotes on the output side (jlaska). +- Set module opts in the FC3 handler correctly. +- Fix newlines on the device command output (jlaska). +- If --autoscreenshot is not specified, still output "autostep". +- Move the currentCmd and currentLine into getParser(). (jlaska) +- Write out an selinux line if set to disabled, but not if None. +- F9_LogVolData should inherit from FC4_LogVolData, not FC3_LogVolData (jlaska). +- Add unittest framework along with logvol and vnc unittests. (jlaska) +- Don't set the KSOption.required attribute in the constructor (jlaska). + +* Sat Jan 10 2009 Chris Lumens - 1.50-1 +- Add a script to diff two versions of kickstart syntax. +- Add an option to ksvalidator to list all available syntax versions. +- Remove a couple extra newlines in output formatting. +- Add documentation for the new %%include representation. +- Add support %include to the pykickstart data objects. + +* Thu Jan 08 2009 Chris Lumens - 1.49-1 +- Add upgrade --root-device (atodorov, #471232). +- Use python's builtin set rather than the Sets module (#477836, dcantrell). + +* Tue Dec 23 2008 Chris Lumens - 1.48-1 +- Allow ignoring group metadata from repos, using a '--ignoregroups' + boolean. (notting) +- Add initial support for F11. +- Specify the command versions in the handlers instead of making copies. +- Remove empty and pointless __init__ methods. +- Pass arguments to superclasses via *args and **kwargs, all the way up. +- Add removedKeywords and removedAttrs lists on Commands and Data. +- Fix version regexes to handle double digits and minor releases (jlaska). + +* Thu Oct 30 2008 Chris Lumens - 1.47-1 +- Fix enabling services we specify by specific options. + +* Mon Oct 27 2008 Chris Lumens - 1.46-1 +- Add support for firewall --service (#467005). + +* Tue Oct 14 2008 Chris Lumens - 1.45-1 +- Lots of translation updates. +- Remove use of string.partition for python2.4 (atodorov). + +* Mon Sep 22 2008 Chris Lumens - 1.44-1 +- Add support for reverse CHAP to the kickstart iscsi command (hans) +- Fix typo (katzj) + +* Wed Sep 03 2008 Chris Lumens - 1.43-1 +- Revert "Do not include passphrases for encrypted block devices in + anaconda-ks.cfg." (dlehman) +- yum doesn't like when mirrorlist is "". (clumens) + +* Mon Aug 11 2008 Chris Lumens - 1.42-1 +- Add rescue command to pykickstart (atodorov) +- Sort %%packages output (katzj) +- Fix a typo (atodorov). + +* Fri Aug 01 2008 Chris Lumens - 1.41-1 +- RHEL5 supports ignoredisk --only-use now too. (clumens) +- Do not include passphrases for encrypted block devices in + anaconda-ks.cfg. (dlehman) +- Fix F9,F10,RHEL5 "part" commands to use the same class as + "partition". (dlehman) +- Add an apply method() for commands and implement for lang (katzj) + +* Tue Jul 15 2008 Chris Lumens - 1.40-1 +- RHEL5_LogVolData should inherit from FC4, not FC3. + Also fix FC9->F9 typo. (dlehman) +- Support creation of encrypted block devices in RHEL5. (#449830) (dlehman) +- Use the right LogVolData objects for RHEL3 and 4 (jlaska). (clumens) +- We no longer use rhpl for translations. (clumens) +- All the base classes should derive from object. (clumens) + +* Fri Jun 13 2008 Chris Lumens - 1.39-1 +- It's helpful to return the parser object. (clumens) + +* Tue Jun 10 2008 Chris Lumens - 1.38-1 +- Fix loading the Handler object by looking for a more specific + name (#450740). (clumens) + +* Sun Jun 08 2008 Chris Lumens - 1.37-1 +- XConfig is still used by other projects, so just deprecate some + options. (clumens) + +* Thu May 29 2008 Chris Lumens - 1.36-1 +- It should be repo --cost, not repo --priority. (clumens) + +* Fri May 23 2008 Chris Lumens - 1.35-1 +- Bring driverdisk command in line with the docs. (clumens) +- Change RAID command print priorities (jlaska). +- According to docs, physvols are space delimited. (jlaska) +- Don't write the label out twice (jlaska). +- Deprecate monitor and xconfig commands. (clumens) + +* Wed May 07 2008 Chris Lumens - 1.34-1 +- Load the handler module automatically. (clumens) +- Add support for F10. (clumens) +- Initialize cmd.handler earlier; fixes repo.methodToRepo() (markmc) +- Don't shadow builtin function names. (clumens) +- Running check is now required before pykickstart can be packaged. (clumens) +- Reorganize code a little bit to pass pychecker. (clumens) + +* Tue Apr 08 2008 Chris Lumens - 1.33-1 +- Fix whitespace when printing out the bootloader command (pmeyers). +- Fix the type on bootloader --timeout processing. (clumens) + +* Wed Apr 02 2008 Chris Lumens - 1.32-1 +- Make the string reader act like the file reader upon EOF. (clumens) +- Add syntax for encrypted logical volumes. (clumens) + +* Tue Mar 25 2008 Chris Lumens - 1.31-1 +- Support end-of-line comments. (clumens) +- Lots of translation updates. + +* Tue Feb 26 2008 Chris Lumens - 1.30-1 +- Reverse writePriorities of iscsi and iscsname (#434965, jlaska). +- Fix printing of iscsiname command (#434945, jlaska). +- Don't traceback on ENOENT. (pnasrat) +- Store the mouse name as a string, not a list. (clumens) +- Update translations. + +* Wed Jan 30 2008 Chris Lumens - 1.29-1 +- Renamed bootproto=ask to bootproto=query, add to RHEL5 as well. (clumens) + +* Wed Jan 23 2008 Chris Lumens - 1.28-1 +- Fix traceback on volgroup command. (clumens) + +* Thu Jan 17 2008 Chris Lumens - 1.27-1 +- The bootprotoList needs to be defined before it's used. (clumens) + +* Thu Jan 17 2008 Chris Lumens - 1.26-1 +- Add support for network --bootproto=ask. (clumens) + +* Tue Jan 15 2008 Chris Lumens - 1.25-1 +- Add the version to the output ks file. (clumens) +- Add syntax for encrypted partitions and raid devices. (clumens) + +* Thu Jan 10 2008 Chris Lumens - 1.24-1 +- Make inheritance and overriding of %%packages work (#427768). (clumens) +- Add an option for which languages should be installed. (katzj) +- Use the right name for the iscsi --target variable (#418781). (clumens) + +* Mon Dec 10 2007 Chris Lumens - 1.23-1 +- Take Makefile improvements from anaconda. +- Fix a traceback on F9 zerombr command (#395431). +- Update to handle new Python eggs packaging. + +* Tue Nov 20 2007 Chris Lumens 1.22-1 +- Don't process or write out vnc --enabled (jlaska AT redhat DOT com). +- Fix a traceback in the clearpart command. + +* Tue Nov 06 2007 Chris Lumens 1.21-1 +- Save script line numbers for debugging. +- More internal cleanups. + +* Wed Oct 31 2007 Chris Lumens 1.20-1 +- Pull wiki docs from the new location. +- Fix error messages for options that have been removed after having been + previously deprecated. +- zerombr no longer takes any arguments. +- %%packages --ignoredeps --resolvedeps have been removed. +- firewall --high --medium have been removed. +- vnc --connect has been removed. +- xconfig options from monitor have now been removed. +- --bytes-per-inode has been marked as deprecated. +- Fix typos. +- Add --fsprofile option to disk commands (pjones). +- Add F9 support (pjones). +- Lots of internal fixes (clumens, pjones). + +* Tue Oct 23 2007 Chris Lumens 1.19-1 +- Fix a traceback on the cdrom method. + +* Thu Oct 18 2007 Chris Lumens 1.18-1 +- Don't write out %%end to packages and scripts if the syntax version doesn't + support it. +- Remove obsolete translation (#332221). + +* Thu Oct 04 2007 Chris Lumens 1.17-1 +- Simplify argument processing and printing. + +* Wed Oct 03 2007 Chris Lumens 1.16-1 +- Undeprecate %%packages --excludedocs. +- Fix a traceback in the device command handling. +- Add bootloader --timeout (katzj). + +* Tue Oct 02 2007 Chris Lumens 1.15-1 +- Update translations (#259121). +- The device command no longer takes a type argument. + +* Fri Sep 28 2007 Chris Lumens 1.14-1 +- Fix output formatting for packages section header (#310211). +- Add a script to flatten kickstart files containing includes (katzj). + +* Wed Sep 12 2007 Chris Lumens 1.13-1 +- Add a function to convert URL method strings into repo objects + (jkeating). +- Writer formatting fixes. +- Add kickstart documentation from the Fedora Wiki. + +* Tue Sep 04 2007 Chris Lumens 1.12-1 +- Fix lots of problems in processing the bootloader, device, network, and + raid commands. +- Add %%end when writing out scripts and packages. +- Add a makefile target to run pychecker to cut down on errors in + releases. + +* Mon Sep 3 2007 Jeremy Katz - 1.11-1 +- fix a few tracebacks + +* Fri Aug 31 2007 Chris Lumens 1.10-1 +- Add network --ipv6=. + +* Fri Aug 24 2007 Chris Lumens 1.9-1 +- Add support for the %%end directive to be placed at the end of scripts + and packages sections. Deprecate old syntax. +- Clean up after ksvalidator if pykickstart issues a traceback. +- Add support for repo --priority --includepkgs --excludepkgs. +- Fix newline at end of reboot --eject output (#253562). + +* Mon Aug 13 2007 Chris Lumens 1.8-1 +- Fix type checking of string values. + +* Thu Aug 09 2007 Chris Lumens 1.7-1 +- Clarify license in spec file and all source files. +- Check string values to options to make sure they're not other options + (#251318). + +* Thu Aug 02 2007 Chris Lumens 1.6-1 +- Fix a couple tracebacks in ksvalidator. +- Change --class to --dhcpclass (#248912). + +* Thu Jul 19 2007 Chris Lumens 1.5-2 +- Require rhpl (#248953). + +* Tue Jul 17 2007 Chris Lumens 1.5-1 +- Fix traceback when calling preprocessKickstart. + +* Tue Jul 17 2007 Chris Lumens 1.4-1 +- Add methods to handle the %%ksappend directive. +- Fix ignoredisk --disks. + +* Wed Jul 11 2007 Chris Lumens - 1.3-1 +- Add support for ignoredisk --only-use. +- Fix traceback in raid command printing method (#246709). + +* Fri Jun 08 2007 Chris Lumens - 1.2-2 +- Fix package review problems (#226334). + +* Mon Jun 04 2007 Chris Lumens - 1.2-1 +- Fix harddrive install method error checking (#232492). +- Set authentication information from the input line to preserve quoting + (#241657). +- Allow included files to be given by URL. +- Fix typo in user --iscrypted option. + +* Mon May 14 2007 Chris Lumens - 1.1-1 +- Better regexes for splitting version strings into family and version. +- Add basic support for RHEL3. +- Update translations. + +* Fri Apr 13 2007 Chris Lumens - 1.0-1 +- Update documentation. +- Update translations. + +* Mon Mar 19 2007 Chris Lumens - 0.100-1 +- bootloader should be written out after upgrade/install. +- Treat class names as unicode strings (#231053). + +* Wed Mar 07 2007 Chris Lumens - 0.99-1 +- The timezone command didn't recognize --isUtc before FC6 (#231189). +- Recognize %%ksappend lines in ksvalidator. +- Don't set default values in some command __init__ methods. +- Added an updates command. +- Add support for RAID10. + +* Mon Feb 26 2007 Chris Lumens - 0.98-1 +- Fix device command syntax to match anaconda. +- Fix __call__ on method command. + +* Wed Feb 21 2007 Chris Lumens - 0.97-1 +- Fix traceback when not overriding default mappings (#229505). + +* Tue Feb 20 2007 Chris Lumens - 0.96-1 +- Fix __str__ methods for langsupport and reboot commands. +- Renamed BaseHandler.empty to BaseHandler.maskAllExcept. +- Split command objects out into their own files in commands/. +- Rename command objects to start with Version_. +- Support extended group selection syntax. + +* Wed Feb 14 2007 Chris Lumens - 0.95-1 +- KickstartParser no longer takes a version argument. +- Be more lenient in what strings stringToVersion accepts. +- Allow setting state on one data object from multiple files. + +* Wed Feb 07 2007 Chris Lumens - 0.94-1 +- Add a newline to the end of the key command output. +- Use network bootproto constants (#197694). +- Fix tracebacks in subclass __str__ methods (#226734). + +* Wed Jan 31 2007 Chris Lumens - 0.93-2 +- Make some minor spec file changes to get closer to the extras guidelines. + +* Thu Jan 25 2007 Chris Lumens - 0.93-1 +- Add support for FC3, RHEL4, and RHEL5. +- The key command was not supported until after FC6. +- Accept more strings in stringToVersion. + +* Fri Jan 19 2007 Chris Lumens - 0.92-1 +- Fix KickstartVersionError reporting. +- Add a version attribute to handler objects. +- Fix line number reporting on lots of commands. +- Add initial support for Fedora 7 and remove deprecated commands. +- Accept a --default argument to the %%packages header (#221305). + +* Wed Jan 17 2007 Chris Lumens - 0.91-1 +- Add a method to read kickstart files from strings. + +* Tue Jan 16 2007 Chris Lumens - 0.90-1 +- Support multiple versions of kickstart syntax from one code base + (#189348). +- Fix inconsistency between Script parser and writer (#222877). + +* Fri Dec 15 2006 Chris Lumens - 0.43-1 +- Pull in new translations (#216620). + +* Thu Dec 7 2006 Jeremy Katz - 0.42-2 +- rebuild against python 2.5 + +* Tue Dec 05 2006 Chris Lumens - 0.42-1 +- Fix traceback when writing out repo command (#218274). + +* Fri Dec 01 2006 Chris Lumens - 0.41-1 +- Fix traceback when using deprecated commands (#218047, #218059). + +* Thu Nov 30 2006 Chris Lumens - 0.40-1 +- Pull in new translations (#216620). +- Add --level argument to logging command writer. + +* Tue Oct 24 2006 Chris Lumens - 0.39-2 +- Fix release number. + +* Tue Oct 24 2006 Chris Lumens - 0.39-1 +- Add writer for --key (#211997). + +* Tue Oct 17 2006 Jeremy Katz - 0.38-1 +- allow --skip for installation number as well (#207029) + +* Mon Oct 16 2006 Jeremy Katz - 0.37-1 +- support for installation numbers (#207029) + +* Fri Oct 13 2006 Bill Nottingham - 0.36-1 +- use valid charsets in translations (#210720) + +* Fri Sep 29 2006 Chris Lumens - 0.35-1 +- Fix traceback in harddrive command (#208557). + +* Mon Sep 25 2006 Chris Lumens - 0.34-1 +- Add support for --biospart option to harddrive (#207585). +- Update writer for syntax changes. + +* Wed Sep 20 2006 Jeremy Katz - 0.33-1 +- improved iscsi syntax +- allow multiple zfcp devs + +* Thu Jul 20 2006 Chris Lumens 0.32-1 +- Limit --bootproto to what anaconda supports. +- Add --noipv4 and --noipv6 network options. + +* Tue Jun 20 2006 Chris Lumens 0.31-1 +- Handle nfs --opts (katzj). +- RAID devices should be integers instead of strings (#176537). +- Add initial support for iscsi (katzj). + +* Tue Jun 06 2006 Chris Lumens 0.30-2 +- Add BuildRequires to fix building under mock (#194156, Joost Soeterbroek + ). + +* Thu May 25 2006 Chris Lumens 0.30-1 +- Change order of LVM-related writing functions (#193073). +- Require urlgrabber. +- Return a more useful error message on unknown commands. +- Fix logvol writing typo. +- Make ksvalidator validate from a URL in addition to a file. +- Don't write out an empty packages section (#192851). + +* Tue May 23 2006 Chris Lumens 0.29-1 +- Add multipath command, handlers, and data objects (pjones). +- Rename --ports to --port in writer. + +* Mon May 15 2006 Chris Lumens 0.28-1 +- Support --mtu for the network command (#191328). +- Accept --isUtc for backwards compatibility. + +* Wed May 04 2006 Chris Lumens 0.27-1 +- Output formatting fixes. +- Added commands for managing users and services. + +* Mon Apr 17 2006 Chris Lumens 0.26-1 +- Ignore spaces before group names (#188095). +- Added some translations. +- Add options for repo command. +- Reorder %%packages section output. +- Output %%packages header options. +- Initialize RAID and volume group members to empty lists. + +* Mon Mar 27 2006 Chris Lumens 0.25-1 +- Add support for the logging command. + +* Mon Mar 27 2006 Chris Lumens 0.24-1 +- Don't write out a blank xconfig line. +- Reorder output handlers to group like commands together. +- Mark strings for translation. + +* Tue Mar 07 2006 Chris Lumens 0.23-1 +- Backwards compatibility support for options to zerombr. + +* Fri Feb 24 2006 Chris Lumens 0.22-1 +- Get ignoredisk working again (#182934). + +* Fri Feb 17 2006 Chris Lumens 0.21-1 +- Provide an option to not traceback on missing include files (#181760). +- Update programming documentation. + +* Mon Feb 13 2006 Chris Lumens 0.20-1 +- Correctly set --noformat and --useexisting on lvm and raid. + +* Mon Feb 13 2006 Chris Lumens 0.19-1 +- --onboot requires a value (#180987). +- Be more strict about commands that don't take arguments. + +* Thu Feb 09 2006 Chris Lumens 0.18-1 +- Fix some errors pychecker caught. +- Allow exceptions to not be fatal so ksvalidator can spot more errors in + a single pass (#179894). + +* Wed Feb 01 2006 Chris Lumens 0.17-1 +- Don't set a default port for vnc. + +* Tue Jan 31 2006 Chris Lumens 0.16-1 +- Give dmraid string an initial value. +- Handle None on partition size. + +* Tue Jan 31 2006 Peter Jones 0.15-1 +- Add dmraid support + +* Mon Jan 30 2006 Chris Lumens 0.14-1 +- Fix VNC parameter parsing (#179209). +- Deprecate --connect. Add --host and --port instead. + +* Thu Jan 19 2006 Chris Lumens 0.13-1 +- Recognize the --eject parameter to shutdown/halt. +- Store the exact post-installation action in ksdata. + +* Mon Jan 09 2006 Chris Lumens 0.12-1 +- Clean up output quoting. +- Finish removing monitor-related stuff from xconfig. + +* Mon Dec 12 2005 Chris Lumens 0.11-1 +- Deprecate monitor-related options to xconfig. + +* Thu Dec 08 2005 Chris Lumens 0.10-1 +- Support --bytes-per-inode on raid + (Curtis Doty #175288). + +* Wed Nov 16 2005 Jeremy Katz - 0.9-1 +- fixup network --onboot + +* Thu Nov 03 2005 Chris Lumens 0.8-1 +- Default to SELINUX_ENFORCING. +- Default partition sizes to None for anaconda (#172378). +- Don't call shlex.split on anything inside a script (#172313). + +* Tue Nov 01 2005 Chris Lumens 0.7-1 +- Fix clearpart --all. +- vnc command does not require --connect option (#172192). +- network --onboot does not take any option. +- Remove extra spaces from firewall --ports and --trust. +- Write out network -- options. + +* Fri Oct 28 2005 Chris Lumens 0.6-1 +- Add --resolvedeps and --ignoredeps as deprecated options. +- Pass line number to header functions. + +* Mon Oct 24 2005 Chris Lumens 0.5-1 +- Add line numbers to exception reporting. +- Added ksvalidator. + +* Wed Oct 19 2005 Chris Lumens 0.4-1 +- Correct deprecated attribute on options. +- Added programming documentation. + +* Thu Oct 13 2005 Chris Lumens 0.3-2 +- Correct python lib directory on 64-bit archs (#170621). + +* Fri Oct 07 2005 Chris Lumens 0.3-1 +- Add a deprecated attribute to options. +- Add --card option back to xconfig and mark as deprecated. +- Throw a deprecation warning on mouse and langsupport commands. +- Rename Writer to KickstartWriter for consistency. +- Collapse scripts into a single list and add an attribute on Script to + differentiate. + +* Wed Oct 05 2005 Chris Lumens 0.2-1 +- Rename module to pykickstart to avoid conflicts in anaconda. +- Rename data classes for consistency. +- Add default bytesPerInode settings. + +* Wed Oct 05 2005 Chris Lumens 0.1-1 +- Created package from anaconda. diff --git a/pykickstart/repo-gpgkey-option.patch b/pykickstart/repo-gpgkey-option.patch new file mode 100644 index 0000000..76a69f7 --- /dev/null +++ b/pykickstart/repo-gpgkey-option.patch @@ -0,0 +1,44 @@ +Add --gpgkey option to repo command + +This will be used to verify packages by pungi, which have no other way to get +key location (no real .repo files). + +Signed-off-by: Marek Marczykowski +Index: pykickstart-1.99.22/pykickstart/commands/repo.py +=================================================================== +--- pykickstart-1.99.22.orig/pykickstart/commands/repo.py ++++ pykickstart-1.99.22/pykickstart/commands/repo.py +@@ -131,7 +131,22 @@ class F14_RepoData(F13_RepoData): + + RHEL6_RepoData = F14_RepoData + +-F15_RepoData = F14_RepoData ++class F15_RepoData(F14_RepoData): ++ removedKeywords = F14_RepoData.removedKeywords ++ removedAttrs = F14_RepoData.removedAttrs ++ ++ def __init__(self, *args, **kwargs): ++ F14_RepoData.__init__(self, *args, **kwargs) ++ self.gpgkey = kwargs.get("gpgkey", None) ++ ++ def _getArgsAsStr(self): ++ retval = F14_RepoData._getArgsAsStr(self) ++ ++ if self.gpgkey: ++ retval += " --gpgkey=\"%s\"" % self.gpgkey ++ ++ return retval ++ + + class FC6_Repo(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords +@@ -253,3 +268,9 @@ class F15_Repo(F14_Repo): + removedAttrs = F14_Repo.removedAttrs + + urlRequired = False ++ ++ def _getParser(self): ++ op = F14_Repo._getParser(self) ++ op.add_option("--gpgkey", action="store", type="string") ++ return op ++