upslug2: move to upslug2_4, move to file (not cvs) release

diff --git a/packages/upslug/upslug2-cvs.inc b/packages/upslug/upslug2-cvs.inc
new file mode 100644 (file)
index 0000000..ebd89a9
--- /dev/null
+++ b/packages/upslug/upslug2-cvs.inc
@@ -0,0 +1,10 @@
+# Overrides for a CVS build
+include upslug2.inc
+
+SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
+# For testing use this (tags and other changes take a day to
+# propogate on sourceforge).  Change 'jbowler' to your login name!
+#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
+
+S = "${WORKDIR}/upslug2"

diff --git a/packages/upslug/upslug2-native_3.bb b/packages/upslug/upslug2-native_3.bb
index c3744f3..d0e0101 100644 (file)
--- a/packages/upslug/upslug2-native_3.bb
+++ b/packages/upslug/upslug2-native_3.bb
@@ -1,3 +1,2 @@
-include upslug2.inc
-
+include upslug2_3.bb
 inherit native

diff --git a/packages/upslug/upslug2-native_4.bb b/packages/upslug/upslug2-native_4.bb
new file mode 100644 (file)
index 0000000..0227255
--- /dev/null
+++ b/packages/upslug/upslug2-native_4.bb
@@ -0,0 +1,2 @@
+include upslug2_4.bb
+inherit native

diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 3c93852..24820f5 100644 (file)
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -21,15 +21,12 @@ LIBPCAP_RDEPENDS_linux-uclibc = ""
 
 RDEPENDS += "${LIBPCAP_RDEPENDS}"
 
-SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
-# For testing use this (tags and other changes take a day to
-# propogate on sourceforge).  Change 'jbowler' to your login name!
-#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/nslu/upslug2-${PV}.tar.gz"
 
 inherit autotools
 
-S = "${WORKDIR}/upslug2"
+S = "${WORKDIR}/upslug2-${PV}"
+
 PACKAGES = "${PN}"
 EXTRA_OECONF += "${LIBPCAP_OECONF}"
 

diff --git a/packages/upslug/upslug2_3.bb b/packages/upslug/upslug2_3.bb
index de9c427..5fa7c29 100644 (file)
--- a/packages/upslug/upslug2_3.bb
+++ b/packages/upslug/upslug2_3.bb
@@ -1 +1 @@
-include upslug2.inc
+include upslug2-cvs.inc

diff --git a/packages/upslug/upslug2_4.bb b/packages/upslug/upslug2_4.bb
new file mode 100644 (file)
index 0000000..de9c427
--- /dev/null
+++ b/packages/upslug/upslug2_4.bb
@@ -0,0 +1 @@
+include upslug2.inc