From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <nhorman@tuxdriver.com>
Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58])
 by dpdk.org (Postfix) with ESMTP id AAA1D7E7E
 for <dev@dpdk.org>; Wed,  8 Oct 2014 16:29:59 +0200 (CEST)
Received: from nat-pool-rdu-t.redhat.com ([66.187.233.202] helo=localhost)
 by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63)
 (envelope-from <nhorman@tuxdriver.com>)
 id 1XbsML-0005K9-P3; Wed, 08 Oct 2014 10:37:14 -0400
Date: Wed, 8 Oct 2014 10:36:52 -0400
From: Neil Horman <nhorman@tuxdriver.com>
To: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
Message-ID: <20141008143652.GC5279@localhost.localdomain>
References: <1412773891-25774-1-git-send-email-danielx.t.mrzyglod@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1412773891-25774-1-git-send-email-danielx.t.mrzyglod@intel.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Score: -2.9 (--)
X-Spam-Status: No
Cc: dev@dpdk.org, Daniel Mrzyglod <dtmrzglx@sivswdev02.ir.intel.com>
Subject: Re: [dpdk-dev] [PATCH] Modify tools/setup.sh to be compatible with
 fedora 21
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2014 14:29:59 -0000

On Wed, Oct 08, 2014 at 02:11:31PM +0100, Daniel Mrzyglod wrote:
> From: Daniel Mrzyglod <dtmrzglx@localhost.localdomain>
> 
> script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
> there are Compressed kernel modules - xz (LZMA)
> 
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> ---
>  tools/setup.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/setup.sh b/tools/setup.sh
> index 369e09e..6a9d23c 100755
> --- a/tools/setup.sh
> +++ b/tools/setup.sh
> @@ -169,7 +169,7 @@ load_igb_uio_module()
>  
>  	/sbin/lsmod | grep -s uio > /dev/null
>  	if [ $? -ne 0 ] ; then
> -		if [ -f /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko ] ; then
> +		if ls /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko* &> /dev/null; then
>  			echo "Loading uio module"
>  			sudo /sbin/modprobe uio
>  		fi
> -- 
> 2.1.0
> 
> 

Just use modinfo uio and test the exit code.  That will make the setup script
agnostic to both filename extension and to kernel version, as modinfo looks in
the running kernel path automatically

Neil