hrev50212 adds 2 changesets to branch 'master'
old head: e91079d501ccc0112926647c440c810bf300a33f
new head: 0421aa8cbe7265b535dc4ca98c83daa4c2dacaa9
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0421aa8cbe72+%5Ee91079d501cc
----------------------------------------------------------------------------
ca7e8e5b20d4: bluetooth: Add kernel stack to image
0421aa8cbe72: bluetooth: Add h2generic driver to image
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 9 insertions(+)
build/jam/images/definitions/regular | 6 ++++++
build/jam/packages/Haiku | 3 +++
############################################################################
Commit: ca7e8e5b20d40bf52ca783a102085aae122e0107
URL: http://cgit.haiku-os.org/haiku/commit/?id=ca7e8e5b20d4
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Apr 10 15:10:47 2016 UTC
bluetooth: Add kernel stack to image
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/regular
b/build/jam/images/definitions/regular
index ed9774c..a529be3 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -99,6 +99,9 @@ SYSTEM_SERVERS += [ FFilterByBuildFeatures
print_server print_addon_server
] ;
+
+SYSTEM_BT_STACK = hci btCoreData ;
+
SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
x86,x86_64 @{
intel_810.accelerant intel_extreme.accelerant
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 4539aad..83028f6 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -263,6 +263,7 @@ AddFilesToPackage add-ons disk_systems
: <disk_system>fat <disk_system>intel <disk_system>gpt <disk_system>bfs
<disk_system>ntfs ;
+AddFilesToPackage add-ons kernel bluetooth : $(SYSTEM_BT_STACK) ;
# the MIME DB
CopyDirectoryToPackage data : <mimedb>mime_db : : : isTarget ;
############################################################################
Revision: hrev50212
Commit: 0421aa8cbe7265b535dc4ca98c83daa4c2dacaa9
URL: http://cgit.haiku-os.org/haiku/commit/?id=0421aa8cbe72
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Apr 10 16:28:42 2016 UTC
bluetooth: Add h2generic driver to image
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/regular
b/build/jam/images/definitions/regular
index a529be3..d0672649 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -99,8 +99,11 @@ SYSTEM_SERVERS += [ FFilterByBuildFeatures
print_server print_addon_server
] ;
-
+# Bluetooth stack + drivers
SYSTEM_BT_STACK = hci btCoreData ;
+SYSTEM_ADD_ONS_DRIVERS_BT_H2 +=
+ h2generic
+;
SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
x86,x86_64 @{
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 83028f6..3171592 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -72,6 +72,7 @@ AddNewDriversToPackage power :
$(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddDriversToPackage : console dprintf null
<driver>tty usb_modeswitch zero ;
AddDriversToPackage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToPackage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
+AddDriversToPackage bluetooth h2 : $(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ;
AddDriversToPackage midi :
$(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToPackage bus : usb_raw fw_raw@x86 ;
AddDriversToPackage disk floppy : pc_floppy@x86 ;
@@ -263,6 +264,7 @@ AddFilesToPackage add-ons disk_systems
: <disk_system>fat <disk_system>intel <disk_system>gpt <disk_system>bfs
<disk_system>ntfs ;
+# Kernel bluetooth stack
AddFilesToPackage add-ons kernel bluetooth : $(SYSTEM_BT_STACK) ;
# the MIME DB
