mbox

UBUNTU: [Config] rename omap flavour to multiarm

Message ID 20130321220931.GA30668@luxor.wired.org
State New
Headers show

Pull-request

git://kernel.ubuntu.com/ppisati/ubuntu-raring.git master_omaprename

Message

Paolo Pisati March 21, 2013, 10:09 p.m. UTC 
On Thu, Mar 21, 2013 at 04:55:12PM +0100, Paolo Pisati wrote:
> On Thu, Mar 21, 2013 at 02:19:10PM +0100, Oliver Grawert wrote:
> >
> > to simply avoid having to carry any patches in userspace (flash-kernel,
> > initramfs-tools ... you name it) for the naming delta of a multi
> > platform kernel ...
> 
> turned out the only thing we need to make flash-kernel happy is an ABI bump:
> anyhow it was chosen long ago to name it 'generic' so hold on and let me
> regenerate the patch.

The following changes since commit 605d3f768f6d9d65980eab000ed45de981e9a9af:

  UBUNTU: [Config] CONFIG_SERIAL_8250_DW=m across all arches (2013-03-20 07:13:58 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/ppisati/ubuntu-raring.git master_omaprename

for you to fetch changes up to 3e9a1bce8b6683eb540d8a77a709ba5bc773f07c:

  UBUNTU: [Config] rename omap flavour to generic (2013-03-21 18:35:05 +0000)

----------------------------------------------------------------
Paolo Pisati (1):
      UBUNTU: [Config] rename omap flavour to generic

 debian.master/abi/3.8.0-13.23/armhf/{omap => generic}                             |    0
 debian.master/abi/3.8.0-13.23/armhf/{omap.compiler => generic.compiler}           |    0
 debian.master/abi/3.8.0-13.23/armhf/{omap.modules => generic.modules}             |    0
 debian.master/config/armhf/{config.flavour.omap => config.flavour.generic}        |    0
 debian.master/config/enforce                                                      |    2 +-
 debian.master/control.d/vars.generic                                              |    4 ++--
 debian.master/control.d/vars.omap                                                 |    8 --------
 debian.master/d-i/{exclude-firmware.armhf-omap => exclude-firmware.armhf-generic} |    0
 debian.master/d-i/{exclude-modules.armhf-omap => exclude-modules.armhf-generic}   |    0
 debian.master/d-i/kernel-versions.in                                              |    2 +-
 debian.master/etc/getabis                                                         |    2 +-
 debian.master/rules.d/arm64.mk                                                    |    2 +-
 debian.master/rules.d/armhf.mk                                                    |    6 +++---
 13 files changed, 9 insertions(+), 17 deletions(-)
 rename debian.master/abi/3.8.0-13.23/armhf/{omap => generic} (100%)
 rename debian.master/abi/3.8.0-13.23/armhf/{omap.compiler => generic.compiler} (100%)
 rename debian.master/abi/3.8.0-13.23/armhf/{omap.modules => generic.modules} (100%)
 rename debian.master/config/armhf/{config.flavour.omap => config.flavour.generic} (100%)
 delete mode 100644 debian.master/control.d/vars.omap
 rename debian.master/d-i/{exclude-firmware.armhf-omap => exclude-firmware.armhf-generic} (100%)
 rename debian.master/d-i/{exclude-modules.armhf-omap => exclude-modules.armhf-generic} (100%)

Comments

Paolo Pisati March 22, 2013, 11:46 a.m. UTC | #1 
On Thu, Mar 21, 2013 at 11:09:31PM +0100, Paolo Pisati wrote:
> 
> The following changes since commit 605d3f768f6d9d65980eab000ed45de981e9a9af:
> 
>   UBUNTU: [Config] CONFIG_SERIAL_8250_DW=m across all arches (2013-03-20 07:13:58 -0600)
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ppisati/ubuntu-raring.git master_omaprename
> 
> for you to fetch changes up to 3e9a1bce8b6683eb540d8a77a709ba5bc773f07c:
> 
>   UBUNTU: [Config] rename omap flavour to generic (2013-03-21 18:35:05 +0000)

one of the side effects that i noticed renaming 'omap' to 'generic' is that modules
are split between linux-image and linux-image-extra, so we either:

1) pull in both packages during the upgrade

or

2) disable this split for arch == armhf

in case we pick 1, i want to do some adjusments (i want some vital modules to be
part of linux-image - but in this case it'll inflate linux-image for x86 too),
while in case 2, someone needs to help me find the exact spot where this rule is
applied.

Personally i would prefer 2 if it's possible without much hurdle.

Let me know.
Tim Gardner March 22, 2013, 12:57 p.m. UTC | #2 
On 03/22/2013 05:46 AM, Paolo Pisati wrote:
> On Thu, Mar 21, 2013 at 11:09:31PM +0100, Paolo Pisati wrote:
>>
>> The following changes since commit 605d3f768f6d9d65980eab000ed45de981e9a9af:
>>
>>    UBUNTU: [Config] CONFIG_SERIAL_8250_DW=m across all arches (2013-03-20 07:13:58 -0600)
>>
>> are available in the git repository at:
>>
>>    git://kernel.ubuntu.com/ppisati/ubuntu-raring.git master_omaprename
>>
>> for you to fetch changes up to 3e9a1bce8b6683eb540d8a77a709ba5bc773f07c:
>>
>>    UBUNTU: [Config] rename omap flavour to generic (2013-03-21 18:35:05 +0000)
>
> one of the side effects that i noticed renaming 'omap' to 'generic' is that modules
> are split between linux-image and linux-image-extra, so we either:
>
> 1) pull in both packages during the upgrade
>
> or
>
> 2) disable this split for arch == armhf
>
> in case we pick 1, i want to do some adjusments (i want some vital modules to be
> part of linux-image - but in this case it'll inflate linux-image for x86 too),
> while in case 2, someone needs to help me find the exact spot where this rule is
> applied.
>
> Personally i would prefer 2 if it's possible without much hurdle.
>
> Let me know.
>

Option 2 it is.