From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-357766-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Qaue0-0002vy-Ht
for garchives@archives.gentoo.org; Sun, 26 Jun 2011 19:05:29 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6D2951C12B;
Sun, 26 Jun 2011 19:05:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2D6661C12B
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2011 19:05:13 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 90AF01BC01B
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2011 19:05:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 61F9480048
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2011 19:05:11 +0000 (UTC)
From: "Wiktor W Brodlo" <wiktor@brodlo.net>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" <wiktor@brodlo.net>
Message-ID: <0bc22cd7337861035c985fea6787c1533f41c691.wiktor@gentoo>
Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/
X-VCS-Repository: proj/anaconda
X-VCS-Files: gentoo/livecd.py
X-VCS-Directories: gentoo/
X-VCS-Committer: wiktor
X-VCS-Committer-Name: Wiktor W Brodlo
X-VCS-Revision: 0bc22cd7337861035c985fea6787c1533f41c691
Date: Sun, 26 Jun 2011 19:05:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 43fb0621f50f0cd0c1dc7b0b37514d96
commit: 0bc22cd7337861035c985fea6787c1533f41c691
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 19:04:30 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 19:04:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;=
a=3Dcommit;h=3D0bc22cd7
gentoo/livecd.py: Removal of Entropy
---
gentoo/livecd.py | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 1fab963..388d889 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -3,6 +3,8 @@
# livecd.py
#
# Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -41,13 +43,7 @@ import iutil
import logging
from anaconda_log import PROGRAM_LOG_FILE
import gentoo.utils
-from gentoo import Entropy
-
-# Entropy imports
-from entropy.const import etpConst, const_kill_threads
-from entropy.misc import TimeScheduled, ParallelTask
-from entropy.cache import EntropyCacher
-import entropy.tools
+from gentoo import Portage=20
=20
log =3D logging.getLogger("anaconda")
=20
@@ -62,6 +58,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
=20
self.osimg =3D anaconda.methodstr[8:]
# On Gentoo we're using a stage3 as an installation source
+ # FIXME: Replace this with checking for stage3
#if not os.path.ismount(self.osimg):
# anaconda.intf.messageWindow(_("Unable to find image"),
# _("The given location [%s] isn't a valid %s "
@@ -71,6 +68,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# custom_buttons=3D[_("Exit installer")])
# raise SystemExit(1)
=20
+ # _getLiveSize() needs to be adjusted but more measurements are need=
ed
def _getLiveSize(self):
st =3D os.statvfs(PRODUCT_PATH)
compressed_byte_size =3D st.f_blocks * st.f_bsize
@@ -93,8 +91,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPreInstall(self, anaconda):
self._progress =3D gentoo.utils.GentooProgress(anaconda)
self._progress.start()
- self._entropy =3D Entropy()
- self._entropy.connect_progress(self._progress)
self._gentoo_install =3D gentoo.utils.GentooInstall(anaconda)
# We use anaconda.upgrade as bootloader recovery step
self._bootloader_recovery =3D anaconda.upgrade
@@ -135,6 +131,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.setup_audio()
self._gentoo_install.setup_xorg()
self._gentoo_install.remove_proprietary_drivers()
+ # TODO: This needs to be tried and fixed properly on Gentoo once instal=
ling X works
try:
self._gentoo_install.setup_nvidia_legacy()
except Exception as e:
@@ -163,18 +160,13 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
=20
def doPostInstall(self, anaconda):
=20
- self._gentoo_install.setup_entropy_mirrors()
+ self._gentoo_install.setup_portage_mirrors()
self._gentoo_install.language_packs_install()
self._gentoo_install.emit_install_done()
=20
storage.writeEscrowPackets(anaconda)
=20
self._gentoo_install.destroy()
- if hasattr(self._entropy, "shutdown"):
- self._entropy.shutdown()
- else:
- self._entropy.destroy()
- EntropyCacher().stop()
=20
const_kill_threads()
anaconda.intf.setInstallProgressClass(None)
@@ -280,12 +272,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
"gentoomce", "quiet", "scandelay=3D", "doslowusb", "docrypt"=
,
"dokeymap", "keymap=3D", "radeon.modeset=3D", "modeset=3D", =
"nomodeset"]
=20
- # Gentoo MCE install -> MCE support
- # use reference, yeah
- cmdline =3D self._gentoo_install.cmdline
- if Entropy.is_gentoo_mce() and ("gentoomce" not in cmdline):
- cmdline.append("gentoomce")
-
# Setup genkernel (init) keyboard layout
if gk_kbd is not None:
if "dokeymap" not in cmdline:
@@ -458,7 +444,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
#cmdline =3D ' '.join([x for x in cmdline.split() if \
# not x.startswith("vga=3D")])
=20
- # Since Gentoo 5.4, we also write to /etc/default/gentoo-grub
grub_gentoo_file =3D self._root + "/etc/default/gentoo-grub"
grub_gentoo_dir =3D os.path.dirname(grub_gentoo_file)
if not os.path.isdir(grub_gentoo_dir):