[gentoo-commits] proj/anaconda:master commit in: /, gentoo/

[gentoo-commits] proj/anaconda:master commit in: /, gentoo/

[Wiktor W Brodlo]

commit:     e4519ff2161039db755fe541b54b0b0cf8224ea5
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul  9 16:36:13 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul  9 16:36:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e4519ff2

Preliminary Xorg support

---
 anaconda         |    1 +
 gentoo/livecd.py |    2 +-
 gentoo/utils.py  |   26 +++++++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/anaconda b/anaconda
index 329d92c..fc87336 100755
--- a/anaconda
+++ b/anaconda
@@ -512,6 +512,7 @@ class Anaconda(object):
         self.upgradeSwapInfo = None
         self.use_flags = []
         self._users = None
+        self.xorg = None
 
         # *sigh* we still need to be able to write this out
         self.xdriver = None

diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 9a03445..1ea10f1 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -140,7 +140,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._gentoo_install.setup_sudo()
         self._gentoo_install.setup_audio()
         self._progress.set_fraction(0.3)
-        #self._gentoo_install.setup_xorg()
+        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:

diff --git a/gentoo/utils.py b/gentoo/utils.py
index 67d300f..542da39 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -595,14 +595,26 @@ class GentooInstall:
             source_f.close()
 
     def setup_xorg(self):
+        # These days things should work without xorg.conf
         # Copy current xorg.conf
-        live_xorg_conf = "/etc/X11/xorg.conf"
-        if not os.path.isfile(live_xorg_conf):
-            return
-        xorg_conf = self._root + live_xorg_conf
-        shutil.copy2(live_xorg_conf, xorg_conf)
-        shutil.copy2(live_xorg_conf, xorg_conf+".original")
-
+        #live_xorg_conf = "/etc/X11/xorg.conf"
+        #if not os.path.isfile(live_xorg_conf):
+        #    return
+        #xorg_conf = self._root + live_xorg_conf
+        #shutil.copy2(live_xorg_conf, xorg_conf)
+        #shutil.copy2(live_xorg_conf, xorg_conf+".original")
+        # Packages should depend on Xorg so it will be pulled automatically
+        if self._anaconda.xorg == "fluxbox":
+            self.install_package("x11-wm/fluxbox")
+        if self._anaconda.xorg == "gnome":
+            self.install_package("gnome-base/gnome")
+        if self._anaconda.xorg == "kde":
+            self.install_package("kde-base/kde-meta")
+        if self._anaconda.xorg == "lxde":
+            self.install_package("lxde-base/lxde-meta")
+        if self._anaconda.xorg == "xfce4":
+            self.install_package("xfce-base/xfce4-meta")
+            
     def setup_language(self):
         # Prepare locale variables
 

[gentoo-commits] proj/anaconda:master commit in: /, gentoo/

[Wiktor W Brodlo]

commit:     4402f20224b2cac121b5e788e4395ff4809b6371
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 14 13:34:35 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 14 13:40:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4402f202

fix LC_ALL issue

[gentoo-commits] proj/anaconda:master commit in: /, gentoo/

[Wiktor W Brodlo]

commit:     1c9a3f12702457e3d198a35dd56254367dcc9802
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 00:45:33 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 00:45:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1c9a3f12

genkernel by default

---
 anaconda        |    2 +-
 gentoo/utils.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anaconda b/anaconda
index e99e25a..15a149a 100755
--- a/anaconda
+++ b/anaconda
@@ -472,7 +472,7 @@ class Anaconda(object):
         self.displayMode = None
         self.extraModules = []
         self.firewall = firewall.Firewall()
-        self.genkernel = False
+        self.genkernel = True
         self.id = None
         self._instClass = None
         self._instLanguage = None

diff --git a/gentoo/utils.py b/gentoo/utils.py
index 37660ce..7c57f64 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -891,7 +891,7 @@ class GentooInstall:
             self._progress.set_fraction(0.9)
             subprocess.call(["cp", "-PR", "/lib/modules", self._root+"/lib"])
         else:
-            shutil.copy2("/usr/src/linux-"+self.anaconda.kernel, self._root+"/usr/src/")
+            shutil.copy2("/usr/src/linux-"+self._anaconda.kernel, self._root+"/usr/src/")
             self._progress.set_fraction(0.5)
             self._progress.set_text(_("Compiling your custom kernel"))
             self._anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1")