Ticket #10190: 0001-Bluetooth-as-HPKG-initial-steps.patch

File 0001-Bluetooth-as-HPKG-initial-steps.patch, 4.8 KB (added by mmadia, 6 years ago)

Initial patch

  • build/jam/DefaultBuildProfiles

    From 0b4ae41ce91f79200fb02440e4967785ea0775ca Mon Sep 17 00:00:00 2001
    From: Matt Madia <mattmadia@gmail.com>
    Date: Sun, 10 Nov 2013 17:19:36 -0500
    Subject: [PATCH] Bluetooth as HPKG, initial steps.
    
    This turns the OptionalPackage "Bluetooth" into a HPKG. Currently it is
    installed to /_packages_. The idea is for the bluetooth package to be installed
    on the boot medium, without being activated by default.
    
    build/jam/packages/Bluetooth contains a TODO for implementing the development
    symlink for libbluetooth.so.
    
    Untested beyond being able to build bluetooth.hpkg.
    ---
     build/jam/DefaultBuildProfiles           |  4 ++--
     build/jam/HaikuPackages                  |  1 +
     build/jam/OptionalPackages               | 22 ++--------------------
     build/jam/packages/Bluetooth             | 27 +++++++++++++++++++++++++++
     src/data/package_infos/generic/bluetooth | 15 +++++++++++++++
     5 files changed, 47 insertions(+), 22 deletions(-)
     create mode 100644 build/jam/packages/Bluetooth
     create mode 100644 src/data/package_infos/generic/bluetooth
    
    diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
    index d780c23..b5261ad 100644
    a b rule DefineDefaultBuildProfiles 
    7171                }
    7272            }
    7373
    74             AddOptionalHaikuImagePackages BeBook Development Git WebPositive
    75                 Welcome ;
     74            AddOptionalHaikuImagePackages BeBook Bluetooth Development Git
     75                WebPositive Welcome ;
    7676        }
    7777
    7878        case "beta-*" : {
  • build/jam/HaikuPackages

    diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
    index 836c293..66de5ed 100644
    a b local packages = 
    66    HaikuUserguide
    77    HaikuWelcome
    88    MakefileEngine
     9    Bluetooth
    910    ;
    1011
    1112if $(HAIKU_BOOTSTRAP_BUILD) {
  • build/jam/OptionalPackages

    diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
    index 5c616a2..db29c51 100644
    a b if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] { 
    6767
    6868# Bluetooth stack
    6969if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
    70 # TODO: Make this an actual package!
    71 #   local bluetoothDrivers = h2generic ;
    72 #   AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
    73 #   AddFilesToHaikuImage system servers : bluetooth_server ;
    74 #   AddFilesToHaikuImage system lib : libbluetooth.so ;
    75 #   AddFilesToHaikuImage
    76 #       system add-ons kernel network protocols : l2cap ;
    77 #   AddFilesToHaikuImage system add-ons kernel bluetooth
    78 #       : btCoreData hci ;
    79 #   AddFilesToHaikuImage system preferences : Bluetooth ;
    80 #   AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
    81 #   AddSymlinkToHaikuImage home config settings deskbar menu Preferences
    82 #       : /boot/system/preferences/Bluetooth ;
    83 #   if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
    84 #       && $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) in 2 4 {
    85 #       local arch = $(TARGET_ARCH) ;
    86 #       local abi = gcc$(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
    87 #       AddSymlinkToHaikuImage system develop lib
    88 #           : /system/lib libbluetooth.so ;
    89 #   }
     70    AddPackageFilesToHaikuImage _packages_ : bluetooth.hpkg
     71        : nameFromMetaInfo ;
    9072}
    9173
    9274
  • new file uild/jam/packages/Bluetooth

    diff --git a/build/jam/packages/Bluetooth b/build/jam/packages/Bluetooth
    new file mode 100644
    index 0000000..9f189b7
    - +  
     1local bluetoothPackage = bluetooth.hpkg ;
     2HaikuPackage $(bluetoothPackage) ;
     3
     4local bluetoothDrivers = h2generic ;
     5AddDriversToPackage bluetooth : $(bluetoothDrivers) ;
     6AddFilesToPackage servers : bluetooth_server ;
     7AddFilesToPackage lib : libbluetooth.so ;
     8AddFilesToPackage
     9    add-ons kernel network protocols : l2cap ;
     10AddFilesToPackage add-ons kernel bluetooth
     11    : btCoreData hci ;
     12AddFilesToPackage preferences : Bluetooth ;
     13AddFilesToPackage bin : bt_dev_info bt_discovery ;
     14
     15AddSymlinkToPackage data deskbar menu Applications
     16    : ../../../../preferences/Bluetooth ;
     17
     18# TODO: Include the development portions of Bluetooth in the package!
     19#if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
     20#   && $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) in 2 4 {
     21#   local arch = $(TARGET_ARCH) ;
     22#   local abi = gcc$(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
     23#   AddSymlinkToHaikuImage system develop lib
     24#       : /system/lib libbluetooth.so ;
     25#}
     26
     27BuildHaikuPackage $(bluetoothPackage) : bluetooth ;
  • new file src/data/package_infos/generic/bluetooth

    diff --git a/src/data/package_infos/generic/bluetooth b/src/data/package_infos/generic/bluetooth
    new file mode 100644
    index 0000000..60da4ae
    - +  
     1name            bluetooth
     2version         %HAIKU_VERSION%
     3architecture    any
     4summary         "The Bluetooth stack for Haiku"
     5description     "The Bluetooth stack for Haiku."
     6
     7packager        "The Haiku build system"
     8vendor          "Haiku Project"
     9
     10copyrights      "2001-2013 Haiku, Inc. et al"
     11licenses        MIT
     12
     13provides {
     14    bluetooth = %HAIKU_VERSION%
     15}