unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 69 ++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 8 deletions(-)
New commits:
commit 5a069d46418a2eb65e517238870886e8cdd99f3a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 15:13:48 2009 +0100
Update respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 53d374e..0e16203 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -1,5 +1,35 @@
#!/bin/bash
+#
+# Copyright 2008-2009 Jeroen van Meeuwen <kanarip(a)fedoraunity.org>
+#
+# This is a script to automate respins for both installation and live media.
+#
+# The script makes the following assumptions:
+#
+# - you have sudo configured for the user you are executing the script with, for
+# at least the following commands:
+#
+# 1) sudo make install (in /tmp/spin-kickstarts)
+# 2) sudo ./revisor.py (if running from source)
+# 3) sudo revisor (if running from installed RPMs)
+# 4) sudo mkdir -p
+# 5) sudo mv
+#
+# - you have all the required packages installed (see $revisor_deps)
+# - you have enough disk space (haha, no estimate here)
+#
+# And, last but not least, you have configured the following in
+# /etc/mock/site-defaults.cfg:
+#
+# # bind mount plugin is enabled by default but has no configured directories to mount
+# # config_opts['plugin_conf']['bind_mount_enable'] = True
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/selinux/', '/selinux/' ))
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/revisor/', '/srv/revisor/' ))
+# # (optional)
+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/tmp/revisor-yumcache/', '/var/tmp/revisor-yumcache/' ))
+#
+
function usage() {
echo "$0 [options]"
}
@@ -8,6 +38,13 @@ if [ $# -eq 0 ]; then
usage
fi
+revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
+ anaconda-runtime squashfs-tools busybox-anaconda notify-python usermode
+ pam python automake intltool gettext desktop-file-utils glib2-devel gcc
+ cobbler koan deltarpm pygtk pygtk2-libglade gnome-python2-gconf
+ system-config-kickstart jigdo livecd-tools python-virtinst git sudo
+ spin-kickstarts mock"
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -21,6 +58,17 @@ while [ $# -gt 0 ]; do
esac
done
+# Thanks. Now, before we do anything, let's check if the packages we depend
+# on are actually installed
+
+for pkg in $revisor_deps; do
+ if [ -z "`rpm -qv $pkg`" ]; then
+ pkg_error="$pkg_error\nPackage $pkg not installed"
+ fi
+done
+
+[ ! -z "$pkg_error" ] && echo -en "ERROR:\n$pkg_error" && exit 1
+
if [ -d ~/devel/revisor/master ]; then
cd ~/devel/revisor/master
@@ -64,13 +112,18 @@ for version in $VERSIONS; do
sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
done
- mock -r fedora-$version-$arch clean && \
- mock -r fedora-$version-$arch init && \
- mock -r fedora-$version-$arch install $revisor_deps && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ mock -r fedora-$version-$arch clean | tee revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch init | tee -a revisor-f$version-$arch-respin.log && \
+ mock -r fedora-$version-$arch install $revisor_deps | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --destination-directory /srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log
+
+ [ $? -gt 0 ] && echo "Spin f$version-$arch-respin failed, log file attached" | mail -s "f$version-$arch-respin failed" -a revisor-f$version-$arch-respin.log "kanarip(a)kanarip.com"
+
+ sudo mkdir -p /srv/revisor/$datestamp/f$version-$arch-respin/log/
+ sudo mv revisor-f$version-$arch-respin.log /srv/revisor/$datestamp/f$version-$arch-respin/log/
done
done
\ No newline at end of file
15 years, 2 months
2 commits - revisor/base.py unity/scripts
by Jeroen van Meeuwen
revisor/base.py | 2 +-
unity/scripts/respin.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit e53042354976bc6463cc7e601229fa3f367797fb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:58:46 2009 +0100
Append the package, not extend like if the pkg name was a list... ;-)
diff --git a/revisor/base.py b/revisor/base.py
index 77cf11b..41bd450 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -345,7 +345,7 @@ class RevisorBase:
if self.cfg.kickstart_uses_pkgsack_exclude:
for pkg in excludedList:
- self.cfg.yumobj.conf.exclude.extend(pkg)
+ self.cfg.yumobj.conf.exclude.append(pkg)
self.log.debug(_("Using pkgsack excludes, the list of packages to exclude is now: %r") % self.cfg.yumobj.conf.exclude, level=9)
commit ba9278a368882916c384dc0fe073c31813251d4c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:58:09 2009 +0100
Fix spin-kickstarts for respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 5cbf9e6..53d374e 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -35,7 +35,19 @@ else
revisor_cmd="sudo revisor --cli"
fi
+# Cheat our way through spin-kickstarts
+[ -d /tmp/spin-kickstarts ] && rm -rf /tmp/spin-kickstarts
+git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
+
for version in $VERSIONS; do
+
+ # Build the spin-kickstarts package for this version
+ ourwd=`pwd`
+ cd /tmp/spin-kickstarts
+ [ ! -z "`git branch -la | grep '^ F-$version'`" ] && git checkout F-$version || git checkout --track -b F-$version origin/F-$version
+ autoreconf -v && ./configure --prefix=/usr && sudo make install
+ cd $ourwd
+
for arch in $ARCHES; do
for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
New commits:
commit 4dd2b6d4ea0a8309033e6c601a64376ec9da46a5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 14:41:12 2009 +0100
A respin shell script
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
new file mode 100755
index 0000000..5cbf9e6
--- /dev/null
+++ b/unity/scripts/respin.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+function usage() {
+ echo "$0 [options]"
+}
+
+if [ $# -eq 0 ]; then
+ usage
+fi
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ --version)
+ VERSIONS="$VERSIONS $2"
+ shift; shift
+ ;;
+ --arch)
+ ARCHES="$ARCHES $2"
+ shift; shift
+ ;;
+ esac
+done
+
+if [ -d ~/devel/revisor/master ]; then
+ cd ~/devel/revisor/master
+
+ git pull
+
+ autoreconf -v && ./configure
+
+ ./switchhere --yes
+
+ revisor_cmd="sudo ./revisor.py --cli"
+else
+ revisor_cmd="sudo revisor --cli"
+fi
+
+for version in $VERSIONS; do
+ for arch in $ARCHES; do
+ for spin in `${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ f$version-$arch-" | awk '{print $1}'`; do
+
+ datestamp=`date +'%Y%m%d'`
+
+ ${revisor_cmd} --config /etc/revisor-unity/f$version-live-respin.conf \
+ --model $spin --debug 9 --clean-up 2 \
+ --destination-directory /srv/revisor/$datestamp/ \
+ --report-sizes 2>&1 | tee revisor-$spin.log
+
+ [ $? -gt 0 ] && echo "Spin $spin failed, log file attached" | mail -s "$spin failed" -a revisor-$spin.log "kanarip(a)kanarip.com"
+
+ sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
+ sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ done
+
+ mock -r fedora-$version-$arch clean && \
+ mock -r fedora-$version-$arch init && \
+ mock -r fedora-$version-$arch install $revisor_deps && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ done
+done
\ No newline at end of file
15 years, 2 months
unity/conf
by Jeroen van Meeuwen
unity/conf/f10-live-respin.conf | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 784beca8be4ae7c00f9d11335045112cfbfc8ebb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Feb 23 12:33:51 2009 +0100
Update descriptions on these spins
diff --git a/unity/conf/f10-live-respin.conf b/unity/conf/f10-live-respin.conf
index 5107638..61a5e23 100644
--- a/unity/conf/f10-live-respin.conf
+++ b/unity/conf/f10-live-respin.conf
@@ -31,7 +31,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -49,7 +49,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -67,7 +67,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-i386-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = i386
version = 10
@@ -193,7 +193,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -211,7 +211,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -229,7 +229,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
version = 10
@@ -355,7 +355,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -373,7 +373,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -391,7 +391,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
version = 10
@@ -517,7 +517,7 @@ description = Fedora Unity Live AOS Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-aos-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-AOS-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
@@ -535,7 +535,7 @@ description = Fedora Unity Live BrOffice.Org Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-broffice.org-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-BrOffice.Org-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
@@ -553,7 +553,7 @@ description = Fedora Unity Live Desktop Re-Spin Model for Fedora (Rawhide)
main = /etc/revisor-unity/conf.d/revisor-f10-ppc64-live-desktop-respin.conf
product_name = Fedora
product_path = Packages
-iso_basename = Fedora-Unity-$datestamp
+iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
version = 10
15 years, 2 months
revisor/pungi.py revisor/splittree.py
by Jeroen van Meeuwen
revisor/pungi.py | 2 +-
revisor/splittree.py | 43 +++++++++++++++++++++----------------------
2 files changed, 22 insertions(+), 23 deletions(-)
New commits:
commit 1c7a4e7ae7fed5cfd9b8ac3a580698bd4af3f700
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 03:08:04 2009 +0100
Update how sizes are obtained from files and how the size of a tree is estimated
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 584a4a2..e79fba3 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -454,7 +454,7 @@ cost=500
for disc in range(1, timber.total_discs + 1):
if not we_are_ok: continue
- disc_size = timber.getSize("%s-disc%d" % (timber.dist_dir, disc), blocksize=True)
+ disc_size = timber.getIsoSize("%s-disc%d" % (timber.dist_dir, disc))
if disc_size > timber.target_size:
self.log.debug(_("Disc %s #%d is oversized (%r > %r)") % (self.cfg.mediatypes[discdir]["label"], disc, disc_size, timber.target_size), level=9)
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 94d42fd..e67b01e 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -26,6 +26,7 @@ import getopt
import time
import types
import rpm
+import subprocess
# Translation
from rhpl.translate import _
@@ -86,21 +87,19 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
self.logfile = []
- def getSize(self, path, blocksize=None):
- """Gets the size as reported by du -sL"""
-
- if blocksize:
- p = os.popen("du -slL --block-size=1 %s" % path, 'r')
- thesize = p.read()
- p.close()
- thesize = long(string.split(thesize)[0])
- return thesize
- else:
- p = os.popen("du -slLh %s" % path, 'r')
- thesize = p.read()
- p.close()
- thesize = string.split(thesize)[0]
- return thesize
+
+ def getIsoSize(self, path):
+ """Gets the size that a path would take in iso form"""
+
+ call = ['/usr/bin/genisoimage', '-U', '-J', '-R', '-T', '-m',
+ 'repoview', '-m', 'images/boot.iso', '-print-size',
+ '-quiet', path]
+
+ isosize = int(subprocess.Popen(call,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE).communicate()[0])
+
+ return isosize * 2048
def reportSizes(self, disc, firstpkg=None, lastpkg=None):
"""appends to self.logfile"""
@@ -110,7 +109,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
if lastpkg:
self.logfile.append("Last package on disc%d : %s" % (disc, lastpkg))
- discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
+ discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
def createDiscInfo(self, discnumber):
@@ -245,8 +244,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
self.log.debug(_("pkg %s already included, skipping") % pkg, level=9)
continue
- curused = self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1)
- filesize = self.getSize("%s/%s/%s" % (self.dist_dir, pkgdir, pkg), blocksize=1)
+ curused = self.getIsoSize("%s-disc%s" % (self.dist_dir, disc))
+ filesize = os.stat("%s/%s/%s" % (self.dist_dir, pkgdir, pkg)).st_size
newsize = filesize + curused
# compensate for the size of the comps package which has yet to be created
@@ -298,7 +297,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
sizes = []
for i in range(0, len(self.src_list)):
- sizes.append([self.getSize("%s-disc%d" % (self.dist_dir, self.src_list[i]), blocksize=1), self.src_list[i]])
+ sizes.append([self.getIsoSize("%s-disc%d" % (self.dist_dir, self.src_list[i])), self.src_list[i]])
sizes.sort()
return sizes[0]
@@ -314,7 +313,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
for srpm in os.listdir("%s" % self.src_dir):
if not srpm.endswith('.rpm'):
continue
- srpm_size = self.getSize("%s/%s" % (self.src_dir, srpm), blocksize=1)
+ srpm_size = os.stat("%s/%s" % (self.src_dir, srpm)).st_size
srpm_list.append([srpm_size, srpm])
srpm_list.sort()
@@ -325,12 +324,12 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
# if it isn't, pull it out of the list. If there's only
# one disk make loud noises over the overflow
for disc in self.src_list:
- if self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1) > self.target_size:
+ if self.getIsoSize("%s-disc%s" % (self.dist_dir, disc)) > self.target_size:
if len(self.src_list) < 2:
self.logfile.append("Overflowing %s on disc%d" % (srpm_list[i][1], disc))
break
else:
- discsize = self.getSize("%s-disc%d" % (self.dist_dir, disc))
+ discsize = self.getIsoSize("%s-disc%d" % (self.dist_dir, disc))
self.logfile.append("%s-disc%d size: %s" % (self.arch, disc, discsize))
self.src_list.pop(self.src_list.index(disc))
os.link("%s/%s" % (self.src_dir, srpm_list[i][1]),
15 years, 2 months
3 commits - revisor/__init__.py.in revisor/splittree.py unity/conf
by Jeroen van Meeuwen
revisor/__init__.py.in | 2 +-
revisor/splittree.py | 4 ++--
unity/conf/conf.d/fedora-rawhide-single-cd.cfg | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 94d44cef70584a408ad03fceeddc12c883f72bbb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 02:41:10 2009 +0100
Fix typo
diff --git a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
index f9c1d11..6b7dc15 100644
--- a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
+++ b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
@@ -1,3 +1,3 @@
-%packagesv --nobase
+%packages --nobase
@base --nodefaults
%end
commit 7a31469d57ca8c243d98d44fd44011731c6bce94
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Feb 22 02:24:48 2009 +0100
Workaround from jkeating's pungi for #485167
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 21b0fd5..94d42fd 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -90,13 +90,13 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
"""Gets the size as reported by du -sL"""
if blocksize:
- p = os.popen("du -sL --block-size=1 %s" % path, 'r')
+ p = os.popen("du -slL --block-size=1 %s" % path, 'r')
thesize = p.read()
p.close()
thesize = long(string.split(thesize)[0])
return thesize
else:
- p = os.popen("du -sLh %s" % path, 'r')
+ p = os.popen("du -slLh %s" % path, 'r')
thesize = p.read()
p.close()
thesize = string.split(thesize)[0]
commit e08a90073f19c5e7cfb9703aa0fc3a09c93c6ad5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 18:52:58 2009 +0100
Update __init__.py.in to ignore errors on rmtree() when unmounts have failed
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 4919188..6585844 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -516,7 +516,7 @@ class Revisor:
# Remove our directories in the working directory
for dir in [ "revisor-pungi", "revisor", "revisor-rundir" ]:
if os.access(os.path.join(self.base.cfg.working_directory, dir), os.R_OK):
- shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir))
+ shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir), ignore_errors=True)
if self.base.cfg.clean_up > 1:
# Remove everything
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/mock_respins.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3254d2c4b72be476f96149a7a814aa7505fe888c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:35:56 2009 +0100
Fix typo mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index cae0e2f..02493a6 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -19,7 +19,7 @@ fi
while [ $# -gt 0 ]; do
case $1 in
--version)
- version="$versions $2"
+ versions="$versions $2"
shift; shift
;;
--arch)
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/mock_respins.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
New commits:
commit dc69faa86a738250306acae642e839f7c8793ec2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:32:30 2009 +0100
Even more improvements to mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index 49c614b..cae0e2f 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -7,6 +7,15 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
system-config-kickstart jigdo livecd-tools python-virtinst git sudo
spin-kickstarts mock"
+function usage() {
+ echo "$0 [--version v1 [--version v2]] [--arch a1 [--arch a2]]"
+ exit 1
+}
+
+if [ $# -eq 0 ]; then
+ usage
+fi
+
while [ $# -gt 0 ]; do
case $1 in
--version)
@@ -17,6 +26,9 @@ while [ $# -gt 0 ]; do
arches="$arches $2"
shift; shift
;;
+ *)
+ usage
+ ;;
esac
done
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/mock_respins.sh | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 08305194e9ff093d23274a757e9407b697a87620
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 16:30:26 2009 +0100
Update mock_respins.sh
diff --git a/unity/scripts/mock_respins.sh b/unity/scripts/mock_respins.sh
index ebd829d..49c614b 100755
--- a/unity/scripts/mock_respins.sh
+++ b/unity/scripts/mock_respins.sh
@@ -10,7 +10,7 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
while [ $# -gt 0 ]; do
case $1 in
--version)
- version=$2
+ version="$versions $2"
shift; shift
;;
--arch)
@@ -20,12 +20,14 @@ while [ $# -gt 0 ]; do
esac
done
-for arch in $arches; do
- mock -v -r fedora-$version-$arch init && \
- mock -v -r fedora-$version-$arch install $revisor_deps && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
- echo -en "rm -rf /var/lib/rpm/__db.00*\n" | mock -r fedora-$version-$arch shell
- echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f10-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
-done
+for version in $versions; do
+ for arch in $arches; do
+ mock -r fedora-$version-$arch init && \
+ mock -r fedora-$version-$arch install $revisor_deps && \
+ echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./switchhere --yes\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r fedora-$version-$arch shell
+ echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r fedora-$version-$arch shell
+ echo -en "cd /revisor; ./revisor.py --cli --config /etc/revisor-unity/f$version-install-respin.conf --model f$version-$arch-respin --debug 9\n" | mock -r fedora-$version-$arch shell;
+ done
+done
\ No newline at end of file
15 years, 2 months
2 commits - intltool-extract intltool-merge intltool-update revisor/__init__.py.in revisor/plugins.py
by Jeroen van Meeuwen
intltool-extract | 1 +
intltool-merge | 1 +
intltool-update | 1 +
revisor/__init__.py.in | 2 +-
revisor/plugins.py | 4 ++--
5 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 8ff6cfc5676e96eef1af7d416ce3b4ba9ab6253f
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 04:00:33 2009 +0100
Cosmetic
diff --git a/revisor/plugins.py b/revisor/plugins.py
index 58d0f8e..cb60433 100644
--- a/revisor/plugins.py
+++ b/revisor/plugins.py
@@ -35,14 +35,14 @@ class RevisorPlugins:
'modcomposer': False,
'moddelta': False,
'modgui': False,
+ 'modhub': False,
'modisolinux': False,
'modjigdo': False,
'modmock': False,
'modrebrand': False,
'modreuseinstaller': False,
'modvirt': False,
- 'modserver': False,
- 'modhub': False
+ 'modserver': False
}
self.check_plugins(init=init)
commit 3634e195b92bee44ae83ca338118ce93a9ad3bbf
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Feb 20 04:00:09 2009 +0100
Update repo
diff --git a/intltool-extract b/intltool-extract
new file mode 120000
index 0000000..9fb216d
--- /dev/null
+++ b/intltool-extract
@@ -0,0 +1 @@
+/usr/bin/intltool-extract
\ No newline at end of file
diff --git a/intltool-merge b/intltool-merge
new file mode 120000
index 0000000..fcebf47
--- /dev/null
+++ b/intltool-merge
@@ -0,0 +1 @@
+/usr/bin/intltool-merge
\ No newline at end of file
diff --git a/intltool-update b/intltool-update
new file mode 120000
index 0000000..000b70a
--- /dev/null
+++ b/intltool-update
@@ -0,0 +1 @@
+/usr/bin/intltool-update
\ No newline at end of file
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 97cba53..4919188 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -101,7 +101,7 @@ class Revisor:
"GUI. Does not fallback to " + \
"CLI and thus shows GUI " + \
"related errors"))
- "
+
runtime_group.add_option( "--list-models",
dest = "list_models",
action = "store_true",
15 years, 3 months