[PATCH] [Hardy] UBUNTU: Enable multicast routing (including PIM1 and PIM2) for ia64, hppa, sparc

[Stefan Bader]

Leann Ogasawara wrote:
> On Wed, 2009-08-26 at 18:36 +0200, Stefan Bader wrote:
>> Tim Gardner wrote:
> [snip]
>>> I have to agree with Fabio. Arch independent, distro common settings
>>> _should_ be the same for all flavours. In fact, it could be considered a
>>> regression in that this feature is _not_ enabled for hppa and ia64
>>> (though I doubt any of these platforms are being used as border gateway
>>> routers).
>> Surely those options _should_ be the same. My point is that this is a 
>> _released_ series. And by that we usually avoid unnecessary changes unless 
>> someone asks and is able to test.
> 
> I've redone the patch to also enable multicast routing support for ia64,
> hppa, and sparc.  Test kernels have been built and pushed to:
> 
> http://people.canonical.com/~ogasawara/lp416266/
> 
> Fabio, Lamont, if you guys would be so kind to test ia64 and hppa that
> would be great.  It'll at least help calm our fear of regression.
> 
> Updated pull request is as follows:
> 
> The following changes since commit
> 49129c66849148a6e6028da587616af4a3d588d2:
>   Stefan Bader (1):
>         UBUNTU: Start new release Ignore: yes
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ogasawara/ubuntu-hardy.git lp416266ia64hppa
> 
> Leann Ogasawara (1):
>       UBUNTU: Enable multicast routing (including PIM1 and PIM2) for
> hppa, ia64, sparc
> 
>  debian/config/hppa/config  |    4 +++-
>  debian/config/ia64/config  |    4 +++-
>  debian/config/sparc/config |    4 +++-
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
>>From 9ad8da1c6b0b70260c3109d10d66b88ab9913af7 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara at canonical.com>
> Date: Wed, 26 Aug 2009 10:04:26 -0700
> Subject: [PATCH] UBUNTU: Enable multicast routing (including PIM1 and
> PIM2) for hppa, ia64, sparc
> 
> It was discovered that multicast routing (including PIM1 and PIM2)
> for hppa, ia64, and sparc was not enabled.  Enable this for all
> three archs.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
> ---
>  debian/config/hppa/config  |    4 +++-
>  debian/config/ia64/config  |    4 +++-
>  debian/config/sparc/config |    4 +++-
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/config/hppa/config b/debian/config/hppa/config
> index fd1c4f6..5e88f90 100644
> --- a/debian/config/hppa/config
> +++ b/debian/config/hppa/config
> @@ -524,7 +524,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
>  CONFIG_IP_DCCP_TFRC_LIB=m
>  CONFIG_IP_FIB_HASH=y
>  # CONFIG_IP_FIB_TRIE is not set
> -# CONFIG_IP_MROUTE is not set
> +CONFIG_IP_MROUTE=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_MULTIPLE_TABLES=y
>  CONFIG_IP_NF_ARPFILTER=m
> @@ -554,6 +554,8 @@ CONFIG_IP_NF_TARGET_SAME=m
>  CONFIG_IP_NF_TARGET_TOS=m
>  CONFIG_IP_NF_TARGET_TTL=m
>  CONFIG_IP_NF_TARGET_ULOG=m
> +CONFIG_IP_PIMSM_V1=y
> +CONFIG_IP_PIMSM_V2=y
>  CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_BOOTP=y
>  # CONFIG_IP_PNP_DHCP is not set
> diff --git a/debian/config/ia64/config b/debian/config/ia64/config
> index c7acc58..c814d74 100644
> --- a/debian/config/ia64/config
> +++ b/debian/config/ia64/config
> @@ -1039,7 +1039,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
>  CONFIG_IP_DCCP_TFRC_LIB=m
>  CONFIG_IP_FIB_HASH=y
>  # CONFIG_IP_FIB_TRIE is not set
> -# CONFIG_IP_MROUTE is not set
> +CONFIG_IP_MROUTE=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_MULTIPLE_TABLES=y
>  CONFIG_IP_NF_ARPFILTER=m
> @@ -1069,6 +1069,8 @@ CONFIG_IP_NF_TARGET_SAME=m
>  CONFIG_IP_NF_TARGET_TOS=m
>  CONFIG_IP_NF_TARGET_TTL=m
>  CONFIG_IP_NF_TARGET_ULOG=m
> +CONFIG_IP_PIMSM_V1=y
> +CONFIG_IP_PIMSM_V2=y
>  # CONFIG_IP_PNP is not set
>  CONFIG_IP_ROUTE_MULTIPATH=y
>  CONFIG_IP_ROUTE_VERBOSE=y
> diff --git a/debian/config/sparc/config b/debian/config/sparc/config
> index c64c592..95277c0 100644
> --- a/debian/config/sparc/config
> +++ b/debian/config/sparc/config
> @@ -769,7 +769,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
>  CONFIG_IP_DCCP_TFRC_LIB=m
>  CONFIG_IP_FIB_HASH=y
>  # CONFIG_IP_FIB_TRIE is not set
> -# CONFIG_IP_MROUTE is not set
> +CONFIG_IP_MROUTE=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_MULTIPLE_TABLES=y
>  CONFIG_IP_NF_ARPFILTER=m
> @@ -799,6 +799,8 @@ CONFIG_IP_NF_TARGET_SAME=m
>  CONFIG_IP_NF_TARGET_TOS=m
>  CONFIG_IP_NF_TARGET_TTL=m
>  CONFIG_IP_NF_TARGET_ULOG=m
> +CONFIG_IP_PIMSM_V1=y
> +CONFIG_IP_PIMSM_V2=y
>  CONFIG_IP_PNP=y
>  # CONFIG_IP_PNP_BOOTP is not set
>  # CONFIG_IP_PNP_DHCP is not set

Applied and pushed, thanks

-- 

When all other means of communication fail, try words!