diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2007-04-27 11:21:07 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2007-04-27 11:21:07 +0000 |
| commit | 1e75e457e001d4ba6fd1c46adce852a99276bc11 (patch) | |
| tree | e68a16911ac3cbc515d94d4ad100f456bd16c85d | |
| parent | 69fdf4d7e19ec209b8f9e4e6b0c680dbe286dcee (diff) | |
| download | anaconda-1e75e457e001d4ba6fd1c46adce852a99276bc11.tar.gz anaconda-1e75e457e001d4ba6fd1c46adce852a99276bc11.tar.xz anaconda-1e75e457e001d4ba6fd1c46adce852a99276bc11.zip | |
Load spufs module on cell (#237725) and remove spufs hack as we should do the
right thing now.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | loader2/hardware.c | 24 | ||||
| -rw-r--r-- | loader2/hardware.h | 2 | ||||
| -rw-r--r-- | loader2/loader.c | 1 | ||||
| -rw-r--r-- | scripts/mk-images.ppc | 2 | ||||
| -rw-r--r-- | yuminstall.py | 3 |
6 files changed, 35 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2007-04-27 Paul Nasrat <pnasrat@redhat.com> + * yuminstall.py: Remove spufs mountpoint force, we'll make the + mountpoint if the module is loaded. + * loader2/loader.c: Call spufsSetup + * loader2/hardware.c (spufsSetup): Load spufs module on cell (#237725) + * loader2/hardware.h: Add spufsSetup + * scripts/mk-images.ppc: Ship spufs module + * scripts/mk-images.ppc: Fix ppc32 netboot (#237988) 2007-04-26 Chris Lumens <clumens@redhat.com> diff --git a/loader2/hardware.c b/loader2/hardware.c index b22d124b1..72d8ce3cc 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -318,3 +318,27 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, #endif } +void spufsSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo) { +#if !defined(__powerpc__) + return; +#else + FILE *fd; + fd = fopen("/proc/cpuinfo", "r"); + if(fd) { + char buf[1024]; + while (fgets(buf, 1024, f) != NULL) { + if(!strncmp(buf, "cpu\t\t:", 5)) { + if(strstr(buf, "Cell")) { + mlLoadModule("spufs", modLoaded, modDeps, modInfo, NULL); + break; + } + } + } + fclose(fd); + return; + } else { + return; + } +#endif +} diff --git a/loader2/hardware.h b/loader2/hardware.h index 5da7bf6b5..7014cf80d 100644 --- a/loader2/hardware.h +++ b/loader2/hardware.h @@ -23,4 +23,6 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, void ipv6Setup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); +void spufsSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo); #endif diff --git a/loader2/loader.c b/loader2/loader.c index cc353ca59..1b8d6c8b5 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1535,6 +1535,7 @@ int main(int argc, char ** argv) { ideSetup(modLoaded, modDeps, modInfo); scsiSetup(modLoaded, modDeps, modInfo); dasdSetup(modLoaded, modDeps, modInfo); + spufsSetup(modLoaded, modDeps, modInfo); /* Note we *always* do this. If you could avoid this you could get a system w/o USB keyboard support, which would be bad. */ diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 416bab433..91f50039c 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -8,7 +8,7 @@ makeBootImages() { makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ --initrdsize 8192 \ --loaderbin loader \ - --modules "$INITRDMODS" + --modules "$INITRDMODS spufs" cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz sed -e "s/%BITS%/64/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \ diff --git a/yuminstall.py b/yuminstall.py index ab1213e3c..b2e6b3cd9 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1094,9 +1094,6 @@ class YumBackend(AnacondaBackend): '/etc/X11', '/root', '/var/tmp', '/etc/rpm', '/var/cache', '/var/cache/yum'] - if iutil.isCell(): - dirList.append('/spu') - # If there are any protected partitions we want to mount, create their # mount points now. protected = self.method.protectedPartitions() |