Jaunty config changes: Build in ACPI ac, battery, button, fan, PCI slot, processor, sbs, thermal, wmi

[Andy Whitcroft]

On Sun, Dec 21, 2008 at 11:57:09AM -0700, Tim Gardner wrote:
> From 3d214c11300d28685b8a11d059a517d5d580d4c1 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner at canonical.com>
> Date: Sun, 21 Dec 2008 10:26:00 -0700
> Subject: [PATCH] UBUNTU: Build in ACPI AC,BATTERY,BUTTON,FAN,PCI_SLOT,PROCESSOR,SBS,THERMAL,WMI
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian/config/amd64/config      |   20 ++++++++++----------
>  debian/config/i386/config       |   20 ++++++++++----------
>  debian/d-i/modules/acpi-modules |    2 --
>  debian/d-i/package-list         |    5 -----
>  4 files changed, 20 insertions(+), 27 deletions(-)
>  delete mode 100644 debian/d-i/modules/acpi-modules

That looks sane.  Will we have to handle the dissapparance of the
acpi-modules udev separatly?

> diff --git a/debian/config/amd64/config b/debian/config/amd64/config
> index 3201fa1..40f125c 100644
> --- a/debian/config/amd64/config
> +++ b/debian/config/amd64/config
> @@ -26,32 +26,32 @@ CONFIG_ACORN_PARTITION_ICS=y
>  # CONFIG_ACORN_PARTITION_POWERTEC is not set
>  CONFIG_ACORN_PARTITION_RISCIX=y
>  CONFIG_ACPI=y
> -CONFIG_ACPI_AC=m
> +CONFIG_ACPI_AC=y
>  # CONFIG_ACPI_ASUS is not set
> -CONFIG_ACPI_BATTERY=m
> +CONFIG_ACPI_BATTERY=y
>  CONFIG_ACPI_BLACKLIST_YEAR=0
> -CONFIG_ACPI_BUTTON=m
> -CONFIG_ACPI_CONTAINER=m
> +CONFIG_ACPI_BUTTON=y
> +CONFIG_ACPI_CONTAINER=y
>  # CONFIG_ACPI_CUSTOM_DSDT is not set
>  CONFIG_ACPI_CUSTOM_DSDT_FILE=""
>  CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
>  # CONFIG_ACPI_DEBUG is not set
>  CONFIG_ACPI_DOCK=y
> -CONFIG_ACPI_FAN=m
> +CONFIG_ACPI_FAN=y
>  CONFIG_ACPI_HOTPLUG_CPU=y
> -CONFIG_ACPI_PCI_SLOT=m
> -CONFIG_ACPI_PROCESSOR=m
> +CONFIG_ACPI_PCI_SLOT=y
> +CONFIG_ACPI_PROCESSOR=y
>  CONFIG_ACPI_PROCFS=y
>  CONFIG_ACPI_PROCFS_POWER=y
>  CONFIG_ACPI_PROC_EVENT=y
> -CONFIG_ACPI_SBS=m
> +CONFIG_ACPI_SBS=y
>  CONFIG_ACPI_SLEEP=y
>  CONFIG_ACPI_SYSFS_POWER=y
>  CONFIG_ACPI_SYSTEM=y
> -CONFIG_ACPI_THERMAL=m
> +CONFIG_ACPI_THERMAL=y
>  # CONFIG_ACPI_TOSHIBA is not set
>  CONFIG_ACPI_VIDEO=m
> -CONFIG_ACPI_WMI=m
> +CONFIG_ACPI_WMI=y
>  CONFIG_ACQUIRE_WDT=m
>  CONFIG_ACT200L_DONGLE=m
>  CONFIG_ACTISYS_DONGLE=m
> diff --git a/debian/config/i386/config b/debian/config/i386/config
> index 0446a43..dfe55c7 100644
> --- a/debian/config/i386/config
> +++ b/debian/config/i386/config
> @@ -29,32 +29,32 @@ CONFIG_ACORN_PARTITION_ICS=y
>  # CONFIG_ACORN_PARTITION_POWERTEC is not set
>  CONFIG_ACORN_PARTITION_RISCIX=y
>  CONFIG_ACPI=y
> -CONFIG_ACPI_AC=m
> +CONFIG_ACPI_AC=y
>  # CONFIG_ACPI_ASUS is not set
> -CONFIG_ACPI_BATTERY=m
> +CONFIG_ACPI_BATTERY=y
>  CONFIG_ACPI_BLACKLIST_YEAR=2000
> -CONFIG_ACPI_BUTTON=m
> -CONFIG_ACPI_CONTAINER=m
> +CONFIG_ACPI_BUTTON=y
> +CONFIG_ACPI_CONTAINER=y
>  # CONFIG_ACPI_CUSTOM_DSDT is not set
>  CONFIG_ACPI_CUSTOM_DSDT_FILE=""
>  CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
>  # CONFIG_ACPI_DEBUG is not set
>  CONFIG_ACPI_DOCK=y
> -CONFIG_ACPI_FAN=m
> +CONFIG_ACPI_FAN=y
>  CONFIG_ACPI_HOTPLUG_CPU=y
> -CONFIG_ACPI_PCI_SLOT=m
> -CONFIG_ACPI_PROCESSOR=m
> +CONFIG_ACPI_PCI_SLOT=y
> +CONFIG_ACPI_PROCESSOR=y
>  CONFIG_ACPI_PROCFS=y
>  CONFIG_ACPI_PROCFS_POWER=y
>  CONFIG_ACPI_PROC_EVENT=y
> -CONFIG_ACPI_SBS=m
> +CONFIG_ACPI_SBS=y
>  CONFIG_ACPI_SLEEP=y
>  CONFIG_ACPI_SYSFS_POWER=y
>  CONFIG_ACPI_SYSTEM=y
> -CONFIG_ACPI_THERMAL=m
> +CONFIG_ACPI_THERMAL=y
>  # CONFIG_ACPI_TOSHIBA is not set
>  CONFIG_ACPI_VIDEO=m
> -CONFIG_ACPI_WMI=m
> +CONFIG_ACPI_WMI=y
>  CONFIG_ACQUIRE_WDT=m
>  CONFIG_ACT200L_DONGLE=m
>  CONFIG_ACTISYS_DONGLE=m
> diff --git a/debian/d-i/modules/acpi-modules b/debian/d-i/modules/acpi-modules
> deleted file mode 100644
> index d4723a1..0000000
> --- a/debian/d-i/modules/acpi-modules
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -fan
> -thermal
> diff --git a/debian/d-i/package-list b/debian/d-i/package-list
> index 9ffe459..43fd23a 100644
> --- a/debian/d-i/package-list
> +++ b/debian/d-i/package-list
> @@ -2,11 +2,6 @@ Package: kernel-image
>  Provides_armel: crypto-modules, ext2-modules, ext3-modules, socket-modules, fat-modules
>  Provides_armel_versatile: crypto-modules, ext2-modules, ext3-modules, socket-modules, fb-modules
>  
> -Package: acpi-modules
> -Depends: kernel-image
> -Priority: standard
> -Description: Support for ACPI
> -
>  Package: fat-modules
>  Depends: kernel-image
>  Priority: standard

-apw