[linux] 02/04: [hppa/parisc64-smp, mips*el/loongson-3] udeb: Remove i2c-modules again (fixes FTBFS)
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Sep 27 12:30:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit b2a13150adeaa0c2934372315118804923fac810
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Sep 27 13:15:14 2015 +0100
[hppa/parisc64-smp,mips*el/loongson-3] udeb: Remove i2c-modules again (fixes FTBFS)
The drivers that belong in it are actually built-in. Adjust the
config to make sure this remains true.
---
debian/changelog | 2 ++
debian/config/hppa/config.parisc64-smp | 10 ++++++++++
debian/config/kernelarch-mips/config.loongson-3 | 10 ++++++++++
debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules | 1 -
debian/installer/hppa/package-list | 1 +
debian/installer/mips64el/package-list | 1 +
debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules | 1 -
debian/installer/mipsel/package-list | 1 +
8 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e02b15..d8e510e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linux (4.2.1-2) UNRELEASED; urgency=medium
* media: uvcvideo: Disable hardware timestamps by default (Closes: #794327)
* [mips*] udeb: Remove 'Provides: ata-modules' from kernel-image
+ * [hppa/parisc64-smp,mips*el/loongson-3] udeb: Remove i2c-modules again, as
+ the drivers that belong in it are actually built-in (fixes FTBFS)
-- Ben Hutchings <ben at decadent.org.uk> Sat, 26 Sep 2015 16:40:51 +0100
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index 98326f9..e39d0c9 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -38,6 +38,16 @@ CONFIG_DRM=y
CONFIG_DRM_RADEON=m
##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+
+##
+## file: drivers/i2c/algos/Kconfig
+##
+CONFIG_I2C_ALGOBIT=y
+
+##
## file: mm/Kconfig
##
## choice: Memory model
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 68a480b..6534868 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -34,6 +34,16 @@ CONFIG_DRM=m
CONFIG_DRM_RADEON=m
##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+
+##
+## file: drivers/i2c/algos/Kconfig
+##
+CONFIG_I2C_ALGOBIT=y
+
+##
## file: drivers/net/ethernet/8390/Kconfig
##
CONFIG_NET_VENDOR_8390=y
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules
deleted file mode 100644
index 203a607..0000000
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <i2c-modules>
diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list
index edbeff4..a44aeb8 100644
--- a/debian/installer/hppa/package-list
+++ b/debian/installer/hppa/package-list
@@ -4,6 +4,7 @@
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
Package: kernel-image
+Provides_parisc64-smp: i2c-modules
Package: usb-storage-modules
Depends: kernel-image, ide-modules, scsi-modules, usb-modules
diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list
index b7141bb..621363a 100644
--- a/debian/installer/mips64el/package-list
+++ b/debian/installer/mips64el/package-list
@@ -5,3 +5,4 @@
#
Package: kernel-image
Provides: rtc-modules
+Provides_loongson-3: i2c-modules, rtc-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules
deleted file mode 100644
index 203a607..0000000
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <i2c-modules>
diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list
index b7141bb..621363a 100644
--- a/debian/installer/mipsel/package-list
+++ b/debian/installer/mipsel/package-list
@@ -5,3 +5,4 @@
#
Package: kernel-image
Provides: rtc-modules
+Provides_loongson-3: i2c-modules, rtc-modules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list