| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-14 16:51:33 +0000 (Thu, 14 Feb 2008) |
| 3 |
New Revision: 1302 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/catalyst |
| 8 |
trunk/modules/generic_stage_target.py |
| 9 |
trunk/targets/livecd-stage2/livecd-stage2-controller.sh |
| 10 |
trunk/targets/support/livecdfs-update.sh |
| 11 |
Log: |
| 12 |
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. |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-02-14 03:15:19 UTC (rev 1301) |
| 17 |
+++ trunk/ChangeLog 2008-02-14 16:51:33 UTC (rev 1302) |
| 18 |
@@ -1,6 +1,14 @@ |
| 19 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 20 |
# $Id: $ |
| 21 |
|
| 22 |
+ 14 Feb 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 23 |
+ modules/generic_stage_target.py, |
| 24 |
+ targets/livecd-stage2/livecd-stage2-controller.sh, |
| 25 |
+ targets/support/livecdfs-update.sh: |
| 26 |
+ Clean up firmware code in livecdfs-update.sh, add beginnings of new firmware |
| 27 |
+ code in livecd-stage2-controller.sh, and fix output for USE in make.conf to |
| 28 |
+ 80 columns. This is catalyst 2.0.6_pre5 for testing. |
| 29 |
+ |
| 30 |
14 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 31 |
modules/generic_stage_target.py: |
| 32 |
Apparently, python doesn't like it when you put a set of comments in front |
| 33 |
|
| 34 |
Modified: trunk/catalyst |
| 35 |
=================================================================== |
| 36 |
--- trunk/catalyst 2008-02-14 03:15:19 UTC (rev 1301) |
| 37 |
+++ trunk/catalyst 2008-02-14 16:51:33 UTC (rev 1302) |
| 38 |
@@ -8,7 +8,7 @@ |
| 39 |
import pdb |
| 40 |
|
| 41 |
__maintainer__="Chris Gianelloni <wolf31o2@g.o>" |
| 42 |
-__version__="2.0.6_pre4" |
| 43 |
+__version__="2.0.6_pre5" |
| 44 |
|
| 45 |
conf_values={} |
| 46 |
|
| 47 |
|
| 48 |
Modified: trunk/modules/generic_stage_target.py |
| 49 |
=================================================================== |
| 50 |
--- trunk/modules/generic_stage_target.py 2008-02-14 03:15:19 UTC (rev 1301) |
| 51 |
+++ trunk/modules/generic_stage_target.py 2008-02-14 16:51:33 UTC (rev 1302) |
| 52 |
@@ -1071,7 +1071,7 @@ |
| 53 |
myusevars.extend(self.settings["use"]) |
| 54 |
|
| 55 |
if myusevars: |
| 56 |
- myf.write("# These are the USE flags that were used in addition to what is provided by the profile.\n") |
| 57 |
+ myf.write("# These are the USE flags that were used in addition to what is provided by the\nprofile used for building.\n") |
| 58 |
myusevars = sorted(set(myusevars)) |
| 59 |
myf.write('USE="'+string.join(myusevars)+'"\n') |
| 60 |
|
| 61 |
|
| 62 |
Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh |
| 63 |
=================================================================== |
| 64 |
--- trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-02-14 03:15:19 UTC (rev 1301) |
| 65 |
+++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-02-14 16:51:33 UTC (rev 1302) |
| 66 |
@@ -95,12 +95,23 @@ |
| 67 |
;; |
| 68 |
clean) |
| 69 |
find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \; |
| 70 |
+ find ${clst_chroot_path}/usr/lib32 -iname "*.pyc" -exec rm -f {} \; |
| 71 |
+ find ${clst_chroot_path}/usr/lib64 -iname "*.pyc" -exec rm -f {} \; |
| 72 |
;; |
| 73 |
bootloader) |
| 74 |
shift |
| 75 |
# Here is where we poke in our identifier |
| 76 |
touch $1/livecd |
| 77 |
- |
| 78 |
+ |
| 79 |
+ # We create a firmware directory, if necessary |
| 80 |
+ if [ -e ${clst_chroot_path}/lib/firmware.tar.bz2 ] |
| 81 |
+ then |
| 82 |
+ echo "Creating firmware directory in $1" |
| 83 |
+ mkdir -p $1/firmware |
| 84 |
+ # TODO: Unpack firmware into $1/firmware and remove it from the |
| 85 |
+ # chroot so newer livecd-tools/genkernel can find it and unpack it. |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
# Move over the readme (if applicable) |
| 89 |
if [ -n "${clst_livecd_readme}" ] |
| 90 |
then |
| 91 |
@@ -116,7 +127,7 @@ |
| 92 |
then |
| 93 |
cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1 |
| 94 |
fi |
| 95 |
- |
| 96 |
+ |
| 97 |
${clst_sharedir}/targets/support/bootloader-setup.sh $1 |
| 98 |
;; |
| 99 |
unmerge) |
| 100 |
|
| 101 |
Modified: trunk/targets/support/livecdfs-update.sh |
| 102 |
=================================================================== |
| 103 |
--- trunk/targets/support/livecdfs-update.sh 2008-02-14 03:15:19 UTC (rev 1301) |
| 104 |
+++ trunk/targets/support/livecdfs-update.sh 2008-02-14 16:51:33 UTC (rev 1302) |
| 105 |
@@ -230,9 +230,6 @@ |
| 106 |
cd /lib/firmware |
| 107 |
/bin/tar cjpf /lib/firmware.tar.bz2 . |
| 108 |
rm -rf /lib/firmware/* |
| 109 |
- mkdir -p /usr/lib/hotplug |
| 110 |
- rm -rf /usr/lib/hotplug/firmware |
| 111 |
- ln -sf /lib/firmware /usr/lib/hotplug/firmware |
| 112 |
fi |
| 113 |
|
| 114 |
# Clear out locales |
| 115 |
|
| 116 |
-- |
| 117 |
gentoo-commits@l.g.o mailing list |
Archives