| Age | Commit message (Collapse) | Author |
|---|
|
Local change, not to be merged into Ubuntu tree.
Signed-off-by: Sebastien Jan <s-jan@ti.com>
|
|
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
|
|
This matches
http://svn.debian.org/viewsvn/kernel/dists/trunk/linux-2.6?view=rev&revision=15014
(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563161), and is
necessary in order to implement current boot loader packaging policies
(http://lists.debian.org/debian-kernel/2010/07/msg00078.html) in grub2.
Signed-off-by: Colin Watson <cjwatson@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
BugLink: http://bugs.launchpad.net/bugs/618591
During install we execute depmod to ensure we have the appropriate module
supper indexes for the installed system, we are however required to clean
up after it on uninstall. As depmod is provided by an external package
changes in that package can lead to the kernel leaking files on uninstall,
preventing a successful purge.
Though we cannot know what files depmod does generate they (so far) all
are prefixed with "modules." in /lib/modules/<version>/. The kernel
binary packages do intentionally include two files with this prefix
(modules.builtin and modules.order). As we know exactly which files we
are carrying move to removing all other modules.* files when uninstalling
to ensure we cleanup comprehensivly behind depmod. Also adds linkage
between the two places where these files are now listed to ensure we keep
them in lock-step. This should ensure that should new files be added to
depmod's output set we should purge them automatically.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
BugLink: http://bugs.launchpad.net/bugs/603087
We commonly use conditional elements to limit building to specific
sub-systems. Move to a new model wherein the variables are used directly
in the assignment so that enabled things are placed on foo-true and
disabled things go to foo-false. Overall simplifying the code.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
BugLink: http://bugs.launchpad.net/bugs/603087
To bootstrap in a cross-compile environment we need to be able to build
the compiler and libc, for this we need linux-libc-dev from the kernel.
However we cannot build the kernel without the compiler. Catch 22.
This patch adds "DEB_STAGE=stage1" variable which skips building kernel
requesting only the linux-libc-dev package.
Based on a patch by Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
BugLink: http://bugs.launchpad.net/bugs/608674
The -source package is a bootstrap package allowing other packages which
need the kernel source as part of their build process. This allows
them to build depend on this package and have the source available.
Currently this only includes the actual kernel source which we built from.
In order to bootstrap compilers we consumers also need the rules used to
build the kernel. Make a source version specific directory in /usr/src
and add the debian and debian.master contents. Move the tarball into
this directory as well to better match other packages. Finally include
a symlink from the original tarball name for backwards compatibility.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
[ Andy Whitcroft ]
* initial import of the debian machinery from Maverick
* enforcer -- move configuration series specific
* abi-check -- be more forgiving of the ABI element type
- LP: #576274
* debian -- fix modules.builtin naming after cleanup
* debian -- fix distclean to be branch specific
* pass LOCALVERSION= to kernel builds to suppress version suffix
* debian -- add a full_build override
* debian -- ensure the version number is clean
[ Lee Jones ]
* Enable perf to be more helpful when perf_<version> does not exist.
- LP: #570500
* 'fdr editconfig' modification. Easily skip over unwanted menuconfigs.
[ Tim Gardner ]
* [Config] Added module inclusion support
BugLink: http://bugs.launchpad.net/bugs/576274
BugLink: http://bugs.launchpad.net/bugs/570500
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
As of v2.6.35-rc2 the kernel version generator sometimes appends a '+'
to the overall version number based on the current state of the SCM.
Forcibly override the version handling for this version.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
CONFIG_LOCALVERSION_AUTO will change the Linux kernel's version, it will cause
packaging failure.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
It is now easier to edit 'per-flavour' configuration files. The old
system forced the developer to enter a menuconfig system for each
flavour until eventually landing in the required one. After following
this process numerous times it can easily become tedious. Now the
developer is asked whether they want to enter each menuconfig in turn,
rapidly speeding up the process.
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
BugLink: http://bugs.launchpad.net/bugs/570500
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
|
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.33-0.0
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebased to v2.6.33
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] SECURITY_FILE_CAPABILITIES dissapeared in 2.6.33
Change our config enforcer to be more lenient
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.33
Update configs following rebase to v2.6.33
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update ports configs following rebase to v2.6.33
Update ports configs following rebase to v2.6.33
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.33-1.1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: expose the kernel EXTRAVERSION in dmesg and /proc/version_signature
Our versioning has always overridden the kernel EXTRAVERSION such that
where we are based on an -rcN release candidate or have stable updates
applied that information was lost. We now also have the issue that we
have a major drm backport in the kernel which will take stable updates
from a different source on a different release schedule and it is hard
to know which version is in the kernel.
This patch adds the kernel EXTRAVERSION to /proc/version_signature and
through that also to the kernel version banner. This allows us to know
the exact original kernel version we are based on. This also allows us to
augment the version information by adding additional versions to the
EXTRAVERSION. For example the following EXTRAVERSION:
EXTRAVERSION = .9+drm33.0
Generates the following version strings:
$ cat /proc/version_signature
Ubuntu 2.6.32-16.26-generic 2.6.32.9+drm33.0
$ dmesg | grep Linux\ version
[ 0.000000] Linux version 2.6.32-16-generic (root@chloe)
(gcc version 4.4.3 (Ubuntu 4.4.3-3ubuntu1) ) #26-Ubuntu SMP
Fri Mar 12 18:02:3 (Ubuntu 2.6.32-16.26-generic 2.6.32.9+drm33.0)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: linux-tools -- pull out the perf binary into a binary package
We are getting complex dependancies on the linux-image package as a result
of including the perf binary in the package. This ties us to the versions
of binutils and libc on the build release, which limits the installability
of that kernel on older releases. This is a problem for testing.
Move the binary over to a release and architecture specific binary package
linux-tools-VERSION-ABI. Rename the current linux-tools package over to
linux-tools-common and depend the binary packages on it. We will also
need to add a new linux-tools meta package to the linux-meta package.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: [Config] enable MMIOTRACE for graphics debugging
Enable MMIOTRACE to allow us to trace low level card operations. This is
commonly used to debug graphics issues particularly under Nouveau.
The cost is near-zero for having the MMIOTRACE option enabled with the
trace collection turned off (the default). We take one additional branch
in the mmio map/unmap paths which are non-critical initialisation/teardone
paths in normal usage. The actual mmio operations are not affected at all.
When we enable trace collection the overhead is high, taking a page fault
for each access to the mmio mapping.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
UBUNTU: [Config] enable BLK_DEV_BSG
Enable block layer SCSI Generic V4:
BLK_DEV_BSG=y
This is an option which is recommended enabled, and seemingly required
for recent UDEV versions. From the option's help text:
This option is required by recent UDEV versions to properly
access device serial numbers, etc.
If unsure, say Y.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
UBUNTU: debian -- fix builds when tools are disabled
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] Update configs for 2.6.32.10
BugLink: http://bugs.launchpad.net/bugs/540231
The mimio driver was reverted and some DVB driver selected the wrong
config option.
[apw@canonical.com: updates ports configs]
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] Fix sub-flavours package conflicts
BugLink: http://bugs.launchpad.net/bugs/454827
The logic that creates debian/control information for the
virtual flavour packaging is dependent on the architecture
of the environment within which 'debian/rules clean' is run,
and as such can create an incorrect conflicts statement.
In this case it is sufficient to have both conflicts hard coded in the
same statement since the conflicting packages are architecturally
mutually exclusive.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: allow us to build default configs for automated builds
Allow us to request an automated update to the configs taking whatever
the default answers are. This allows us to automate builds of mainline
kernels using our build infrastructure and configs.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
UBUNTU: config -- allow locally specified configuration overrides
When updating configuration you often want to bulk update specific options
in every configuration. For new options this is trivial as you can simply
add them to config.common.<family>. For existing options you need to
either remove the options globally and then add them, or add them to
every flavour file. This is particularly problematic for mainline builds.
Add support for a new $(DEBIAN)/config/OVERRIDES file which if present is
appended to the built configs before processing, providing an absolute
override for all configurations. This is not expected to be present in
the normal case.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
UBUNTU: [Config] de-modularise PATA disk controllers
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5536=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
CONFIG_PATA_HPT3X2N=m
CONFIG_PATA_HPT3X3=m
CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
CONFIG_PATA_MARVELL=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_QDI=m
CONFIG_PATA_RZ1000=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SCH=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: [Config] de-modularise SATA disk controllers
CONFIG_SATA_AHCI=m
CONFIG_SATA_INIC162X=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
CONFIG_SATA_QSTOR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIL24=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
CONFIG_SATA_SX4=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VITESSE=m
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: [Config] armel/versatile: Set CRAMFS=m
BugLink: http://bugs.launchpad.net/bugs/524893
Revert CRAMFS=y from 553a4be9cb569e6e895c892709163b5c5aaf7463 as support
for initramfses with very large kernels has been fixed in qemu-kvm and
initrds didn't work any better than initramfses anyway.
Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: [Config] armel: Reset default command-line
BugLink: http://bugs.launchpad.net/bugs/524893
Reset default command-line to empty; it was set to boot from /dev/rom3
with 32 MB of RAM, but this flavour is for use im QEMU which doesn't
emulate the ROM devices and passes memory size via an ATAG already --
setting mem=32m in the default kernel cmdline required an explicit
mem=256m on the QEMU cmdline to override.
Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: [Config] update ports configs following Lucid sync
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.34-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update port configs following rebase to v2.6.34-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: build/modules: Update d-i to reflect recent config changes
BugLink: http://bugs.launchpad.net/bugs/546929
UBUNTU: [Config] de-modularise SATA disk controllers and
UBUNTU: [Config] de-modularise PATA disk controllers
have changed several SATA and PATA drivers from being built in into
being modules. This needs to be reflected in the d-i files, so that
the installer can pick up the required modules.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.34-rc3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update port configs following rebase to v2.6.34-rc3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable Nouveau DRM module on powerpc
Powerpc users with NVIDIA cards cannot currently use the nouveau userspace
xorg driver without this module, as it results in incorrect colours, and
bad performance.
Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] Add xen netboot support
BugLink: http://bugs.launchpad.net/bugs/160366
This adds xen-netfront and xen-blkfront to the debian installer modules
list.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: d-i -- enable udebs for generic-pae
BugLink: http://bugs.launchpad.net/bugs/160366
In combination with adding the xen package to the udebs we can now sensibly
make netboot images for xen. Enable udeb generation for generic-pae.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc4
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.34-rc4
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update port configs following rebase to v2.6.34-rc4
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: allow modules.builtin to be optional
All modules.builtin to be optional so we can share the debian machinary
in karmic.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: d-i: add mpt2sas to the message-modules udeb
BugLink: http://bugs.launchpad.net/bugs/530361
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: tools -- allow tools to be overridden
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc5
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update ports configs following rebase to v2.6.34-rc5
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.4
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] ports -- build in dm-mod to enable LVM boot
BugLink: http://bugs.launchpad.net/bugs/560717
Build-in dm-mod as otherwise LVM cannot activate on boot.
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: tools -- fix perf version extraction for multi-part flavours
BugLink: http://bugs.launchpad.net/bugs/555130
Currently, the perf tool doesn't work for the generic-pae flavour:
$ bash -x /usr/bin/perf
++ uname -r
+ version=2.6.32-21-generic-pae
+ version=2.6.32-21-generic
+ exec perf_2.6.32-21-generic
/usr/bin/perf: line 4: exec: perf_2.6.32-21-generic: not found
We can work out the flavour by removing the known shaped version-abi
combination from the start of the version string (which is two lots of
*-), and then remove this flavour suffix from the original version to
leave us with the version-abi we need.
Based on a patch by Jeremy Kerr <jeremy.kerr@canonical.com>.
Acked-by: Jeremy Kerr <jeremy.kerr@canonical.com>.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] Enforce ramdisk size
ramdisk size should be 64M for all flavours.
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] enforce -- ensure dm_mod is built-in for LVM
BugLink: http://bugs.launchpad.net/bugs/560717
We must build-in dm-mod otherwise LVM cannot activate on boot,
ensure this is so.
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: [Config] Enable multicast routing for sparc
BugLink: http://bugs.launchpad.net/bugs/416266
Multicast routing was enabled for sparc in Hardy as an SRU.
Unfortunately, the change doesn't appear to have been pulled forward
into Lucid. Enable CONFIG_IP_MROUTE=y for sparc.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: Enable ftrace function profiler
The ftrace framework has profiling capabilities that will be useful in
tracking desktop responsiveness. As an example, profiling can tell us
how many times an ISR is run, and how long the average run time is.
This option will not have any performance impact. When turned on at
runtime, a small performance impact may be seen, and a few hundred KB
per cpu of buffer pages will be allocated and used.
Extremely brief overview:
echo 1 > /sys/kernel/debug/tracing/function_profile_enabled
... run tests ...
echo 0 > /sys/kernel/debug/tracing/function_profile_enabled
cat /sys/kernel/debug/tracing/trace_stat/function0 (suffix: cpu #)
BugLink: http://bugs.launchpad.net/bugs/570389
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: [Config] Add ahci.ko to virtual sub-flavour
BugLink: http://bugs.launchpad.net/bugs/570542
The ahci driver is now enabled as a module rather than being built in.
Add the ahci.ko module to the virtual sub-flavour.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc6
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.34-rc6
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update port configs following rebase to v2.6.34-rc6
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.5
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Add atl1c to nic-modules udeb
BugLink: http://bugs.launchpad.net/bugs/557130
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y
BugLink: http://bugs.launchpad.net/bugs/575940
Some /dev nodes, like /dev/dsp, require POSIX ACLs. This change
enforces this setting.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: don't force module dependency checking
kernel-wedge copy-modules deals with module dependencies, and it errors
out if it can't find any interdependencies in modules.dep thinking it's
an error. However, sometimes we just want to build a kernel without any
modules. In this case, we need to override the check, which this change
does.
BugLink: http://bugs.launchpad.net/bugs/577029
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34-rc7
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update configs following rebase to v2.6.34-rc7
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] update port configs following rebase to v2.6.34-rc7
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Add btrfs to the udebs
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-1.6
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] disable CONFIG_SCSI_IPR on powerpc
Temporarily disable CONFIG_SCSI_IPR on powerpc to avoid build failures.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Remove 386 flavour per UDS discussion
http://blueprints.launchpad.net/ubuntu/+spec/foundations-m-toolchain
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-2.7
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Drop lpia
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] [FTBS] disable KVM
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] [FTBS] disable ipr for armel
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-2.8
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] [FTBS] Disable comedi for armel
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-2.9
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: rebase to v2.6.34
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-3.10
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Added virtual flavour
Convert from a sub-flavour to a regular flavour.
The virtual flavour is initially based off of amd64 server and
i386 generic-pae.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Remove support for sub-flavours
This is preperatory to making 'virtual' a real flavour.
sub-flavours are hacky and error prone.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Removed amd64 preempt flavour
This flavour will now be supported in a universe kernel
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] updateconfigs, updateportsconfigs after flavour munging
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Enable perf tools on armel
Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: build/modules: Temorarily add ignore.modules for archs
We're purposely doing a significant amount of kernel configuration
changes. Temporarily ignore the module check to prevent FTBS.
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_ECRYPT_FS=y for ports
CONFIG_ECRYPT_FS was inconsistent between config.common.ubuntu and
config.common.ports. Set CONFIG_ECRYPT_FS=y for ports to make this
config option consistent.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_USB=y for armel and sparc
CONFIG_USB was inconsistent between archs. Set CONFIG_USB=y for armel
and sparc to make this config option consistent amongst all archs.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_SCSI=y for ia64 and sparc
CONFIG_SCSI was inconsistent between archs. Set CONFIG_SCSI=y for ia64
and sparc to make this config option consistent amongst all archs.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_RFKILL=y for ports
CONFIG_RFKILL was inconsistent between config.common.ubuntu and
config.common.ports. Set CONFIG_RKILL=y for ports to make this config
option consistent.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_ATH9K_DEBUGFS=y
Enable CONFIG_ATH9K_DEBUGFS=y for ports and ubuntu. This option allows
access to ath9k's statistics for interrupts, rate control, etc. It is
also required for changing debug message flags at run time.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_IWMC3200TOP_DEBUGFS=y
Enable CONFIG_IWMC3200TOP_DEBUGFS=y for ports and ubuntu. This option
enables the debugging interface for iwmc3200top.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_RCU_FAST_NO_HZ=y
Enable CONFIG_RCU_FAST_NO_HZ=y for ports and ubuntu. If energy
efficiency is critically important, enable this option. It causes RCU to
attempt to accelerate grace periods in order to allow the final CPU to
enter dynticks-idle state more quickly. Keep in mind, this does
increase the overhead of the dynticks-idle checking on systems with
large numbers of CPUs.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_IWLWIFI_DEVICE_TRACING=y
Enable CONFIG_IWLWIFI_DEVICE_TRACING=y for ports and ubuntu. This
option enables tracing of all commands, including TX frames and IO
accesses, sent to the device.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_LIBERTAS_MESH=y
Enable CONFIG_LIBERTAS_MESH=y for ports and ubuntu. This option enables
MESH support which is used by e.g. the OLPC people.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_MMC_RICOH_MMC=y
Enable CONFIG_MMC_RICOH_MMC=y for ports and ubuntu. This option adds a
pci quirk to disable Ricoh MMC Controller. This proprietary controller
is unnecessary because the SDHCI driver supports MMC cards on the SD
controller, but if it is not disabled, it will steal the MMC cards away
- rendering them useless. It is safe to select this even if you don't
have a Ricoh based card reader.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] CONFIG_RT2800USB_UNKNOWN=y
Enable CONFIG_RT2800USB_UNKNOWN=y for ports and ubuntu. This option
adds support for rt2800 family devices that are known to have a rt2800
family chipset, but for which the exact chipset is unknown.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_VGA_SWITCHEROO=y
Enable CONFIG_VGA_SWITCHEROO=y for ubuntu. Many laptops released in
2008/9/10 have two gpus with a multiplxer to switch between them. This
adds support for dynamic switching when X isn't running and delayed
switching until the next logoff. This feature is called hybrid graphics,
ATI PowerXpress, and Nvidia HybridPower.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_CEPH_FS=m
Enable CONFIG_CEPH_FS=m for ports and ubuntu. Per our config selection
criteria, "if the option creates a new subsystem (or filesystem) we will
enable it". Ceph is an extremely scalable file system designed to
provide high performance, reliable access to petabytes of storage.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_CRYPTO_PCRYPT=m
Enable CONFIG_CRYPTO_PCRYPT=m for ports and ubuntu. This option
converts an arbitrary crypto algorithm into a parallel algorithm
that executes in kernel threads.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_EEEPC_WMI=m
Enable CONFIG_EEEPC_WMI=m for ubuntu. This option provides support for
WMI-based hotkeys on Eee PC laptops.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_RT2800PCI=m
Enable CONFIG_RT2800PCI=m for ports and ubuntu. This option adds
support for the rt2800/rt3000/rt3500 wireless chipset family.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_SCSI_HPSA=m
Enable CONFIG_SCSI_HPSA=m for ports and ubuntu. This option supports HP
Smart Array Controllers (circa 2009). It is a SCSI alternative to the
cciss driver, which is a block driver. This option allows anyone wishing
to use HP Smart Array controllers to present the devices to linux as SCSI
devices, rather than as generic block devices.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_VHOST_NET=m
Enable CONFIG_VHOST_NET=m for ports and ubuntu. This module can be
loaded in host kernel to accelerate guest networking with virtio_net.
Not to be confused with virtio_net module itself which needs to be
loaded in guest kernel.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Disable CONFIG_SND_HDA_INPUT_BEEP_MODE by default
BugLink: http://bugs.launchpad.net/bugs/582350
Set CONFIG_SND_HDA_INPUT_BEEP_MODE=0 which disables the the digital beep
interface for HD-audio by default. Note that this value is runtime
configurable via sysfs if people wish to enable.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Disable CONFIG_SOUND_OSS* and CONFIG_SND_*OSS
BugLink: http://bugs.launchpad.net/bugs/579300
In Maverick we're investigating using OSSp to shunt all apps attempting
to use the older in-kernel OSS API to use pulse instead. To do so,
we need to disable all forms of OSS (native and emulated). This means
disabling CONFIG_SOUND_OSS* and CONFIG_SND_*OSS*.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_PCIEASPM=y
BugLink: http://bugs.launchpad.net/bugs/333990
Enable CONFIG_PCIEASPM=y for ports and ubuntu. This option enables PCI
Express ASPM (Active State Power Management) and Clock Power Management.
Users have confirmed powersaving after having enabled this option.
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Add support for OMAP-mainline flavour
Add a new kernel flavour to enable the OMAP arch. This flavour will only
enable features that are in mainline.
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] updateconfigs for OMAP flavour
Update configs after adding the OMAP-mainline flavour.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-4.11
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Add new omap flavour to getabis
Now that we've added a new -omap flavour, we need to take this into
consideration when we run getabis. Add omap to getabis.
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Enable CONFIG_FRAMEBUFFER_CONSOLE=y for all archs
BugLink: http://bugs.launchpad.net/bugs/585490
Per a request from the Foundations Team, building in fbcon by default
across all archs will ensure we reliably have a framebuffer console from
the start. Ports already builds this config option in by default.
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: build with libdw-dev for perf probe symbol support
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: maverick ftrace configuration changes
I've reviewed the ftrace configuration for the maverick kernel. The
changes can be generalized to:
* Enable syscall tracing plugin
* Enable scheduler tracing plugin
* Enable max stack size tracing plugin for non-ARM kernels
* Disable function tracer for ARM platforms due to inability to
dynamically enable and disable at runtime
In general, any discrepencies between ARM and other kernels is due to
ARM's inability to dynamically trace functions. Hopefully this will be
resolved soon, but not soon enough for 10.10.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: build/modules: Temorarily add ignore.modules
We've modified some kernel configuration changes which result in modules
being built in. Temporarily ignore the module check to prevent FTBS.
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: enforce -- ensure SYSFS compatibility is disabled
Ensure we have all of the SYSFS compatibility modes disabled.
BluePrint: http://blueprints.launchpad.net/ubuntu/+spec/kernel-maverick-upstart
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-5.12
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: purposely skip ABI and modules check
Purposely skip ABI and modules check due to aufs2 update.
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-5.13
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] d-i: Make DAC960 optional
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Added module inclusion support
In order to preserve some semblance of commonality in the
config files, I decided to build the virtual flavour by compiling all
of the default modules, then whittling the package down by removing modules
not specifically required for the virtual flavour. The package construction
process looks for a file in debian.<BRANCH>/control.d/<FLAVOUR>.inclusion-list
for a recipe. Note that you may also have to define some udeb module flavour
exclusions in debian.<BRANCH>/d-i/exclude-<ARCH>-<FLAVOUR>.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Config] Added virtual flavour module inclusion list and d-i package definitions
BugLink: http://bugs.launchpad.net/bugs/lp587893
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: Ubuntu-2.6.34-5.14
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
|
