diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-13 11:12:32 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-13 11:12:32 +0200 |
| commit | e14065fb12e75bce29e99bcd5daa80de8603da58 (patch) | |
| tree | 66892a26b9bc10fdc6f88ada2bf8f13532673841 | |
| parent | f0d4a871fa84d094bcb337b16ce7bc4c17bc750a (diff) | |
LINARO: Build Gator module as part of kernel
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Conflicts:
debian.linaro/changelog
| -rw-r--r-- | debian.linaro/changelog | 5 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.linaro/control.d/flavour-control.stub | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 6dc7450c252..607244ad06b 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -3,3 +3,8 @@ linux-ux500 (3.3.0-1000.0) oneiric; urgency=low * Initial release. -- Lee Jones <lee.jones@linaro.org> Fri, 06 Apr 2012 13:18:19 +0200 + + * Update to Linux 3.3 + * Build Gator module and "Provides: gator-module, gator-module-in-tree" + + -- Jon Medhurst (Tixy) <jon.medhurst@linaro.org> Mon, 19 Mar 2012 09:57:00 +0000 diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index 0dcc1b54aa8..d6c528ffba2 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -692,6 +692,7 @@ CONFIG_FUNCTION_TRACER=y CONFIG_FUTEX=y CONFIG_FW_LOADER=y # CONFIG_GAMEPORT is not set +CONFIG_GATOR=m # CONFIG_GCOV_KERNEL is not set CONFIG_GENERIC_ACL=y CONFIG_GENERIC_BUG=y diff --git a/debian.linaro/control.d/flavour-control.stub b/debian.linaro/control.d/flavour-control.stub index 5ea910a5080..7951d3ff12b 100644 --- a/debian.linaro/control.d/flavour-control.stub +++ b/debian.linaro/control.d/flavour-control.stub @@ -26,7 +26,7 @@ Architecture: ARCH Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -#Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES= +Provides: gator-module, gator-module-in-tree Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: BOOTLOADER |