8:44 a.m.
revisor/base.py | 22 ++++++++++++++--------
revisor/image.py | 3 +--
unity/conf/f11-live-respin.conf | 2 ++
unity/conf/rawhide-live-respin.conf | 2 ++
unity/scripts/respin.sh | 14 +++++++++++---
5 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 678b19eab2ebc09599aa57bdaeacff1fff7de422
Merge: 0a312e1... 70f7eb9...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu May 14 15:44:08 2009 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 0a312e1f9f0c3b4bd0a811c4b97ebfb80b038e00
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu May 14 15:29:36 2009 +0200
Prevent packages from being added, then removed, and do it the other way around
diff --git a/revisor/base.py b/revisor/base.py
index 2989727..477c56d 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -753,29 +753,35 @@ class RevisorBase:
def pkglist_required(self, mode='installation'):
- required_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['require']), log=self.log)
- suggested_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['suggest']), log=self.log)
- allarch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['allarch']), log=self.log)
- onearch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['onearch']), log=self.log)
-
- packages_to_add = required_pkgs + suggested_pkgs + allarch_pkgs + onearch_pkgs
+ required_pkgs = []
+ suggested_pkgs = []
+ allarch_pkgs = []
+ onearch_pkgs = []
packages_to_skip = []
# These versions do not require you include anything anymore, as they compose
# against the external repositories used to compose the tree, rather then
# the tree itself
- if self.cfg.version_from in [ "F9", "F10", "DEVEL"
] and mode == "installation":
+ if self.cfg.version_from in [ "F9", "F10", "F11",
"DEVEL" ] and mode == "installation":
packages_to_add = []
required_pkgs = ['kernel']
if self.cfg.architecture not in [ "ppc", "ppc64" ]:
required_pkgs.extend(['grub'])
- if self.cfg.version_from not in [ "F10", "DEVEL" ]:
+ if self.cfg.version_from not in [ "F10", "F11",
"DEVEL" ]:
if self.cfg.architecture not in [ "ppc", "ppc64" ]:
required_pkgs.extend(['kernel-xen'])
suggested_pkgs = []
+ else:
+ required_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['require']), log=self.log)
+ suggested_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['suggest']), log=self.log)
+ allarch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['allarch']), log=self.log)
+ onearch_pkgs = revisor.misc.resolve_pkgs(self.cfg.yumobj,
self.cfg.get_package_list(mode, ['onearch']), log=self.log)
+
+ packages_to_add = required_pkgs + suggested_pkgs + allarch_pkgs +
onearch_pkgs
+ packages_to_skip = []
# Make sure that if we are not in respin mode, we add the flexibility of
overriding what we select
# as required, by skipping adding extra or other packages with out list if they
are already in the transaction
commit 7c27628a7cdc4f49c7cdafb0de8de1580854ef24
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu May 14 15:28:36 2009 +0200
Let the filesystem type be ext4
diff --git a/revisor/image.py b/revisor/image.py
index 84bd72d..4680453 100644
--- a/revisor/image.py
+++ b/revisor/image.py
@@ -216,12 +216,11 @@ class
LoopImageCreator(ImageCreator,imgcreate.creator.LoopImageCreator):
self.__image_size = image_size
-# self.__fstype = self.cfg.lm_fstype
+ self.__fstype = self.cfg.lm_fstype
self.__fslabel = self.cfg.lm_fs_label
self.__minsize_KB = 0
self.__blocksize = 4096
- self.__fstype = "ext3"
self.__instloop = None
self.__imgdir = None
diff --git a/unity/conf/f11-live-respin.conf b/unity/conf/f11-live-respin.conf
index 2e25596..444fe52 100644
--- a/unity/conf/f11-live-respin.conf
+++ b/unity/conf/f11-live-respin.conf
@@ -28,6 +28,8 @@ bugurl = http://bugzilla.redhat.com
version = 11
version_from = F11
+lm_fstype = ext4
+
##
## Models
##
diff --git a/unity/conf/rawhide-live-respin.conf b/unity/conf/rawhide-live-respin.conf
index f67cacc..7ad3d13 100644
--- a/unity/conf/rawhide-live-respin.conf
+++ b/unity/conf/rawhide-live-respin.conf
@@ -28,6 +28,8 @@ bugurl = http://bugzilla.redhat.com
version = rawhide
version_from = DEVEL
+lm_fstype = ext4
+
##
## Models
##
commit 913119e2ccd94a6b7f6d2f8a8ef033366debcae8
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Thu May 14 15:28:02 2009 +0200
Wait a little moment to let the tracker pick up the new torrent before the seed
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 8f8f8d2..5beb4e0 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -358,6 +358,10 @@ for version in ${VERSIONS}; do
done
# Make some torrents
+ #
+ # The torrent is called .new initially, so that the tracker picks up
the torrent
+ # before the seeder does. We give the tracker 60 seconds.
+ #
spin_name=`echo $(basename $isoimage) | sed -e 's/.iso//g'`
[ -d $TORRENTDIR/$spin_name/ ] && sudo rm -rf
$TORRENTDIR/$spin_name/
sudo mkdir -p $TORRENTDIR/$spin_name/
@@ -366,13 +370,17 @@ for version in ${VERSIONS}; do
sudo maketorrent-console --piece_size_pow2 19 \
--tracker_name
http://kanarip.kicks-ass.org:6969/announce \
--comment "Fedora Unity ${datestamp}
${version} ${arch} ${media}" \
- --target $TORRENTDIR/$spin_name.torrent \
+ --target $TORRENTDIR/$spin_name.torrent.new \
http://kanarip.kicks-ass.org:6969/announce \
$TORRENTDIR/$spin_name/
- rsync -rltpHvz --progress $TORRENTDIR/$spin_name.torrent
rsync://kanarip.kicks-ass.org/torrent-tracker/.
+ rsync -rltpHvz --progress $TORRENTDIR/$spin_name.torrent.new
rsync://kanarip.kicks-ass.org/torrent-tracker/$spin_name.torrent
+
+ sudo cp $TORRENTDIR/$spin_name.torrent.new
$REVISORDIR/${datestamp}/${spin}/$spin_name.torrent
+
+ sleep 60
- sudo cp $TORRENTDIR/$spin_name.torrent
$REVISORDIR/${datestamp}/${spin}/
+ sudo mv $TORRENTDIR/$spin_name.torrent.new
$TORRENTDIR/$spin_name.torrent
sudo chown -R torrent:torrent $TORRENTDIR