Clean up firmware code in livecdfs-update.sh, add beginnings of new firmware code...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1302 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 182dafeeea30f5a370247c43d7a24af1cf4061d0..bce6946d09a1d77eceb450af6612523b992e9b0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/generic_stage_target.py,
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  Clean up firmware code in livecdfs-update.sh, add beginnings of new firmware
+  code in livecd-stage2-controller.sh, and fix output for USE in make.conf to
+  80 columns. This is catalyst 2.0.6_pre5 for testing.
+
   14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:
   Apparently, python doesn't like it when you put a set of comments in front

diff --git a/catalyst b/catalyst
index a9bd65387155c6f699197e32e0bab33d2217e6e9..6914f4d51d7f1174b0bb5b55c33cbabab21187eb 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre4"
+__version__="2.0.6_pre5"
 
 conf_values={}
 

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 50d84bdabec3a0fed6ac1aaa2aa037209b9b7908..96ad3dcbcf7379f7b98251286a55618e733fd2fd 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1071,7 +1071,7 @@ class generic_stage_target(generic_target):
                                myusevars.extend(self.settings["use"])
 
                        if myusevars:
-                               myf.write("# These are the USE flags that were used in addition to what is provided by the profile.\n")
+                               myf.write("# These are the USE flags that were used in addition to what is provided by the\nprofile used for building.\n")
                                myusevars = sorted(set(myusevars))
                                myf.write('USE="'+string.join(myusevars)+'"\n')
 

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 2b2920ad355485e7d7056fa30d596a4d2b2ce9a4..e5877247093b6b46378b0dc3700ca8ce89bf1f4d 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -95,12 +95,23 @@ case $1 in
                ;;
        clean)
                find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
+               find ${clst_chroot_path}/usr/lib32 -iname "*.pyc" -exec rm -f {} \;
+               find ${clst_chroot_path}/usr/lib64 -iname "*.pyc" -exec rm -f {} \;
                ;;
        bootloader)
                shift
                # Here is where we poke in our identifier
                touch $1/livecd
-               
+
+               # We create a firmware directory, if necessary
+               if [ -e ${clst_chroot_path}/lib/firmware.tar.bz2 ]
+               then
+                       echo "Creating firmware directory in $1"
+                       mkdir -p $1/firmware
+                       # TODO: Unpack firmware into $1/firmware and remove it from the
+                       # chroot so newer livecd-tools/genkernel can find it and unpack it.
+               fi
+
                # Move over the readme (if applicable)
                if [ -n "${clst_livecd_readme}" ]
                then
@@ -116,7 +127,7 @@ case $1 in
                then
                        cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1
                fi
-               
+
                ${clst_sharedir}/targets/support/bootloader-setup.sh $1
                ;;
     unmerge)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a5aec3cb5634652ede208d386fc57147fd44e8ad..c5d8a48dc4a29d3681223ff8ce4e412f05790d1e 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -230,9 +230,6 @@ then
        cd /lib/firmware
        /bin/tar cjpf /lib/firmware.tar.bz2 .
        rm -rf /lib/firmware/*
-       mkdir -p /usr/lib/hotplug
-       rm -rf /usr/lib/hotplug/firmware
-       ln -sf /lib/firmware /usr/lib/hotplug/firmware
 fi
 
 # Clear out locales