[PATCH 9/9] UBUNTU: [Config] Modify the relevant config files to produce a uImage for the dove flavour.

Brad Figg brad.figg at canonical.com
Wed Aug 19 03:44:14 UTC 2009


Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 debian.mvl-dove/control-scripts/postinst |    1 +
 debian.mvl-dove/control-scripts/postrm   |    1 +
 debian.mvl-dove/control-scripts/prerm    |    1 +
 debian.mvl-dove/control.d/vars.dove      |    6 +++---
 debian.mvl-dove/rules.d/armel.mk         |    7 +++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian.mvl-dove/control-scripts/postinst b/debian.mvl-dove/control-scripts/postinst
index 9295195..4edac80 100644
--- a/debian.mvl-dove/control-scripts/postinst
+++ b/debian.mvl-dove/control-scripts/postinst
@@ -177,6 +177,7 @@ chdir("$image_dest") or die "could not chdir to $image_dest:$!\n";
 
 # Paranoid check to make sure that the correct value is put in there
 if    (! $kimage)                 { $kimage = "vmlinuz"; } # Hmm. empty
+elsif ($kimage =~ m/^b?uImage$/o) { $kimage = "vmlinuz"; } # these produce vmlinuz
 elsif ($kimage =~ m/^b?zImage$/o) { $kimage = "vmlinuz"; } # these produce vmlinuz
 elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage;   }
 elsif ($kimage =~ m/^vmlinux$/o)  { my $nop = $kimage;   }
diff --git a/debian.mvl-dove/control-scripts/postrm b/debian.mvl-dove/control-scripts/postrm
index 3326a15..b81d7aa 100644
--- a/debian.mvl-dove/control-scripts/postrm
+++ b/debian.mvl-dove/control-scripts/postrm
@@ -171,6 +171,7 @@ if (-d "$image_dest") {
 
 # Paranoid check to make sure that the correct value is put in there
 if (! $kimage)                    {$kimage = "vmlinuz"} # Hmm. empty
+elsif ($kimage =~ m/^b?uImage$/o) {$kimage = "vmlinuz"} # these produce vmlinuz
 elsif ($kimage =~ m/^b?zImage$/o) {$kimage = "vmlinuz"} # these produce vmlinuz
 elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage;}
 elsif ($kimage =~ m/^vmlinux$/o)  { my $nop = $kimage;}
diff --git a/debian.mvl-dove/control-scripts/prerm b/debian.mvl-dove/control-scripts/prerm
index 47fbd21..530931e 100644
--- a/debian.mvl-dove/control-scripts/prerm
+++ b/debian.mvl-dove/control-scripts/prerm
@@ -97,6 +97,7 @@ exit 0 unless ($ARGV[0] && $ARGV[0] =~ /remove/) ;
 
 # Paranoid check to make sure that the correct value is put in there
 if (! $kimage)                    { $kimage = "vmlinuz";} # Hmm. empty
+elsif ($kimage =~ m/^b?uImage$/o) { $kimage = "vmlinuz";} # these produce vmlinuz
 elsif ($kimage =~ m/^b?zImage$/o) { $kimage = "vmlinuz";} # these produce vmlinuz
 elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage;  }
 elsif ($kimage =~ m/^vmlinux$/o)  { my $nop = $kimage;  }
diff --git a/debian.mvl-dove/control.d/vars.dove b/debian.mvl-dove/control.d/vars.dove
index 8bfb03b..fd30b6c 100644
--- a/debian.mvl-dove/control.d/vars.dove
+++ b/debian.mvl-dove/control.d/vars.dove
@@ -1,7 +1,7 @@
 arch="armel"
-supported="I.MX51"
-desc="I.MX51-based systems"
-target="Babbage boards"
+supported="dove"
+desc="dove-based systems"
+target="Marvell, dove, y0 boards"
 bootloader=""
 provides=""
 section_image="universe/base"
diff --git a/debian.mvl-dove/rules.d/armel.mk b/debian.mvl-dove/rules.d/armel.mk
index 9312069..7c53f02 100644
--- a/debian.mvl-dove/rules.d/armel.mk
+++ b/debian.mvl-dove/rules.d/armel.mk
@@ -3,9 +3,8 @@ header_arch	= arm
 asm_link	= arm
 defconfig	= defconfig
 flavours	= dove
-build_image	= zImage
-kernel_file	= arch/$(build_arch)/boot/zImage
+build_image	= uImage
+kernel_file	= arch/$(build_arch)/boot/uImage
 install_file	= vmlinuz
-no_dumpfile = true
-
+no_dumpfile     = true
 loader		= grub
-- 
1.6.0.4





More information about the kernel-team mailing list