[B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Martin Hundebøll]

Currently, when installing the out-of-tree module on distributions that
use gzipped modules, batman-adv.ko will be installed next to
batman-adv.ko.gz, which is selected by kmod.

By changing the install path to
/lib/modules/`uname -r`/updates/net/batman-adv/
and running "depmod -ae", we make the newly installed module used by
kmod.

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
---
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ac84fba..c68937d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ clean:
 	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean
 
 install: config
-	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install
+	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=updates/net/batman-adv/ modules_install
+	depmod -ae
 
 config:
 	$(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h
-- 
1.7.10

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

On Wed, May 02, 2012 at 08:50:51 +0200, Martin Hundebøll wrote:
> Currently, when installing the out-of-tree module on distributions that
> use gzipped modules, batman-adv.ko will be installed next to
> batman-adv.ko.gz, which is selected by kmod.
> 
> By changing the install path to
> /lib/modules/`uname -r`/updates/net/batman-adv/
> and running "depmod -ae", we make the newly installed module used by
> kmod.
> 
> Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
> ---
>  Makefile |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index ac84fba..c68937d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -55,7 +55,8 @@ clean:
>  	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean
>  
>  install: config
> -	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install
> +	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=updates/net/batman-adv/ modules_install
> +	depmod -ae

would it be cleaner to run depmod -e $(uname -r) instead of using -a ?

Cheers,

>  
>  config:
>  	$(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h
> -- 
> 1.7.10

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

On Wednesday, May 02, 2012 11:16:13 PM Antonio Quartulli wrote:
> would it be cleaner to run depmod -e $(uname -r) instead of using -a ?


Why? The module doesn't have to be build for the current kernel.

Kind regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 702 bytes --]

iOn Thu, May 03, 2012 at 08:26:40AM +0200, Sven Eckelmann wrote:
> On Wednesday, May 02, 2012 11:16:13 PM Antonio Quartulli wrote:
> > would it be cleaner to run depmod -e $(uname -r) instead of using -a ?
> 
> 
> Why? The module doesn't have to be build for the current kernel.
>

Ok, then maybe $(uname -r) is not the appropriate way to get the version of the
kernel we are compiling the module for, but I think we should run depmod only
for that kernel.

However, is a minor problem. I see every other kernel module acting the way I
described. But we can live anyway I think :)


Cheers,



-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

On Thursday, May 03, 2012 08:40:48 AM Antonio Quartulli wrote:
> However, is a minor problem. I see every other kernel module acting the way
> I described. But we can live anyway I think :)

I've just opened compat-wireless and it does a `/sbin/depmod -a`

Kind regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Change "make install" path and run depmod

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

On Thu, May 03, 2012 at 08:45:32AM +0200, Sven Eckelmann wrote:
> On Thursday, May 03, 2012 08:40:48 AM Antonio Quartulli wrote:
> > However, is a minor problem. I see every other kernel module acting the way
> > I described. But we can live anyway I think :)
> 
> I've just opened compat-wireless and it does a `/sbin/depmod -a`

Oh, ok. If they do that, I think we can live with it too. :)

Cheers,


-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

[B.A.T.M.A.N.] [[PATCHv2]] batman-adv: Change "make install" path and run depmod

[Martin Hundebøll]

Currently, when installing the out-of-tree module on distributions that
use gzipped modules, batman-adv.ko will be installed next to
batman-adv.ko.gz, which is selected by kmod.

By changing the install path to
/lib/modules/`uname -r`/updates/net/batman-adv/
and running "depmod -ae", we make the newly installed module used by
kmod.

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
---

I removed the -e option from depmod, as it caused a warning on my system.

 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ac84fba..57530db 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ clean:
 	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean
 
 install: config
-	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install
+	$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=updates/net/batman-adv/ modules_install
+	depmod -a
 
 config:
 	$(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h
-- 
1.7.10.1

Re: [B.A.T.M.A.N.] [[PATCHv2]] batman-adv: Change "make install" path and run depmod

[Marek Lindner]

On Thursday, May 03, 2012 16:15:07 Martin Hundebøll wrote:
> Currently, when installing the out-of-tree module on distributions that
> use gzipped modules, batman-adv.ko will be installed next to
> batman-adv.ko.gz, which is selected by kmod.
> 
> By changing the install path to
> /lib/modules/`uname -r`/updates/net/batman-adv/
> and running "depmod -ae", we make the newly installed module used by
> kmod.

Applied in revision 515bdd0.

Thanks,
Marek