From: "Wiktor W Brodlo" <wiktor@brodlo.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/
Date: Sun, 26 Jun 2011 19:05:11 +0000 (UTC) [thread overview]
Message-ID: <0bc22cd7337861035c985fea6787c1533f41c691.wiktor@gentoo> (raw)
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=proj/anaconda.git;a=commit;h=0bc22cd7
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
log = logging.getLogger("anaconda")
@@ -62,6 +58,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self.osimg = 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=[_("Exit installer")])
# raise SystemExit(1)
+ # _getLiveSize() needs to be adjusted but more measurements are needed
def _getLiveSize(self):
st = os.statvfs(PRODUCT_PATH)
compressed_byte_size = st.f_blocks * st.f_bsize
@@ -93,8 +91,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPreInstall(self, anaconda):
self._progress = gentoo.utils.GentooProgress(anaconda)
self._progress.start()
- self._entropy = Entropy()
- self._entropy.connect_progress(self._progress)
self._gentoo_install = gentoo.utils.GentooInstall(anaconda)
# We use anaconda.upgrade as bootloader recovery step
self._bootloader_recovery = 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 installing X works
try:
self._gentoo_install.setup_nvidia_legacy()
except Exception as e:
@@ -163,18 +160,13 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPostInstall(self, anaconda):
- self._gentoo_install.setup_entropy_mirrors()
+ self._gentoo_install.setup_portage_mirrors()
self._gentoo_install.language_packs_install()
self._gentoo_install.emit_install_done()
storage.writeEscrowPackets(anaconda)
self._gentoo_install.destroy()
- if hasattr(self._entropy, "shutdown"):
- self._entropy.shutdown()
- else:
- self._entropy.destroy()
- EntropyCacher().stop()
const_kill_threads()
anaconda.intf.setInstallProgressClass(None)
@@ -280,12 +272,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
"gentoomce", "quiet", "scandelay=", "doslowusb", "docrypt",
"dokeymap", "keymap=", "radeon.modeset=", "modeset=", "nomodeset"]
- # Gentoo MCE install -> MCE support
- # use reference, yeah
- cmdline = 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 = ' '.join([x for x in cmdline.split() if \
# not x.startswith("vga=")])
- # Since Gentoo 5.4, we also write to /etc/default/gentoo-grub
grub_gentoo_file = self._root + "/etc/default/gentoo-grub"
grub_gentoo_dir = os.path.dirname(grub_gentoo_file)
if not os.path.isdir(grub_gentoo_dir):
next reply other threads:[~2011-06-26 19:05 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-26 19:05 Wiktor W Brodlo [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 4:28 [gentoo-commits] proj/anaconda:master commit in: gentoo/ Wiktor W Brodlo
2011-08-22 4:28 Wiktor W Brodlo
2011-08-21 1:30 Wiktor W Brodlo
2011-08-21 1:20 Wiktor W Brodlo
2011-08-21 1:13 Wiktor W Brodlo
2011-08-21 0:34 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-17 0:25 Wiktor W Brodlo
2011-08-11 12:58 Wiktor W Brodlo
2011-07-21 22:18 Wiktor W Brodlo
2011-07-21 22:02 Wiktor W Brodlo
2011-07-21 21:14 Wiktor W Brodlo
2011-07-21 20:53 Wiktor W Brodlo
2011-07-12 3:31 Wiktor W Brodlo
2011-07-12 1:09 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-10 15:36 Wiktor W Brodlo
2011-07-10 12:13 Wiktor W Brodlo
2011-07-10 3:18 Wiktor W Brodlo
2011-07-08 22:07 Wiktor W Brodlo
2011-07-08 17:54 Wiktor W Brodlo
2011-07-08 17:19 Wiktor W Brodlo
2011-07-08 15:56 Wiktor W Brodlo
2011-07-08 15:27 Wiktor W Brodlo
2011-07-08 14:48 Wiktor W Brodlo
2011-07-08 3:28 Wiktor W Brodlo
2011-07-08 2:35 Wiktor W Brodlo
2011-07-08 1:42 Wiktor W Brodlo
2011-07-08 0:49 Wiktor W Brodlo
2011-07-07 23:57 Wiktor W Brodlo
2011-07-07 15:40 Wiktor W Brodlo
2011-07-07 14:08 Wiktor W Brodlo
2011-07-07 2:31 Wiktor W Brodlo
2011-07-06 20:46 Wiktor W Brodlo
2011-07-06 18:20 Wiktor W Brodlo
2011-07-06 16:42 Wiktor W Brodlo
2011-07-06 14:31 Wiktor W Brodlo
2011-07-06 11:51 Wiktor W Brodlo
2011-07-06 11:19 Wiktor W Brodlo
2011-07-05 20:45 Wiktor W Brodlo
2011-07-05 18:48 Wiktor W Brodlo
2011-07-05 16:09 Wiktor W Brodlo
2011-07-05 15:38 Wiktor W Brodlo
2011-07-05 14:31 Wiktor W Brodlo
2011-07-05 14:07 Wiktor W Brodlo
2011-07-05 13:55 Wiktor W Brodlo
2011-07-05 13:29 Wiktor W Brodlo
2011-07-05 13:22 Wiktor W Brodlo
2011-07-05 13:20 Wiktor W Brodlo
2011-07-05 12:53 Wiktor W Brodlo
2011-07-04 22:47 Wiktor W Brodlo
2011-07-04 22:34 Wiktor W Brodlo
2011-07-04 22:24 Wiktor W Brodlo
2011-07-04 21:19 Wiktor W Brodlo
2011-07-04 21:02 Wiktor W Brodlo
2011-07-04 20:56 Wiktor W Brodlo
2011-07-04 20:52 Wiktor W Brodlo
2011-07-04 16:59 Wiktor W Brodlo
2011-06-27 19:20 Wiktor W Brodlo
2011-06-27 18:27 Wiktor W Brodlo
2011-06-27 13:49 Wiktor W Brodlo
2011-06-27 0:20 Wiktor W Brodlo
2011-06-27 0:05 Wiktor W Brodlo
2011-06-27 0:03 Wiktor W Brodlo
2011-06-26 23:40 Wiktor W Brodlo
2011-06-26 23:28 Wiktor W Brodlo
2011-06-26 21:08 Wiktor W Brodlo
2011-06-26 21:03 Wiktor W Brodlo
2011-06-26 21:03 Wiktor W Brodlo
2011-06-25 1:42 Wiktor W Brodlo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0bc22cd7337861035c985fea6787c1533f41c691.wiktor@gentoo \
--to=wiktor@brodlo.net \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox