[Jaunty] Disable unwanted staging builds

[Stefan Bader]

SRU justification:

Impact: Having CONFIG_STAGING enabled will descend into the staging directory on build time and compile anything which has a matching config option. However the intention was to include only selective drivers from within the ubuntu directory. There has already been one case where a shared option name between ubuntu and staging lead to random module inclusion.

Fix: Disable CONFIG_STAGING for good. Fix up all code to include selective drivers in staging from the ubuntu directories. This will give no functional change but makes sure we are certain which modules are getting build.

Testcase: Modules and ABI before and after the change are the same.

[Stefan Bader (smb)]

On doing test compiles on armel, too, it turns out rtl8187se is failing miserably on armel.versatile. This is (at least) due to:

1. rtl8187se defining CR_TE (along other CR_ defines) which is also defined in the versatile architecture.
    This could be simply solved by removing the CR_ defines from rtl8187se as the names are never used.
2. Some headers are incomplete if CONFIG_WIRELESS_EXT is not set but the rtl8187se driver does not
    depend on it (and armel.versatile just has this odd setup)

Attached patch for 2. as this will prevent armel.versatile from building rtl8187se. 1. is questionable as I was told that CONFIG_PCI=y might be the wrong thing anyway.

[Stefan Bader (smb)]

Update on the part or CONFIG_PCI: "No, PCI is explicitly enabled by the ARM flavours. So adding a dep on WIRELESS_EXT and the following patch should be enough."

The patch mentioned would remove the unused defines from rtl8187se (attached)

[Steve Langasek (vorlon)]

Accepted linux into jaunty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

[Anders Kaseorg (andersk)]

I am running the 2.6.28-12.43 kernel from jaunty-proposed on amd64, and it works for me.

The difference from 2.6.28-11.42 in the set of modules is
  -./kernel/drivers/block/ub.ko
  +./kernel/drivers/scsi/mvsas.ko
  +./kernel/drivers/usb/serial/usbserial.ko
  -./kernel/ubuntu/misc/wireless/p80211/p80211.ko
all of which were intentional:
  UBUNTU: [Config] Disable libusual and the ub driver
  UBUNTU: [jaunty] Add missing mvsas (Marvel SAS 6440) module configuration.
  UBUNTU: Set USB_SERIAL=m for i386/amd64
  UBUNTU: Remove prism2_usb driver from ubuntu and use the one from staging

The ABI was bumped, but for other reasons, I think due to:
  UBUNTU: SAUCE: (drop after 2.6.28) Wifi suspend/resume scan timeout fixes

[Stefan Bader (smb)]

ABI was bumped due to several reasons (though not for this change). See https://lists.ubuntu.com/archives/kernel-team/2009-May/005708.html for details. Thanks for testing and giving feedback.

[Launchpad Janitor (janitor)]

This bug was fixed in the package linux - 2.6.28-13.44

---------------
linux (2.6.28-13.44) jaunty-proposed; urgency=low

  [ Stefan Bader ]

  * Revert "SAUCE: [jaunty] ALSA: Add retry for Intel8x0 clock measurement"
  * Revert "SAUCE: [jaunty] ALSA: Fix clock and buffer calculations for
    Intel8x0"
  * Revert "SAUCE: [jaunty] ALSA: Fix buffer positions and checks"

linux (2.6.28-12.43) jaunty-proposed; urgency=low

  [ Amit Kucheria ]

  * Enable SYN_COOKIES for iop32x and versatile flavours
    - LP: #361687
  * SAUCE: Quirk for BT USB device on MacbookPro to be reset before use
    - LP: #332443

  [ Brad Figg ]

  * [jaunty] Add missing mvsas (Marvel SAS 6440) module configuration.
    - LP: #352336

  [ Chuck Short ]

  * SAUCE: [USB] Unusual Device support for Gold MP3 Player Energy
    - LP: #125250

  [ Daniel T Chen ]

  * SAUCE: [jaunty] ALSA: Fix buffer positions and checks
    - LP: #345627
  * SAUCE: [jaunty] ALSA: Fix clock and buffer calculations for Intel8x0
    - LP: #345627
  * SAUCE: [jaunty] ALSA: Add retry for Intel8x0 clock measurement
    - LP: #345627

  [ Luke Yelavich ]

  * disable CONFIG_SND_HDA_INPUT_BEEP on amd64 and i386
    - LP: #331589

  [ Makito SHIOKAWA ]

  * [ARM] 5404/1: Fix condition in arm_elf_read_implies_exec() to set
    READ_IMPLIES_EXEC
    - LP: #364358

  [ Manoj Iyer ]

  * SAUCE: Added quirk to fix key release for Samsung NC20
    - LP: #360247

  [ Oleg Nesterov ]

  * posix timers: fix RLIMIT_CPU && fork()
    - LP: #361508

  [ Scott James Remnant ]

  * [Config] Disable libusual and the ub driver
    - LP: #364538

  [ Stefan Bader ]

  * Disable unwanted staging builds
    - LP: #366144
  * Remove prism2_usb driver from ubuntu and use the one from staging
    - LP: #325366
  * SAUCE: Make rtl8187se depend on WIRELESS_EXT
    - LP: #366144
  * Disable CONFIG_RTL8187SE for armel.versatile
    - LP: #366144

  [ Tejun Heo ]

  * libata: handle SEMB signature better
    - LP: #257790

  [ Tim Gardner ]

  * Set USB_SERIAL=m for i386/amd64
    - LP: #345002
  * SAUCE: Jaunty - aic79xx - set reset delay to 5 seconds, down from 15.
    - LP: #79542
  * SAUCE: (drop after 2.6.28) Wifi suspend/resume scan timeout fixes
    - LP: #336055
  * Sony laptop: Sony Vaio laptops do not enable wwan power by default.
    - LP: #364678

  [ Tyler Hicks ]

  * SAUCE: (drop after 2.6.28) eCryptfs: Larger buffer for encrypted
    symlink targets
    - LP: #357345

  [ Upstream Kernel Changes ]

  * V4L/DVB (9999): gspca - zc3xx: Webcam 046d:089d added.
    - LP: #326674
  * V4L/DVB (10044): gspca - pac7311: Webcam 093a:2620 added.
    - LP: #363195
  * hwmon: (it87) Add support for the ITE IT8720F
    - LP: #357766
  * vgacon: Return the upper half of 512 character fonts
    - LP: #355057
  * drm/i915: add support for G41 chipset
    - LP: #365958

 -- Stefan Bader <email address hidden> Mon, 25 May 2009 17:30:40 +0200