List Info

Thread: kpfleming: branch 1.2 r1766 - /branches/1.2/xpp/
kpfleming: branch 1.2 r1766 - /branches/1.2/xpp/
user name
 2006-12-31 16:17:20 
Hi

On Wed, Dec 27, 2006 at 10:47:19PM -0000, svn-commitslists.digium.com wrote:
> Author: kpfleming
> Date: Wed Dec 27 16:47:19 2006
> New Revision: 1766
> 
> URL: http://svn.digium.com/view/zaptel?view=rev&rev=1766
> Log:
> remove pointless duplication of ZAPTEL_VERSION that
causes these modules to 
> be rebuilt every time a commit is made to any part of
Zaptel

We actually use the VERSION header, both through modinfo and
for the log
messages on module load.

However by the same logic you should not includethat header
on zaptel.c:
if the version is bumped, zaptel.c gets rebuilt.

> 
> Modified:
>     branches/1.2/xpp/card_fxo.c
>     branches/1.2/xpp/card_fxs.c
>     branches/1.2/xpp/xpp_usb.c
>     branches/1.2/xpp/xpp_zap.c
> 
> Modified: branches/1.2/xpp/card_fxo.c
> URL: http
://svn.digium.com/view/zaptel/branches/1.2/xpp/card_fxo.c?vi
ew=diff&rev=1766&r1=1765&r2=1766
>
============================================================
==================
> --- branches/1.2/xpp/card_fxo.c (original)
> +++ branches/1.2/xpp/card_fxo.c Wed Dec 27 16:47:19
2006
>  -24,7 +24,6 
>  #include <linux/module.h>
>  #include <linux/fs.h>
>  #include <linux/delay.h>
> -#include <version.h>		/* For zaptel version */
>  #include "xpd.h"
>  #include "xproto.h"
>  #include "xpp_zap.h"
>  -897,7 +896,7 
>  
>  int __init card_fxo_startup(void)
>  {
> -	INFO("%s revision %s\n",
THIS_MODULE->name, ZAPTEL_VERSION);
> +	INFO("%s\n", THIS_MODULE->name);
>  	xproto_register(&PROTO_TABLE(FXO));
>  	return 0;
>  }
>  -910,7 +909,6 
>  MODULE_DESCRIPTION("XPP FXO Card Driver");
>  MODULE_AUTHOR("Oron Peled <oronactcom.co.il>");
>  MODULE_LICENSE("GPL");
> -MODULE_VERSION(ZAPTEL_VERSION);
>  MODULE_ALIAS_XPD(XPD_TYPE_FXO);
>  
>  module_init(card_fxo_startup);
> 
> Modified: branches/1.2/xpp/card_fxs.c
> URL: http
://svn.digium.com/view/zaptel/branches/1.2/xpp/card_fxs.c?vi
ew=diff&rev=1766&r1=1765&r2=1766
>
============================================================
==================
> --- branches/1.2/xpp/card_fxs.c (original)
> +++ branches/1.2/xpp/card_fxs.c Wed Dec 27 16:47:19
2006
>  -24,7 +24,6 
>  #include <linux/module.h>
>  #include <linux/fs.h>
>  #include <linux/delay.h>
> -#include <version.h>		/* For zaptel version */
>  #include "xpd.h"
>  #include "xproto.h"
>  #include "xpp_zap.h"
>  -989,7 +988,7 
>  
>  int __init card_fxs_startup(void)
>  {
> -	INFO("%s revision %s\n",
THIS_MODULE->name, ZAPTEL_VERSION);
> +	INFO("%s\n", THIS_MODULE->name);
>  #ifdef	POLL_DIGITAL_INPUTS
>  	INFO("FEATURE: %s with DIGITAL INPUTS support
(%s activated)\n",
>  			THIS_MODULE->name, (poll_digital_inputs) ?
"is" : "is not");
>  -1008,7 +1007,6 
>  MODULE_DESCRIPTION("XPP FXS Card Driver");
>  MODULE_AUTHOR("Oron Peled <oronactcom.co.il>");
>  MODULE_LICENSE("GPL");
> -MODULE_VERSION(ZAPTEL_VERSION);
>  MODULE_ALIAS_XPD(XPD_TYPE_FXS);
>  
>  module_init(card_fxs_startup);
> 
> Modified: branches/1.2/xpp/xpp_usb.c
> URL: http:
//svn.digium.com/view/zaptel/branches/1.2/xpp/xpp_usb.c?view
=diff&rev=1766&r1=1765&r2=1766
>
============================================================
==================
> --- branches/1.2/xpp/xpp_usb.c (original)
> +++ branches/1.2/xpp/xpp_usb.c Wed Dec 27 16:47:19 2006
>  -38,7 +38,6 
>  #include <asm/timex.h>
>  #include <linux/proc_fs.h>
>  #include <linux/usb.h>
> -#include <version.h>		/* For zaptel version */
>  #include "xpd.h"
>  #include "xproto.h"
>  #include "xbus-core.h"
>  -861,7 +860,7 
>  	int result;
>  	//xusb_t *xusb;
>  
> -	INFO("%s revision %s\n",
THIS_MODULE->name, ZAPTEL_VERSION);
> +	INFO("%s\n", THIS_MODULE->name);
>  
>  	/* register this driver with the USB subsystem */
>  	result = usb_register(&xusb_driver);
>  -942,7 +941,6 
>  MODULE_DESCRIPTION("XPP USB Driver");
>  MODULE_AUTHOR("Oron Peled <oronactcom.co.il>");
>  MODULE_LICENSE("GPL");
> -MODULE_VERSION(ZAPTEL_VERSION);
>  
>  module_init(xpp_usb_init);
>  module_exit(xpp_usb_cleanup);
> 
> Modified: branches/1.2/xpp/xpp_zap.c
> URL: http:
//svn.digium.com/view/zaptel/branches/1.2/xpp/xpp_zap.c?view
=diff&rev=1766&r1=1765&r2=1766
>
============================================================
==================
> --- branches/1.2/xpp/xpp_zap.c (original)
> +++ branches/1.2/xpp/xpp_zap.c Wed Dec 27 16:47:19 2006
>  -39,7 +39,6 
>  #include <linux/workqueue.h>
>  #include <linux/proc_fs.h>
>  #include <zaptel.h>
> -#include <version.h>		/* For zaptel version */
>  #include "xbus-core.h"
>  #include "xproto.h"
>  #include "xpp_zap.h"
>  -1448,7 +1447,7 
>  	int			ret = 0;
>  	struct proc_dir_entry	*ent;
>  
> -	INFO("%s revision %s MAX_XPDS=%d
(%d*%d)\n", THIS_MODULE->name, ZAPTEL_VERSION,
> +	INFO("%s MAX_XPDS=%d (%d*%d)\n",
THIS_MODULE->name,
>  			MAX_XPDS, MAX_UNIT, MAX_SUBUNIT);
>  #if WITH_ECHO_SUPPRESSION
>  	INFO("FEATURE: %s (with
ECHO_SUPPRESSION)\n", THIS_MODULE->name);
>  -1520,7 +1519,6 
>  MODULE_DESCRIPTION("XPP Zaptel Driver");
>  MODULE_AUTHOR("Oron Peled <oronactcom.co.il>");
>  MODULE_LICENSE("GPL");
> -MODULE_VERSION(ZAPTEL_VERSION);
>  
>  module_init(xpp_zap_init);
>  module_exit(xpp_zap_cleanup);
> 

-- 
               Tzafrir Cohen       
icq#16849755                    jabber:tzafrirjabber.org
+972-50-7952406           mailto:tzafrir.cohenxorcom.com       
http://www.xorcom.com 
iax:guestlocal.xorcom.com/tzafrir
_______________________________________________
--Bandwidth and Colocation provided by Easynews.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev
kpfleming: branch 1.2 r1766 - /branches/1.2/xpp/
user name
 2006-12-31 16:22:51 
Tzafrir Cohen wrote:
> We actually use the VERSION header, both through
modinfo and for the log
> messages on module load.

Then we should find a way to get it from the Zaptel core,
instead of
repeating it in modules. Is it actually possible for a
module to have a
different version than the core?

> However by the same logic you should not includethat
header on zaptel.c:
> if the version is bumped, zaptel.c gets rebuilt.

It has to be included into one module at most, so it can be
displayed
when Zaptel is loaded into the kernel. We could do something
like we do
for Asterisk, and build a separate .o file that contains
only the
version information, then the only steps that would be
required after a
commit changes the version would be to compile that (very
small) file
and re-link zaptel.ko.
_______________________________________________
--Bandwidth and Colocation provided by Easynews.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev
[1-2]

about | contact  Other archives ( Real Estate discussion Medical topics )