[PATCH] UBUNTU: handle relative paths in modules.dep

[Tim Gardner]

Kees Cook wrote:
> Later module-init-tools does not use full path name any more.  This broke
> the sub-flavor script when building up the list of modules to copy over.
> 
> Signed-off-by: Kees Cook <kees.cook at canonical.com>
> ---
>  debian/scripts/sub-flavour |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/debian/scripts/sub-flavour b/debian/scripts/sub-flavour
> index ca49ddd..250b93e 100644
> --- a/debian/scripts/sub-flavour
> +++ b/debian/scripts/sub-flavour
> @@ -18,12 +18,14 @@ cat debian/sub-flavours/$TO.list | while read line; do
>  	(cd debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM/kernel;
>  	eval find $line -name '*.ko');
>  done | while read mod; do
> -	echo "SUB_INST $mod"
> -	grep "^/lib/modules/$ABI_RELEASE-$FROM/kernel/$mod:" \
> -		$from_moddir/modules.dep | sed -e 's/://' -e 's/ /\n/g' | \
> +	echo "SUB_INST checking: $mod"
> +	fromdir="/lib/modules/$ABI_RELEASE-$FROM/"
> +	egrep "^($fromdir)?kernel/$mod:" \
> +		$from_moddir/modules.dep | sed -e "s|^$fromdir||" -e 's/://' -e 's/ /\n/g' | \
>  	while read m; do
> +		m="${fromdir}$m"
>  		test -f debian/$to_pkg/$m && continue
> -		echo "SUB_INST $mod"
> +		echo "SUB_INST installing: $mod"
>  		install -D -m644 debian/$from_pkg/$m \
>  			debian/$to_pkg/$m
>  	done

Applied - this appears to fix the current FTBS.
-- 
Tim Gardner tim.gardner at canonical.com