[oe-commits] org.oe.dev merge of '8a9ab618f4fb563bfa088670c3dfd8b3c465c622'

oe commit openembedded-commits at lists.openembedded.org
Sat Aug 11 17:48:44 UTC 2007 

merge of '8a9ab618f4fb563bfa088670c3dfd8b3c465c622'
     and 'b991b244c6299cb77c276a89cd7f5bd08da52250'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 512487b4381719ff0a5b9c19d97316f797ebb74a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=512487b4381719ff0a5b9c19d97316f797ebb74a
Files:
1
packages/btscanner/files/configurable-paths.patch
packages/btscanner/btscanner_2.0.bb
classes/base.bbclass
Diffs:

#
# mt diff -r8a9ab618f4fb563bfa088670c3dfd8b3c465c622 -r512487b4381719ff0a5b9c19d97316f797ebb74a
#
# 
# 
# add_file "packages/btscanner/files/configurable-paths.patch"
#  content [b547c963e73fe25b916fdb059689a7edfc1decd6]
# 
# patch "packages/btscanner/btscanner_2.0.bb"
#  from [ab5fec2e7308f1d8966071fedecbd2f37a8d9555]
#    to [efc4f1e585c5780e63be10b302f803ff03dd98a1]
# 
============================================================
--- packages/btscanner/files/configurable-paths.patch	b547c963e73fe25b916fdb059689a7edfc1decd6
+++ packages/btscanner/files/configurable-paths.patch	b547c963e73fe25b916fdb059689a7edfc1decd6
@@ -0,0 +1,183 @@
+Index: btscanner-2.0/btscanner.xml
+===================================================================
+--- btscanner-2.0.orig/btscanner.xml	2007-08-11 18:51:51.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,81 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE btscanner SYSTEM "file:///usr/local/etc/btscanner.dtd">
+-<btscanner>
+-<files>
+-	<log>btscanner.log</log>
+-	<oui>/usr/local/share/oui.txt</oui>
+-	<store>~/bts</store>
+-</files>
+-
+-<!-- Global range -->
+-<rangedef start="00:00:00:00:00:00" end="FF:FF:FF:FF:FF:FF">
+-	<vulnerabilities/>
+-	<name/>
+-	<hci/>
+-</rangedef>
+-
+-<!-- Nokia 6310i range 1 -->
+-<rangedef start="00:60:57:00:00:00" end="00:60:57:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-<!-- Nokia 6310i range 2 -->
+-<rangedef start="00:0E:6D:00:00:00" end="00:0E:6D:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-<!-- Nokia 6310i range 3 -->
+-<rangedef start="00:02:EE:00:00:00" end="00:02:EE:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-
+-<!-- Nokia 6230 range 1 -->
+-<rangedef start="00:E0:03:00:00:00" end="00:E0:03:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-
+-<!-- Sony Ericsson T610 range 1 -->
+-<rangedef start="00:0E:07:00:00:00" end="00:0E:07:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-<!-- Sony Ericsson T610 (also others) range 2 -->
+-<rangedef start="00:0A:D9:00:00:00" end="00:0A:D9:FF:FF:FF">
+-	<vulnerabilities>Snarf</vulnerabilities>
+-	<name/>
+-	<hci/>
+-	<rssi/>
+-	<lq/>
+-	<txpwr/>
+-	<sdp/>
+-</rangedef>
+-
+-</btscanner>
+-
+Index: btscanner-2.0/btscanner.xml.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ btscanner-2.0/btscanner.xml.in	2007-08-11 18:52:27.000000000 +0200
+@@ -0,0 +1,81 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE btscanner SYSTEM "file://@sysconfdir@/btscanner.dtd">
++<btscanner>
++<files>
++	<log>btscanner.log</log>
++	<oui>@datadir@/oui.txt</oui>
++	<store>~/bts</store>
++</files>
++
++<!-- Global range -->
++<rangedef start="00:00:00:00:00:00" end="FF:FF:FF:FF:FF:FF">
++	<vulnerabilities/>
++	<name/>
++	<hci/>
++</rangedef>
++
++<!-- Nokia 6310i range 1 -->
++<rangedef start="00:60:57:00:00:00" end="00:60:57:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++<!-- Nokia 6310i range 2 -->
++<rangedef start="00:0E:6D:00:00:00" end="00:0E:6D:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++<!-- Nokia 6310i range 3 -->
++<rangedef start="00:02:EE:00:00:00" end="00:02:EE:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++
++<!-- Nokia 6230 range 1 -->
++<rangedef start="00:E0:03:00:00:00" end="00:E0:03:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++
++<!-- Sony Ericsson T610 range 1 -->
++<rangedef start="00:0E:07:00:00:00" end="00:0E:07:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++<!-- Sony Ericsson T610 (also others) range 2 -->
++<rangedef start="00:0A:D9:00:00:00" end="00:0A:D9:FF:FF:FF">
++	<vulnerabilities>Snarf</vulnerabilities>
++	<name/>
++	<hci/>
++	<rssi/>
++	<lq/>
++	<txpwr/>
++	<sdp/>
++</rangedef>
++
++</btscanner>
++
+Index: btscanner-2.0/configure.in
+===================================================================
+--- btscanner-2.0.orig/configure.in	2007-08-11 18:51:35.000000000 +0200
++++ btscanner-2.0/configure.in	2007-08-11 18:55:44.000000000 +0200
+@@ -89,5 +89,5 @@
+ CFLAGS="$CFLAGS -DCFG_FILE=\\\"$cfgfile\\\" -DCFG_DTD=\\\"$cfgdtd\\\""
+ 
+ # output
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile btscanner.xml])
+ AC_OUTPUT
============================================================
--- packages/btscanner/btscanner_2.0.bb	ab5fec2e7308f1d8966071fedecbd2f37a8d9555
+++ packages/btscanner/btscanner_2.0.bb	efc4f1e585c5780e63be10b302f803ff03dd98a1
@@ -1,16 +1,16 @@ DEPENDS = "bluez-libs gdbm ncurses libxm
 DESCRIPTION = "Extract information from Bluetooth devices in range."
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses libxml2"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
            file://gcc-4.patch;patch=1 \
+           file://configurable-paths.patch;patch=1 \
            "
 
-#Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
-FILES_${PN} += "/usr/share/oui.txt"
+FILES_${PN} += "${datadir}/oui.txt"
 
 inherit autotools


#
# mt diff -rb991b244c6299cb77c276a89cd7f5bd08da52250 -r512487b4381719ff0a5b9c19d97316f797ebb74a
#
# 
# 
# patch "classes/base.bbclass"
#  from [1fa503b3ccef56a6f8b086ebe3645e7d155c31d3]
#    to [5fb012c81131f41fbf0fed66976513d338e42b56]
# 
============================================================
--- classes/base.bbclass	1fa503b3ccef56a6f8b086ebe3645e7d155c31d3
+++ classes/base.bbclass	5fb012c81131f41fbf0fed66976513d338e42b56
@@ -846,20 +846,26 @@ def base_after_parse(d):
     if (old_arch == mach_arch):
         # Nothing to do
         return
+
+    #
+    # We always try to scan SRC_URI for urls with machine overrides
+    # unless the package sets SRC_URI_OVERRIDES_PACKAGE_ARCH=0
+    #
     override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1)
-	
-    if not override or override == '0':
+    if override == '0':
         return
 
     paths = []
-    for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
-        paths.append(bb.data.expand(os.path.join(p, mach_arch), d))
+    for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
+        paths.append(bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d))
     for s in bb.data.getVar('SRC_URI', d, 1).split():
+        if not s.startswith("file://"):
+            continue
         local = bb.data.expand(bb.fetch.localpath(s, d), d)
         for mp in paths:
             if local.startswith(mp):
                 #bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
-                bb.data.setVar('PACKAGE_ARCH', mach_arch, d)
+                bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
                 return
 
 #

More information about the Openembedded-commits mailing list