almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Update Makefile for git. Remove changelog, create it from git.

Browse Source
This commit is contained in:
Jesse Keating 2008-04-01 14:58:05 -04:00
parent ac609004b2
commit 4b69164797
2 changed files with 9 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
Changelog
View File

@ -1,427 +0,0 @@
* Tue Mar 25 2008 Jesse Keating <jkeating@redhat.com>
- Use yum's comps method to write out a unified comps
* Fri Mar 21 2008 Jesse Keating <jkeating@redhat.com>
- Handle shared source directory better.
* Fri Mar 14 2008 Jesse Keating <jkeating@redhat.com>
- Don't pass --prodpath to buildinstall. It won't like it.
- Fix source iso making
* Wed Mar 12 2008 Jesse Keating <jkeating@redhat.com>
- Lower the CD size to 650; need to investigate pkgordering soon
* Tue Mar 11 2008 Jesse Keating <jkeating@redhat.com>
- netinst.iso was renamed to boot.iso. We want to link it
to the iso dir, but keep the netinst.iso name for now.
* Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com>
- Fix ppc split iso generation
- Exclude repoview from isos
* Mon Mar 03 2008 Jesse Keating <jkeating@redhat.com>
- Copy the netinst iso over to the isos/ directory
- Require a new enough anaconda for this
* Thu Feb 28 2008 Jesse Keating <jkeating@redhat.com>
- Make sure we get fresh repomd.xml each time we run
- Don't autoclean the repodata, some of it can be reused
- Clear out the repodata we copy out temporarily, so that we don't
traceback on --force runs.
* Thu Feb 21 2008 Jesse Keating <jkeating@redhat.com>
- Handle gzipped comps files.
* Fri Feb 08 2008 Jesse Keating <jkeating@redhat.com>
- Fix comps mashup to be more lenient with the open/close of <comps
* Mon Jan 21 2008 Jesse Keating <jkeating@redhat.com>
- Use createrepo api instead of execing it from the cli
- Create different repodata for the unified media, as anaconda no longer
deals with "ALL" or "1,2,3,4" correctly. Simplify anaconda by just
using normal metadata. Re-factor some things to handle this right.
* Mon Dec 17 Jesse Keating <jkeating@redhat.com>
- Always add the core comps group.
* Mon Dec 10 Jesse Keating <jkeating@redhat.com>
- Use a repoview cache.
- Change path to isomd5sum
* Sat Dec 08 Jesse Keating <jkeating@redhat.com>
- Use a createrepo cache.
* Tue Dec 04 Jesse Keating <jkeating@redhat.com>
- Make logged output reusable in shell
- Default to 670 for a CD size, so that we don't overflow
- More fixes around re-using an existing tree
* Mon Dec 03 Jesse Keating <jkeating@redhat.com>
- Enable repo includes/excludes.
- Disable TMPDIR usage, still broken.
- Put a constraint on flavor values
- Check for selinux enforcing and warn.
* Sun Dec 02 Jesse Keating <jkeating@redhat.com>
- Add a --force option to reuse an existing destdir
- Only overwrite dirs if --force is offered, clean out some specific dirs
* Fri Nov 30 2007 Jesse Keating <jkeating@redhat.com>
- Only check for root if you're doing root level tasks (buildinstall)
* Thu Nov 29 2007 Jesse Keating <jkeating@redhat.com>
- Add a split option to the doCreateIsos call
* Wed Nov 28 2007 Jesse Keating <jkeating@redhat.com>
- Figure out number of isos on the fly, based on tree size
- Add command line option to disable creation of split media
- Remove -S -P options, as splittree and packageorder are now
called from createIsos, if needed.
* Tue Nov 27 2007 Jesse Keating <jkeating@redhat.com>
- Enable TMPDIR again so that anconda-runtime working files
go to the working dir.
- Use downloadPkgs() from yum instead of a homebrew download function.
- Add a callback to show download progress
- Add a force option to _link, removes existing target file
* Thu Nov 22 2007 Jesse Keating <jkeating@redhat.com>
- Print a usage if no options are passed
- Correct a man page typo
- Update the F8 config to use released repos
* Wed Nov 07 2007 Jesse Keating <jkeating@redhat.com>
- Preserve timestamps on release note files
* Mon Oct 29 2007 Jesse Keating <jkeating@redhat.com>
- Check to see if the cached package is same size or larger and if so remove
it. Otherwise regets will freak out.
* Tue Oct 23 2007 Jesse Keating <jkeating@redhat.com>
- Add java-development to the group set.
* Thu Oct 11 2007 Jesse Keating <jkeating@redhat.com>
- Add a cost to the media repo file.
* Tue Oct 02 2007 Jesse Keating <jkeating@redhat.com>
- Make sure we stuff a string value into ConfigParser.
* Wed Sep 26 2007 Jesse Keating <jkeating@redhat.com>
- Pull in all the optional Virt stuff
- Don't expire the metadata from Media repo.
* Tue Sep 25 2007 Jesse Keating <jkeating@redhat.com>
- Fix location of media.repo file.
* Tue Sep 18 2007 Jesse Keating <jkeating@redhat.com>
- Drop a .repo file on the root of the media. Used after install.
* Fri Sep 14 2007 Jesse Keating <jkeating@redhat.com>
- Create repoview content in the tree
- Move the .composeinfo file into the directory we actually publish
* Wed Sep 12 2007 Jesse Keating <jkeating@redhat.com>
- 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
* Tue Sep 11 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Default flavor to blank.
* Mon Aug 27 2007 Jesse Keating <jkeating@redhat.com>
- Set up arch in __init__.py as it's needed for logging
- Add support for $releasever in repo uris.
- Set arch using rpmUtils, and do it in /usr/bin/pungi
- Add a kickstart file usable for composing Fedora 8 "Fedora"
- Fix bugs with $basearch and mirrorlist usage.
* Sun Aug 26 2007 Jesse Keating <jkeating@redhat.com>
- Add better support for %packages syntax using native pykickstart
- Add a cache dir for pungi (/var/cache/pungi) and a cli option to override
- Add root check.
* Sat Aug 25 2007 Jesse Keating <jkeating@redhat.com>
- Use a kickstart file as input now (for cdsize and package manifest)
- Turn pkglist into a pre-parsed package dictionary
- Arrange config setting logically
- Error out on usage if no config file passed
- Pass gather a ksparser object instead, needed for yum repos
and more advanced package handling.
- Use ksparser to get repo(s) from kickstart config.
- Don't rely upon a yum conf, do all setup ourselves.
* Fri Aug 24 2007 Jesse Keating <jkeating@redhat.com>
- Remove a lot of configurable items and hard set them
- Move some items to cli flags only (part of moving to pykickstart)
- make "product_name" "name" instead. KISS
- 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.
- Move _doRunCommand into pypungi/__init__.py so that it can be
easily used by all modules. Also pass in a logger for correct
logging
- Quiet down creatrepo calls
* Thu Aug 23 2007 Jesse Keating <jkeating@redhat.com>
- Add a source config for the Fedora spin
* Tue Aug 21 2007 Jesse Keating <jkeating@redhat.com>
- 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.
* Wed Aug 15 2007 Jesse Keating <jkeating@redhat.com>
- 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
* Wed Aug 08 2007 Jesse Keating <jkeating@redhat.com>
- Make Gather() no longer a subclass of yum
- We set debuglevel when creating the yum object.
- Be verbose about what we clean
- Create a subclass of yum to work around logging fun
* Wed Aug 01 2007 Jesse Keating <jkeating@redhat.com>
- Create a new yum object for source downloads as yum
* Sat Jul 28 2007 Jesse Keating <jkeating@redhat.com>
- Split the createrepo call into it's own function
- When raising an error, print the error too.
* Tue Jul 24 2007 Jesse Keating <jkeating@redhat.com>
- Add a few more desktopy things to manifest
- Rename f7 files to f8; set up config files for f8test1
* Fri Jul 20 2007 Jesse Keating <jkeating@redhat.com>
- Don't quote things passed to mkisofs, not a shell
- Always log stdout before checking for stderr output
* Fri Jul 06 2007 Jesse Keating <jkeating@redhat.com>
- Include memtest86+ in the "Fedora" manifest
* Tue Jun 19 2007 Jesse Keating <jkeating@redhat.com>
- Only grab the newest of deps.
* Wed Jun 13 2007 Jesse Keating <jkeating@redhat.com>
- Don't use flavor for a log file if no flavor set (Trac #48)
- Point to the right manifest file in pungi.conf
* Mon Jun 11 2007 Jesse Keating <jkeating@redhat.com>
- 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)
* Fri May 25 2007 Jesse Keating <jkeating@redhat.com>
- Handle the cdsize variable correctly
- More fixes for cached download stuff
- Fix default CD size storing
* Thu May 24 2007 Jesse Keating <jkeating@redhat.com>
- Use a package checksum to verify cached download
- Use the right flavor in the Everything configs
* Wed May 23 2007 Jesse Keating <jkeating@redhat.com>
- Commit config files used for producing Fedora 7
- Default pungi.conf file to using Fedora 7 stuff
* Tue May 15 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Fix comments in config file
* Mon Apr 02 2007 Jesse Keating <jkeating@redhat.com>
- Remove incompatible fc6 config files
- Update default config file with comments / new options
- Update comps file
* Mon Mar 26 2007 Jesse Keating <jkeating@redhat.com>
- Enable source iso building again.
* Fri Mar 23 2007 Jesse Keating <jkeating@redhat.com>
- Don't try a rescue if the script doesn't exist (prarit)
* Thu Mar 22 2007 Jesse Keating <jkeating@redhat.com>
- Pass flavor off to buildinstall if it is set (wwoods)
* Fri Mar 16 2007 Jesse Keating <jkeating@redhat.com>
- Fix a logic flaw in the depsolving loop
* Thu Mar 15 2007 Jesse Keating <jkeating@redhat.com>
- 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.
* Tue Mar 14 2007 Jesse Keating <jkeating@redhat.com>
- Do things faster/smarter if we've only asked for one disc
* Tue Mar 13 2007 Jesse Keating <jkeating@redhat.com>
- log the rpm2cpio stuff for release notes
- correctly capture errors from subprocess
* Wed Mar 07 2007 Jesse Keating <jkeating@redhat.com>
- Call createrepo ourselves for the tree, not buildinstall's job
* Tue Mar 06 2007 Jesse Keating <jkeating@redhat.com>
- Convert from commands to subprocess for things we call out
* Fri Mar 02 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Update Fedora 7 comps file.
- Tag for F7 Test2
* Mon Feb 26 2007 Jesse Keating <jkeating@redhat.com>
- Fix gathering of srpms (thanks skvidal)
* Wed Feb 21 2007 Jesse Keating <jkeating@redhat.com>
- Don't use TMPDIR with buildinstall for now
* Fri Feb 16 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Various logging tweaks
- Use -d flag in createrepo for sqlite blobs
- Add pydoc stuff to various functions
- Support comments in the package manifest
* Wed Feb 14 2007 Jesse Keating <jkeating@redhat.com>
- Add logging patch from jbowes
* Tue Feb 13 2007 Jesse Keating <jkeating@redhat.com>
- 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
* Mon Feb 12 2007 Jesse Keating <jkeating@redhat.com>
- 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
* Thu Feb 08 2007 Jesse Keating <jkeating@redhat.com>
- Add support for globbing in manifest
* Tue Feb 06 2007 Jesse Keating <jkeating@redhat.com>
- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug
- Don't use 'returnSimple' anymore, deprecated in yum api
- Speed up depsolving a bit by tracking solved deps
* Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com>
- Be able to opt-out of a bugurl since buildinstall supports this
- Make isodir an object of pungi (wwoods)
* Tue Jan 30 2007 Jesse Keating <jkeating@redhat.com>
- implantmd5 _then_ sha1sum.
* Mon Jan 29 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Update the comps file from F7
* Wed Jan 24 2007 Jesse Keating <jkeating@redhat.com>
- Add a "flavor" option (such as Desktop)
- Move packageorder file into workdir
- Use some anaconda code to depsolve, gets better (and more common) results
* Tue Jan 23 2007 Jesse Keating <jkeating@redhat.com>
- 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
- Bump the iso size to what was used in FC6
* Wed Jan 17 2007 Jesse Keating <jkeating@redhat.com>
- Move splittree workdirs into work/ at the end of the run
* Tue Jan 16 2007 Jesse Keating <jkeating@redhat.com>
- 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 <jkeating@redhat.com>
- Fix a bug in DVD repodata
- Add correct ppc boot args
- Set ppc arch correctly
* Mon Dec 11 2006 Jesse Keating <jkeating@redhat.com>
- Now able to get release note files from release note packages.
- Add a config file for the source run
* Sat Dec 9 2006 Jesse Keating <jkeating@redhat.com>
- Now able to do srpms, lots of changes
* Fri Nov 17 2006 Jesse Keating <jkeating@redhat.com>
- First pass at a config file, lots of changes
* Wed Nov 8 2006 Jesse Keating <jkeating@redhat.com>
- Shuffle things around for dist-utils
- Add setup.py and such to do installs
* Tue Nov 7 2006 Jesse Keating <jkeating@redhat.com>
- pungi.py
Turn on split repo creation
Add iso creation code
Add DVD creation code
- __init.py__
Turn on split repo creation
Turn on iso creation
* Mon Nov 6 2006 Jesse Keating <jkeating@redhat.com>
- pungi.py
use splittree.py as a module rather than a script
use same layout as current fedora trees
- gather.py
use same layout as current fedora trees
* Wed Nov 1 2006 Jesse Keating <jkeating@redhat.com>
- First changelog entry
- pungi.py
Code up splittree, use our own for now with patches
Code up createSplitRepodata
- Now able to create installable tree and create split CD dirs suitable for
mkisofs

11
Makefile
View File

@ -1,7 +1,7 @@
PKGNAME=pungi PKGNAME=pungi
VERSION=$(shell rpm -q --qf "%{VERSION}\n" --specfile ${PKGNAME}.spec) VERSION=$(shell rpm -q --qf "%{VERSION}\n" --specfile ${PKGNAME}.spec)
RELEASE=$(shell rpm -q --qf "%{RELEASE}\n" --specfile ${PKGNAME}.spec) RELEASE=$(shell rpm -q --qf "%{RELEASE}\n" --specfile ${PKGNAME}.spec)
HGTAG=${PKGNAME}-$(VERSION)-$(RELEASE) GITTAG=${PKGNAME}-$(VERSION)-$(RELEASE)
PKGRPMFLAGS=--define "_topdir ${PWD}" --define "_specdir ${PWD}" --define "_sourcedir ${PWD}/dist" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" --define "_builddir ${PWD}" PKGRPMFLAGS=--define "_topdir ${PWD}" --define "_specdir ${PWD}" --define "_sourcedir ${PWD}/dist" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" --define "_builddir ${PWD}"
RPM="noarch/${PKGNAME}-$(VERSION)-$(RELEASE).noarch.rpm" RPM="noarch/${PKGNAME}-$(VERSION)-$(RELEASE).noarch.rpm"
@ -14,10 +14,16 @@ all:
@echo "Nothing to do" @echo "Nothing to do"
tag: tag:
@hg tag -m "$(HGTAG)" $(HGTAG) @git tag -a -m "Tag as $(GITTAG)" -f $(GITTAG)
@echo "Tagged as $(GITTAG)"
# @hg push # @hg push
Changelog:
(GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp Changelog; rm -f .changelog.tmp) || (touch Changelog; echo 'git directory not found: installing possibly empty changelog.' >&2)
archive: archive:
@rm -f Changelog
@make Changelog
@rm -rf ${PKGNAME}-$(VERSION)/ @rm -rf ${PKGNAME}-$(VERSION)/
@python setup.py sdist --formats=bztar > /dev/null @python setup.py sdist --formats=bztar > /dev/null
@echo "The archive is in dist/${PKGNAME}-$(VERSION).tar.gz" @echo "The archive is in dist/${PKGNAME}-$(VERSION).tar.gz"
@ -45,3 +51,4 @@ clean:
@rm -vf *.tar.gz @rm -vf *.tar.gz
@rm -vrf dist @rm -vrf dist
@rm -vf MANIFEST @rm -vf MANIFEST
@rm -vf Changelog