imported madwifi 0.9.3

diff --git a/onelab-tags-rc2.mk b/onelab-tags-rc2.mk
index 0325693..82aefe1 100644 (file)
--- a/onelab-tags-rc2.mk
+++ b/onelab-tags-rc2.mk
@@ -21,7 +21,7 @@ kernel-x86_64-TAG :=          planetlab-4_0-rc2
 kernel-i586-TAG :=             planetlab-4_0-rc2
 # end
 vnet-TAG :=                    planetlab-4_0-rc2
-madwifi-ng-TAG :=              planetlab-4_0-rc2
+madwifi-ng-SVNPATH :=          svn+ssh://build@svn.one-lab.org/svn/madwifi-ng/tags/0.9.3
 wireless-tools-SVNPATH :=      svn+ssh://build@svn.one-lab.org/svn/wireless-tools/tags/29pre14
 ivtv-TAG :=                    planetlab-4_0-rc2
 util-vserver-TAG :=            planetlab-4_0-rc2

diff --git a/onelab-tags.mk b/onelab-tags.mk
index a4db5e2..4e40d26 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -21,7 +21,7 @@ kernel-x86_64-TAG :=          planetlab-4_0-branch
 kernel-i586-TAG :=             planetlab-4_0-branch
 # end
 vnet-TAG :=                    planetlab-4_0-branch
-madwifi-ng-TAG :=              planetlab-4_0-branch
+madwifi-ng-SVNPATH :=          svn+ssh://build@svn.one-lab.org/svn/madwifi-ng/tags/0.9.3
 wireless-tools-SVNPATH :=      svn+ssh://build@svn.one-lab.org/svn/wireless-tools/tags/29pre14
 ivtv-TAG :=                    planetlab-4_0-branch
 util-vserver-TAG :=            planetlab-4_0-branch

diff --git a/onelab.mk b/onelab.mk
index d76e3a4..3853053 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: onelab.mk,v 1.24 2007/04/16 15:17:06 thierry Exp $
+# $Id: onelab.mk,v 1.25 2007/04/16 15:28:18 thierry Exp $
 #
 
 #
@@ -96,7 +96,7 @@ vnet: kernel
 #
 
 madwifi-ng-MODULE := madwifi-ng
-madwifi-ng-SPEC := madwifi-ng/madwifi.spec
+madwifi-ng-SPEC := madwifi.spec
 ALL += madwifi-ng
 
 # Build kernel first so we can bootstrap off of its build
@@ -373,12 +373,12 @@ myplc: $(filter-out myplc,$(ALL))
 myplc: RPMS/yumgroups.xml
 
 # we also ship various information on the build in /etc/myplc-release
-myplc: SOURCES/myplc/myplc/myplc-release
+# we cannot store this under SOURCES/myplc 
+# otherwise the code extraction phase does not take place 
+# because it depends on $SOURCES/$(package) as per Rules.mk
+myplc: SOURCES/myplc-release
 
-SOURCES/myplc/myplc:
-       mkdir -p $@
-
-SOURCES/myplc/myplc/myplc-release: SOURCES/myplc/myplc
+SOURCES/myplc-release:
        @echo 'Creating myplc-release'
        rm -f $@
        (echo -n 'Build date: ' ; date '+%Y.%m.%d') >> $@