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

Update for 0.3.0 release

Browse Source
This commit is contained in:
Jesse Keating 2007-04-02 17:19:19 -04:00 committed by Jesse Keating
parent 0a0bbe6688
commit 813d06d88f
15 changed files with 65 additions and 11270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog
View File

@ -1,9 +1,13 @@
* 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)
- Make sure group conditionals are enabled
* Thu Mar 22 2007 Jesse Keating <jkeating@redhat.com>
- Pass flavor off to buildinstall if it is set (wwoods)

11041
config/comps-fc6.xml
View File

File diff suppressed because it is too large Load Diff

33
config/comps-fc7.xml
View File

@ -713,7 +713,6 @@
<packagereq type="default">ccid</packagereq>
<packagereq type="default">coolkey</packagereq>
<packagereq type="default">cpuspeed</packagereq>
<packagereq type="default">crash</packagereq>
<packagereq type="default">cryptsetup-luks</packagereq>
<packagereq type="default">device-mapper-multipath</packagereq>
<packagereq type="default">dhclient</packagereq>
@ -730,7 +729,6 @@
<packagereq type="default">ftp</packagereq>
<packagereq type="default">gnupg</packagereq>
<packagereq type="default">gpm</packagereq>
<packagereq type="default">ipsec-tools</packagereq>
<packagereq type="default">iptstate</packagereq>
<packagereq type="default">irda-utils</packagereq>
<packagereq type="default">irqbalance</packagereq>
@ -974,7 +972,7 @@
<packagereq type="mandatory">xorg-x11-xfs</packagereq>
<packagereq type="mandatory">xorg-x11-xinit</packagereq>
<packagereq type="default">authconfig-gtk</packagereq>
<packagereq type="default">bitstream-vera-fonts</packagereq>
<packagereq type="optional">bitstream-vera-fonts</packagereq>
<packagereq type="default">bluez-pin</packagereq>
<packagereq type="default">dejavu-lgc-fonts</packagereq>
<packagereq type="default">firstboot</packagereq>
@ -1714,7 +1712,7 @@
<description xml:lang="zh_CN">集群支持</description>
<description xml:lang="zh_TW">叢集（Clustering）支援</description>
<default>false</default>
<uservisible>false</uservisible>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">cman</packagereq>
<packagereq type="default">gfs2-utils</packagereq>
@ -4685,7 +4683,6 @@
<packagereq type="optional">deskbar-applet</packagereq>
<packagereq type="optional">gconf-editor</packagereq>
<packagereq type="optional">gdesklets</packagereq>
<packagereq type="optional">gimp-print-utils</packagereq>
<packagereq type="optional">glipper</packagereq>
<packagereq type="optional">glunarclock</packagereq>
<packagereq type="optional">gmpc</packagereq>
@ -5263,7 +5260,7 @@
<packagereq type="default">gutenprint</packagereq>
<packagereq type="default">ImageMagick</packagereq>
<packagereq type="default">netpbm-progs</packagereq>
<packagereq type="default">sane-frontends</packagereq>
<packagereq type="optional">sane-frontends</packagereq>
<packagereq type="default">xsane</packagereq>
<packagereq type="default">xsane-gimp</packagereq>
<packagereq type="optional">agave</packagereq>
@ -5276,10 +5273,10 @@
<packagereq type="optional">fontforge</packagereq>
<packagereq type="optional">fonttools</packagereq>
<packagereq type="optional">fyre</packagereq>
<packagereq type="optional">gimp-print-plugin</packagereq>
<packagereq type="optional">gpp</packagereq>
<packagereq type="optional">gqview</packagereq>
<packagereq type="optional">graphviz</packagereq>
<packagereq type="optional">gutenprint-plugin</packagereq>
<packagereq type="optional">gv</packagereq>
<packagereq type="optional">gwenview</packagereq>
<packagereq type="optional">inkscape</packagereq>
@ -6234,7 +6231,7 @@
<default>true</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq type="mandatory">java-1.4.2-gcj-compat</packagereq>
<packagereq type="mandatory">java-1.5.0-gcj</packagereq>
<packagereq type="mandatory">libgcj</packagereq>
</packagelist>
</group>
@ -6363,8 +6360,8 @@
<packagereq type="mandatory">ant</packagereq>
<packagereq type="mandatory">eclipse-ecj</packagereq>
<packagereq type="mandatory" basearchonly="true">gcc-java</packagereq>
<packagereq type="mandatory">gjdoc</packagereq>
<packagereq type="mandatory">java-1.4.2-gcj-compat-devel</packagereq>
<packagereq type="mandatory">sinjdoc</packagereq>
<packagereq type="mandatory">java-1.5.0-gcj-devel</packagereq>
<packagereq type="mandatory">libgcj-devel</packagereq>
<packagereq type="default">ant-antlr</packagereq>
<packagereq type="default">ant-apache-bcel</packagereq>
@ -6398,8 +6395,6 @@
<packagereq type="default">classpathx-mail-javadoc</packagereq>
<packagereq type="default">cryptix-asn1-javadoc</packagereq>
<packagereq type="default">cryptix-javadoc</packagereq>
<packagereq type="default">gnu-crypto</packagereq>
<packagereq type="default">gnu-crypto-javadoc</packagereq>
<packagereq type="default">gnu-getopt</packagereq>
<packagereq type="default">gnu-getopt-javadoc</packagereq>
<packagereq type="default">jakarta-commons-beanutils</packagereq>
@ -6432,14 +6427,14 @@
<packagereq type="default">jakarta-oro-javadoc</packagereq>
<packagereq type="default">jakarta-taglibs-standard</packagereq>
<packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
<packagereq type="default">java-1.4.2-gcj-compat-src</packagereq>
<packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
<packagereq type="default">java-1.5.0-gcj-src</packagereq>
<packagereq type="default">java_cup</packagereq>
<packagereq type="default">java_cup-javadoc</packagereq>
<packagereq type="default">java_cup-manual</packagereq>
<packagereq type="default">jdepend</packagereq>
<packagereq type="default">jdepend-demo</packagereq>
<packagereq type="default">jdepend-javadoc</packagereq>
<packagereq type="default">jessie</packagereq>
<packagereq type="default">jlex</packagereq>
<packagereq type="default">jlex-javadoc</packagereq>
<packagereq type="default">junit</packagereq>
@ -6470,7 +6465,6 @@
<packagereq type="default">xerces-j2-javadoc-other</packagereq>
<packagereq type="default">xerces-j2-javadoc-xni</packagereq>
<packagereq type="default">xerces-j2-scripts</packagereq>
<packagereq type="default">xml-commons</packagereq>
<packagereq type="default">xml-commons-apis</packagereq>
<packagereq type="default">xml-commons-apis-javadoc</packagereq>
<packagereq type="default">xml-commons-apis-manual</packagereq>
@ -8027,12 +8021,10 @@
<packagereq type="optional">l2tpd</packagereq>
<packagereq type="optional">netatalk</packagereq>
<packagereq type="optional">netdump-server</packagereq>
<packagereq type="optional">NetworkManager-vpnc</packagereq>
<packagereq type="optional">nsd</packagereq>
<packagereq type="optional">oidentd</packagereq>
<packagereq type="optional">openldap-servers</packagereq>
<packagereq type="optional">openswan</packagereq>
<packagereq type="optional">openvpn</packagereq>
<packagereq type="optional">privoxy</packagereq>
<packagereq type="optional">puppet-server</packagereq>
<packagereq type="optional">quagga</packagereq>
@ -10666,11 +10658,16 @@
<default>false</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">NetworkManager-openvpn</packagereq>
<packagereq type="default">NetworkManager-vpnc</packagereq>
<packagereq type="default">ipsec-tools</packagereq>
<packagereq type="default">nmap</packagereq>
<packagereq type="default">openldap-clients</packagereq>
<packagereq type="default">openvpn</packagereq>
<packagereq type="default">samba-client</packagereq>
<packagereq type="default">screen</packagereq>
<packagereq type="default">vnc</packagereq>
<packagereq type="default">vpnc</packagereq>
<packagereq type="default">xdelta</packagereq>
<packagereq type="default">zisofs-tools</packagereq>
<packagereq type="default">zsh</packagereq>
@ -10695,6 +10692,7 @@
<packagereq type="optional">connect-proxy</packagereq>
<packagereq type="optional">convmv</packagereq>
<packagereq type="optional">crack</packagereq>
<packagereq type="optional">crash</packagereq>
<packagereq type="optional">createrepo</packagereq>
<packagereq type="optional">dar</packagereq>
<packagereq type="optional">denyhosts</packagereq>
@ -10798,7 +10796,6 @@
<packagereq type="optional">viaideinfo</packagereq>
<packagereq type="optional">vlock</packagereq>
<packagereq type="optional">vnstat</packagereq>
<packagereq type="optional">vpnc</packagereq>
<packagereq type="optional">wifiroamd</packagereq>
<packagereq type="optional">wine</packagereq>
<packagereq type="optional">wireshark-gnome</packagereq>

2
config/minimal-manifest
View File

@ -2,12 +2,10 @@ kernel
xorg-x11-fonts-ISO8859-1-75dpi
busybox-anaconda
dejavu-lgc-fonts
xen
xorg-x11-fonts-base
memtest86+
xorg-x11-drivers
selinux-policy-targeted
kernel-xen
anaconda-runtime
man
joe

15
config/pungi-fc6.i386
View File

@ -1,15 +0,0 @@
# Pungi config file
#
[default]
product_name = Fedora Core
product_path = Fedora
iso_basename = FC
comps = /etc/pungi/comps-fc6.xml
yumconf = /etc/pungi/yum.conf.fc6.i386
destdir = /srv/pungi
cachedir = /srv/pungi/cache
arch = i386
version = 6
discs = 5
getsource = Yes

15
config/pungi-fc6.ppc
View File

@ -1,15 +0,0 @@
# Pungi config file
#
[default]
product_name = Fedora Core
product_path = Fedora
iso_basename = FC
comps = /etc/pungi/comps-fc6.xml
yumconf = /etc/pungi/yum.conf.fc6.ppc
destdir = /srv/pungi
cachedir = /srv/pungi/cache
arch = ppc
version = 6
discs = 6
getsource = Yes

15
config/pungi-fc6.source
View File

@ -1,15 +0,0 @@
# Pungi config file
#
[default]
product_name = Fedora Core
product_path = Fedora
iso_basename = FC
comps = /etc/pungi/comps-fc6.xml
yumconf = /etc/pungi/yum.conf.fc6.x86_64
destdir = /srv/pungi
cachedir = /srv/pungi/cache
arch = source
version = 6
discs = 4
getsource = Yes

15
config/pungi-fc6.x86_64
View File

@ -1,15 +0,0 @@
# Pungi config file
#
[default]
product_name = Fedora Core
product_path = Fedora
iso_basename = FC
comps = /etc/pungi/comps-fc6.xml
yumconf = /etc/pungi/yum.conf.fc6.x86_64
destdir = /srv/pungi
cachedir = /srv/pungi/cache
arch = x86_64
version = 6
discs = 6
getsource = Yes

28
config/pungi.conf
View File

@ -2,15 +2,19 @@
#
[default]
product_name = Fedora Core
product_path = Fedora
iso_basename = FC
comps = /etc/pungi/comps-fc7.xml
manifest = /etc/pungi/minimal-manifest
yumconf = /etc/pungi/yum.conf.x86_64
destdir = /srv/pungi
cachedir = /srv/pungi/cache
arch = x86_64
version = development
discs = 1
getsource = Yes
product_name = Fedora # The name used during install
product_path = Fedora # The directory where RPMS go
iso_basename = F # The first part of the iso file name
bugurl = http://bugzilla.redhat.com # Used for betanag
comps = /etc/pungi/comps-fc7.xml # Used to define package groupings and default installs
manifest = /etc/pungi/minimal-manifest # Used to determine what to bring in. Supports Kickstart syntax
yumconf = /etc/pungi/yum.conf.x86_64 # Used to determine where to gather packages from
destdir = /srv/pungi/Fedora # Top level compose directory, must be clean
cachedir = /srv/pungi/cache # Cache used for repeat runs
arch = x86_64 # What arch to compose (must be same arch as system)
version = development # Used both in install and part of the dest tree
flavor = Custom # Further define a given cut of the package set
discs = 1 # Number of discs needed to fit data.
#cdsize = 4608.0 Not used if disc count is 1
getsource = Yes # Used to determine if we want source packages or not

44
config/yum.conf.fc6.i386
View File

@ -1,44 +0,0 @@
[main]
#keepcache=0
#debuglevel=2
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1
exactarch=1
obsoletes=1
gpgcheck=1
reposdir=./
#plugins=1
metadata_expire=1800
#exclude=\*.i?86
# PUT YOUR REPOS HERE OR IN separate files named file.repo
# in /etc/yum.repos.d
[core]
name=Fedora Core - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
enabled=1
gpgcheck=0
[core-source]
name=Fedora Core Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-source-6&arch=i386
enabled=1
gpgcheck=0
[updates]
name=Fedora Core Updates - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/i386
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
enabled=1
gpgcheck=0
[updates-source]
name=Fedora Core Updates Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-fc6&arch=i386
enabled=1
gpgcheck=0

44
config/yum.conf.fc6.ppc
View File

@ -1,44 +0,0 @@
[main]
#keepcache=0
#debuglevel=2
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1
exactarch=1
obsoletes=1
gpgcheck=1
reposdir=./
#plugins=1
metadata_expire=1800
#exclude=\*.i?86
# PUT YOUR REPOS HERE OR IN separate files named file.repo
# in /etc/yum.repos.d
[core]
name=Fedora Core - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/ppc/os/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
enabled=1
gpgcheck=0
[core-source]
name=Fedora Core Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-source-6&arch=ppc
enabled=1
gpgcheck=0
[updates]
name=Fedora Core Updates - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/ppc
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
enabled=1
gpgcheck=0
[updates-source]
name=Fedora Core Updates Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-fc6&arch=ppc
enabled=1
gpgcheck=0

44
config/yum.conf.fc6.x86_64
View File

@ -1,44 +0,0 @@
[main]
#keepcache=0
#debuglevel=2
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1
exactarch=1
obsoletes=1
gpgcheck=1
reposdir=./
#plugins=1
metadata_expire=1800
#exclude=\*.i?86
# PUT YOUR REPOS HERE OR IN separate files named file.repo
# in /etc/yum.repos.d
[core]
name=Fedora Core - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/x86_64/os/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
enabled=1
gpgcheck=0
[core-source]
name=Fedora Core Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-source-6&arch=x86_64
enabled=1
gpgcheck=0
[updates]
name=Fedora Core Updates - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/x86_64
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
enabled=1
gpgcheck=0
[updates-source]
name=Fedora Core Updates Source - 6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-fc6&arch=x86_64
enabled=1
gpgcheck=0

2
pungi
View File

@ -140,7 +140,7 @@ if __name__ == '__main__':
import sys
def get_arguments():
parser = OptionParser(version="%prog 0.2.8")
parser = OptionParser(version="%prog 0.3.0")
parser.add_option("--destdir", default="*CONFFILE*", dest="destdir",
help='destination directory (defaults to current directory)')
parser.add_option("-c", "--conf", default='/etc/pungi/pungi.conf', dest="config",

27
pungi.spec
View File

@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: pungi
Version: 0.2.8
Version: 0.3.0
Release: 1%{?dist}
Summary: Distribution compose tool
@ -46,6 +46,31 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Apr 02 2007 Jesse Keating <jkeating@redhat.com> - 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 <jkeating@redhat.com> - 0.2.8-1
- Call createrepo ourselves for the tree, not buildinstall's job
- Convert from commands to subprocess for things we call out

2
setup.py
View File

@ -2,7 +2,7 @@ from distutils.core import setup
import glob
setup(name='pungi',
version='0.2.8',
version='0.3.0',
description='Distribution compose tool',
author='Jesse Keating',
author_email='jkeating@redhat.com',