summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-13 15:57:12 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-13 15:57:12 +0200
commit28f77efa84b8cb1a3c1d87c44ec449f81db20d23 (patch)
treef47937eabec3d57d8fb5e6af9e6711a7d4fc268b
parent91eb730cbd3deefbcdf142bcf17b11ae5d761430 (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/changelog5
-rw-r--r--debian.linaro/config/config.common.ubuntu1
-rw-r--r--debian.linaro/control.d/flavour-control.stub2
3 files changed, 7 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 64e594afd22..a0dd4da0208 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> Thu, 16 Feb 2012 17:34:08 +0100
+
+ * 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 d73563647f5..cc9e434afcf 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -693,6 +693,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