diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-15 15:48:32 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-15 15:48:32 +0000 |
| commit | fe6251ecd5bdd58a5b3ceda9674d57a3850f67fc (patch) | |
| tree | 6f83d16ddb6c1348ca43425bfa9c117a48079f31 /packages/upslug | |
| parent | af374dd518159ab5a4eaed6802f4cf50d7cf73dd (diff) | |
| parent | 7110f87f99bed3015de53af5e42ac3fbb1fda780 (diff) | |
merge of '0479e731919623fe441e7b76d00e8c836c573157'
and 'bcd222bb88d3e217d64a5699a87a9c1253895f1f'
Diffstat (limited to 'packages/upslug')
| -rw-r--r-- | packages/upslug/upslug-native_1.0.bb | 10 | ||||
| -rw-r--r-- | packages/upslug/upslug-native_cvs.bb | 10 | ||||
| -rw-r--r-- | packages/upslug/upslug2.inc | 10 |
3 files changed, 6 insertions, 24 deletions
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb index 0249cb56fd..729f176a75 100644 --- a/packages/upslug/upslug-native_1.0.bb +++ b/packages/upslug/upslug-native_1.0.bb @@ -1,11 +1,12 @@ # This package builds the 'upslug' binary upload/flash tool # for the NSLU2. It is not useful for anything else. -PR = "r0" +PR = "r1" DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL-2" +COMPATIBLE_MACHINE = "nslu2" SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}" SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug;tag=${SRC_TAG}" @@ -25,10 +26,3 @@ do_compile() { do_stage() { oe_runmake "DESTDIR=${STAGING_BINDIR}" install } - -python () { - # Don't build upslug unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2") -} diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb index 7099b3ba44..95b340c589 100644 --- a/packages/upslug/upslug-native_cvs.bb +++ b/packages/upslug/upslug-native_cvs.bb @@ -1,11 +1,12 @@ # This package builds the 'upslug' binary upload/flash tool # for the NSLU2. It is not useful for anything else. -PR = "r0" +PR = "r1" DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL-2" +COMPATIBLE_MACHINE = "nslu2" # Use releases in preference DEFAULT_PREFERENCE = "-1" @@ -24,10 +25,3 @@ do_compile() { do_stage() { oe_runmake "DESTDIR=${STAGING_BINDIR}" install } - -python () { - # Don't build upslug unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2") -} diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc index 0a91bc3fd1..9bee027034 100644 --- a/packages/upslug/upslug2.inc +++ b/packages/upslug/upslug2.inc @@ -1,11 +1,12 @@ # This package builds the 'upslug2' binary upload/flash tool # for the NSLU2. It is not useful for anything else. -PR = "r0" +PR = "r1" DESCRIPTION = "NSLU2 binary upload tool (version 2)" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2" SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" +COMPATIBLE_MACHINE = "nslu2" # On Linux libpcap does not work. Using libpcap is sub-optimal - it # is intended for packet capture not management of a new protocol @@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}" PACKAGES = "${PN}" EXTRA_OECONF += "${LIBPCAP_OECONF}" - -python () { - # Don't build upslug2 unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2") -} |