Thread: [Madwifi-cvs] revision 1689 committed
Status: Beta
Brought to you by:
otaku
From: Michael R. <svn...@ma...> - 2006-07-20 06:55:43
|
Project : madwifi-copy Revision : 1689 Author : mrenzmann (Michael Renzmann) Date : 2006-07-20 08:55:36 +0200 (Thu, 20 Jul 2006) Log Message : Tagging r1687 as release 0.9.3. Affected Files: * tags/release-0.9.3/ added * tags/release-0.9.3/release.h updated * tags/release-0.9.3/scripts/make-release.bash updated Copied: tags/release-0.9.3 (from rev 1687, trunk) Modified: tags/release-0.9.3/release.h =================================================================== --- trunk/release.h 2006-07-20 06:48:58 UTC (rev 1687) +++ tags/release-0.9.3/release.h 2006-07-20 06:55:36 UTC (rev 1689) @@ -35,12 +35,11 @@ * * $Id$ */ -#include "svnversion.h" -#define RELEASE_TYPE "BETA" +#define RELEASE_TYPE "RELEASE" #ifdef SVNVERSION #define RELEASE_VERSION SVNVERSION #else -#define RELEASE_VERSION "0.9.1" +#define RELEASE_VERSION "0.9.3" #endif Modified: tags/release-0.9.3/scripts/make-release.bash =================================================================== --- trunk/scripts/make-release.bash 2006-07-20 06:48:58 UTC (rev 1687) +++ tags/release-0.9.3/scripts/make-release.bash 2006-07-20 06:55:36 UTC (rev 1689) @@ -78,30 +78,30 @@ exit 1 } -# check if local working copy has uncommitted changes -if [[ ! -z "$(svn status)" ]]; then - echo - echo "ERROR:" - echo "Your working copy has changes which are not yet committed." - echo "Either commit or revert them before you continue to make a release." - echo "Aborting for now." - echo - exit 1 -fi +## check if local working copy has uncommitted changes +#if [[ ! -z "$(svn status)" ]]; then +# echo +# echo "ERROR:" +# echo "Your working copy has changes which are not yet committed." +# echo "Either commit or revert them before you continue to make a release." +# echo "Aborting for now." +# echo +# exit 1 +#fi # make sure that the local working copy is in sync with the repository repos=$(svn info | grep URL | cut -d" " -f2) localrev=$(svn info | grep Last\ Changed\ Rev | cut -d" " -f4) remoterev=$(svn log -r HEAD --quiet $repos | grep '^r[0-9]* ' | cut -d" " -f1 | cut -b2-) -if [[ "$localrev" != "$remoterev" ]]; then - echo - echo "ERROR:" - echo "Your working copy is not in sync with the repository. Please update your" - echo "working copy, then restart the release process." - echo - exit 1 -fi +#if [[ "$localrev" != "$remoterev" ]]; then +# echo +# echo "ERROR:" +# echo "Your working copy is not in sync with the repository. Please update your" +# echo "working copy, then restart the release process." +# echo +# exit 1 +#fi @@ -222,6 +222,8 @@ msg="Adjust release version in response to release $newrelease." svn commit release.h -m "$msg" +exit 0 + # create the tarball packaging directory tmp=$RELEASE_TMP store=$RELEASE_STORE |
From: Kel M. <svn...@ma...> - 2006-07-21 08:56:12
|
Project : madwifi Revision : 1689 Author : kelmo (Kel Modderman) Date : 2006-07-21 10:56:01 +0200 (Fri, 21 Jul 2006) Log Message : Avoid redefinition of roundup() with linux 2.6.18 and above. Signed-off-by: Pavel Nov?\195?\161k <st...@bu...> Affected Files: * trunk/include/compat.h updated Modified: trunk/include/compat.h =================================================================== --- trunk/include/compat.h 2006-07-21 08:00:32 UTC (rev 1688) +++ trunk/include/compat.h 2006-07-21 08:56:01 UTC (rev 1689) @@ -43,7 +43,11 @@ */ #define NBBY 8 /* number of bits/byte */ -#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */ +#include <linux/version.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) +#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */ +#endif + #define howmany(x, y) (((x)+((y)-1))/(y)) /* Bit map related macros. */ |