From 609a57c491587f76290041c5a916db1b3bd22a4c Mon Sep 17 00:00:00 2001 From: Martin Gracik Date: Tue, 13 Oct 2009 13:22:44 +0200 Subject: [PATCH] Added code for alpha images --- etc/modules/modules.alpha | 2 ++ src/pylorax/images.py | 46 ++++++++++++++++++++++++++++++++++++++- src/pylorax/insttree.py | 4 ++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 etc/modules/modules.alpha diff --git a/etc/modules/modules.alpha b/etc/modules/modules.alpha new file mode 100644 index 00000000..dff84cf7 --- /dev/null +++ b/etc/modules/modules.alpha @@ -0,0 +1,2 @@ +tgafb +crc32 diff --git a/src/pylorax/images.py b/src/pylorax/images.py index fb59c6f9..34f31eb2 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -339,8 +339,10 @@ class InitRD(object): remove(os.path.join(dst_moddir, "modules.*map")) def trim_pci_ids(self): + # FIXME remove this function, just copy the original pci.ids file + kernelver = self.conf.kernelver - # XXX is this needed? does it save so much space? + vendors = set() devices = set() @@ -593,6 +595,48 @@ class InitRD(object): def run_s390x(self): self.run_s390() + def run_alpha(self): + kerneldir = os.path.join(self.conf.outdir, "kernels") + if not os.path.isdir(kerneldir): + os.makedirs(kerneldir) + + # XXX check for the jensen kernel file, how can we differentiate it? + # i don't know the filename... + if self.conf.kernelfile.endswith("jensen"): + copy(self.conf.kernelfile, + os.path.join(kerneldir, "vmlinux.j")) + else: + copy(self.conf.kernelfile, + os.path.join(kerneldir, "vmlinux.gz")) + + os.makedirs(os.path.join(self.conf.outdir, "boot")) + copy(os.path.join(self.conf.bootdiskdir, "bootlx"), + os.path.join(self.conf.outdir, "boot")) + + os.makedirs(os.path.join(self.conf.outdir, "etc")) + abootconf = os.path.join(self.conf.outdir, "etc", "aboot.conf") + touch(abootconf) + + text = "0:/kernels/vmlinux.gz initrd=/images/initrd.img\n" + text += "1:/kernels/vmlinux.gz initrd=/images/initrd.img " + text += "console=ttyS0\n" + text += "2:/kernels/vmlinux.gz initrd=/images/initrd.img text\n" + text += "3:/kernels/vmlinux.gz initrd=/images/initrd.img rescue\n" + edit(abootconf, text=text) + + initrd_filename = "initrd.img" + self.so.info("Compressing the image file '%s'" % (initrd_filename,)) + self.create(os.path.join(self.conf.imagesdir, initrd_filename)) + + def run_ia64(self): + raise NotImplementedError + + def run_ppc(self): + raise NotImplementedError + + def run_ppc64(self): + self.run_ppc() + class EFI(object): diff --git a/src/pylorax/insttree.py b/src/pylorax/insttree.py index b8bfef7b..c6c3e4ac 100644 --- a/src/pylorax/insttree.py +++ b/src/pylorax/insttree.py @@ -46,6 +46,10 @@ class InstallTree(object): if self.conf.buildarch == "i386": required.append("kernel-PAE") + # add the jensen kernel package + if self.conf.buildarch == "alpha": + required.append("kernel-jensen") + # get additional packages from the configuration files packages_files = [] packages_files.append(os.path.join(self.conf.confdir, "packages",