Patchwork [3/4] UBUNTU: [Config] d-i: make armel configuration versatile flavour specific

login
register
mail settings
Submitter Andy Whitcroft
Date June 3, 2010, 9:30 a.m.
Message ID <1275557460-30757-4-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/54469/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Andy Whitcroft - June 3, 2010, 9:30 a.m.
BugLink: http://bugs.launchpad.net/bugs/588805

The newly introduced omap configuration is quite different from the
existing versatile configuration making it hard to share the configuration
at the architecture level.  Make the current armel configuration specific
to the versatile flavour.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/d-i/exclude-modules.armel           |   20 --------------------
 debian.master/d-i/exclude-modules.armel-versatile |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 debian.master/d-i/exclude-modules.armel
 create mode 100644 debian.master/d-i/exclude-modules.armel-versatile
Amit Kucheria - June 3, 2010, 10:12 a.m.
On 10 Jun 03, Andy Whitcroft wrote:
> BugLink: http://bugs.launchpad.net/bugs/588805
> 
> The newly introduced omap configuration is quite different from the
> existing versatile configuration making it hard to share the configuration
> at the architecture level.  Make the current armel configuration specific
> to the versatile flavour.

The fact that they're different is probably because nobody (aka. I) didn't
make them similar. Now that we have the possibility of having null .udebs,
can we make udeb configuration consistent across all flavours of arm and x86?


> Signed-off-by: Andy Whitcroft <apw@canonical.com>


> ---
>  debian.master/d-i/exclude-modules.armel           |   20 --------------------
>  debian.master/d-i/exclude-modules.armel-versatile |   20 ++++++++++++++++++++
>  2 files changed, 20 insertions(+), 20 deletions(-)
>  delete mode 100644 debian.master/d-i/exclude-modules.armel
>  create mode 100644 debian.master/d-i/exclude-modules.armel-versatile
> 
> diff --git a/debian.master/d-i/exclude-modules.armel b/debian.master/d-i/exclude-modules.armel
> deleted file mode 100644
> index df63c66..0000000
> --- a/debian.master/d-i/exclude-modules.armel
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -crypto-modules
> -fb-modules
> -fs-core-modules
> -fs-secondary-modules
> -nic-modules
> -nic-pcmcia-modules
> -nic-usb-modules
> -scsi-modules
> -storage-core-modules
> -nfs-modules
> -pcmcia-modules
> -parport-modules
> -serial-modules
> -plip-modules
> -pcmcia-storage-modules
> -mouse-modules
> -irda-modules
> -floppy-modules
> -char-modules
> -virtio-modules
> diff --git a/debian.master/d-i/exclude-modules.armel-versatile b/debian.master/d-i/exclude-modules.armel-versatile
> new file mode 100644
> index 0000000..df63c66
> --- /dev/null
> +++ b/debian.master/d-i/exclude-modules.armel-versatile
> @@ -0,0 +1,20 @@
> +crypto-modules
> +fb-modules
> +fs-core-modules
> +fs-secondary-modules
> +nic-modules
> +nic-pcmcia-modules
> +nic-usb-modules
> +scsi-modules
> +storage-core-modules
> +nfs-modules
> +pcmcia-modules
> +parport-modules
> +serial-modules
> +plip-modules
> +pcmcia-storage-modules
> +mouse-modules
> +irda-modules
> +floppy-modules
> +char-modules
> +virtio-modules
> -- 
> 1.7.0.4
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Andy Whitcroft - June 3, 2010, 11:27 a.m.
On Thu, Jun 03, 2010 at 01:12:41PM +0300, Amit Kucheria wrote:
> On 10 Jun 03, Andy Whitcroft wrote:
> > BugLink: http://bugs.launchpad.net/bugs/588805
> > 
> > The newly introduced omap configuration is quite different from the
> > existing versatile configuration making it hard to share the configuration
> > at the architecture level.  Make the current armel configuration specific
> > to the versatile flavour.
> 
> The fact that they're different is probably because nobody (aka. I) didn't
> make them similar. Now that we have the possibility of having null .udebs,
> can we make udeb configuration consistent across all flavours of arm and x86?

We do not yet have that possiblilty.  Tim produced a possible patch for
it but as far as I know we do not have this support in Maverick.  But
yes once that exists this lot can be revisisted as part of that.

-apw

Patch

diff --git a/debian.master/d-i/exclude-modules.armel b/debian.master/d-i/exclude-modules.armel
deleted file mode 100644
index df63c66..0000000
--- a/debian.master/d-i/exclude-modules.armel
+++ /dev/null
@@ -1,20 +0,0 @@ 
-crypto-modules
-fb-modules
-fs-core-modules
-fs-secondary-modules
-nic-modules
-nic-pcmcia-modules
-nic-usb-modules
-scsi-modules
-storage-core-modules
-nfs-modules
-pcmcia-modules
-parport-modules
-serial-modules
-plip-modules
-pcmcia-storage-modules
-mouse-modules
-irda-modules
-floppy-modules
-char-modules
-virtio-modules
diff --git a/debian.master/d-i/exclude-modules.armel-versatile b/debian.master/d-i/exclude-modules.armel-versatile
new file mode 100644
index 0000000..df63c66
--- /dev/null
+++ b/debian.master/d-i/exclude-modules.armel-versatile
@@ -0,0 +1,20 @@ 
+crypto-modules
+fb-modules
+fs-core-modules
+fs-secondary-modules
+nic-modules
+nic-pcmcia-modules
+nic-usb-modules
+scsi-modules
+storage-core-modules
+nfs-modules
+pcmcia-modules
+parport-modules
+serial-modules
+plip-modules
+pcmcia-storage-modules
+mouse-modules
+irda-modules
+floppy-modules
+char-modules
+virtio-modules