Ticket #10192: UserlandFS.patch

File UserlandFS.patch, 7.3 KB (added by jalopeura, 10 years ago)

  • build/jam/HaikuPackages 

    From f01392937780a25121f5923c10c1189564122d99 Mon Sep 17 00:00:00 2001
From: Sean Healy <jalopeura@hotmail.com>
Date: Thu, 28 Aug 2014 19:03:19 +0000
Subject: [PATCH 1/2] Converting UserlandFS to hpkg

---
 build/jam/HaikuPackages                         |  1 +
 build/jam/OptionalPackages                      | 59 +++++--------------------
 build/jam/packages/UserlandFS                   | 55 +++++++++++++++++++++++
 src/data/package_infos/generic/userlandfs       | 16 +++++++
 src/data/package_infos/generic/userlandfs_devel | 22 +++++++++
 5 files changed, 105 insertions(+), 48 deletions(-)
 create mode 100644 build/jam/packages/UserlandFS
 create mode 100644 src/data/package_infos/generic/userlandfs
 create mode 100644 src/data/package_infos/generic/userlandfs_devel

diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index 279efab..f207eec 100644
    a b local packages =  
    66    HaikuUserguide
    77    HaikuWelcome
    88    MakefileEngine
     9    UserlandFS
    910    ;
    1011
    1112if $(HAIKU_BUILD_TYPE) = bootstrap {

  • build/jam/OptionalPackages 

    diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 826341e..77bf4a2 100644
    a b if [ IsOptionalHaikuImagePackageAdded NetFS ] {  
    216216
    217217# UserlandFS
    218218if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
    219 # TODO: Make this an actual package!
    220 #   local arch = $(TARGET_ARCH) ;
    221 #   local abi = gcc$(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
    222 #
    223 #   # kernel module
    224 #   AddFilesToHaikuImage system add-ons kernel file_systems
    225 #       : userlandfs ;
    226 #
    227 #   # server
    228 #   AddFilesToHaikuImage system servers : userlandfs_server ;
    229 #
    230 #   # libs
    231 #   local userlandfsLibs =
    232 #       libuserlandfs_beos_kernel.so
    233 #       libuserlandfs_haiku_kernel.so
    234 #       libuserlandfs_fuse.so
    235 #   ;
    236 #   AddFilesToHaikuImage system lib : $(userlandfsLibs) ;
    237 #
    238 #   # development goodies
    239 #   if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] {
    240 #       if ! ( $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) in 2 4 ) {
    241 #           Exit "Optional package UserlandFS: Unsupported GCC version:"
    242 #               $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
    243 #       }
    244 #
    245 #       # library symlinks
    246 #       local lib ;
    247 #       for lib in $(userlandfsLibs) {
    248 #           AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
    249 #               : /system/lib/$(lib:BS) ;
    250 #       }
    251 #
    252 #       # FUSE headers
    253 #       local fuseHeaders =
    254 #           fuse_common_compat.h
    255 #           fuse_common.h
    256 #           fuse_compat.h
    257 #           fuse.h
    258 #           fuse_lowlevel_compat.h
    259 #           fuse_lowlevel.h
    260 #           fuse_opt.h
    261 #       ;
    262 #       fuseHeaders = $(fuseHeaders:G=userlandfs!fuse) ;
    263 #       SEARCH on $(fuseHeaders)
    264 #           = [ FDirName $(HAIKU_TOP) headers private userlandfs fuse ] ;
    265 #       AddFilesToHaikuImage develop headers userlandfs fuse : $(fuseHeaders) ;
    266 #   }
     219    AddPackageFilesToHaikuImage system : userlandfs.hpkg ;
     220
     221    # development package
     222    if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] {
     223        if ! ( $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) in 2 4 ) {
     224            Exit "Optional package UserlandFS: Unsupported GCC version:"
     225                $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
     226        }
     227
     228        AddPackageFilesToHaikuImage system : userlandfs_devel.hpkg ;
     229    }
    267230}
    268231
    269232

  • new file uild/jam/packages/UserlandFS 

    diff --git a/build/jam/packages/UserlandFS b/build/jam/packages/UserlandFS
new file mode 100644
index 0000000..7963e6f
    - +  
     1local arch = $(TARGET_ARCH) ;
     2local abi = gcc$(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) ;
     3
     4#
     5# main package
     6#
     7
     8local userlandfsPackage = userlandfs.hpkg ;
     9HaikuPackage $(userlandfsPackage) ;
     10
     11# kernel module
     12AddFilesToPackage add-ons kernel file_systems  : userlandfs ;
     13
     14# server
     15AddFilesToPackage servers : userlandfs_server ;
     16
     17# libs
     18local userlandfsLibs =
     19    libuserlandfs_beos_kernel.so
     20    libuserlandfs_haiku_kernel.so
     21    libuserlandfs_fuse.so
     22;
     23AddFilesToPackage lib : $(userlandfsLibs) ;
     24
     25BuildHaikuPackage $(userlandfsPackage) : userlandfs ;
     26
     27#
     28# development package
     29#
     30
     31local userlandfsDevelPackage = userlandfs_devel.hpkg ;
     32HaikuPackage $(userlandfsDevelPackage) ;
     33
     34# library symlinks
     35local lib ;
     36for lib in $(userlandfsLibs) {
     37    AddSymlinkToPackage develop abi $(arch) $(abi) lib : /system/lib/$(lib:BS) ;
     38}
     39
     40# FUSE headers
     41local fuseHeaders =
     42    fuse_common_compat.h
     43    fuse_common.h
     44    fuse_compat.h
     45    fuse.h
     46    fuse_lowlevel_compat.h
     47    fuse_lowlevel.h
     48    fuse_opt.h
     49 ;
     50fuseHeaders = $(fuseHeaders:G=userlandfs!fuse) ;
     51SEARCH on $(fuseHeaders)
     52    = [ FDirName $(HAIKU_TOP) headers private userlandfs fuse ] ;
     53AddFilesToPackage develop headers userlandfs fuse : $(fuseHeaders) ;
     54
     55BuildHaikuPackage $(userlandfsDevelPackage) : userlandfs_devel ;

  • new file src/data/package_infos/generic/userlandfs 

    diff --git a/src/data/package_infos/generic/userlandfs b/src/data/package_infos/generic/userlandfs
new file mode 100644
index 0000000..d2b8049
    - +  
     1name            userlandfs
     2version         %HAIKU_VERSION%
     3architecture    %HAIKU_PACKAGING_ARCH%
     4summary         "UserlandFS"
     5
     6description     "The package contains the UserlandFS add-on and server."
     7
     8packager        "The Haiku build system"
     9vendor          "Haiku Project"
     10
     11copyrights      "2001-2013 Haiku, Inc. et al"
     12licenses        "MIT"
     13
     14provides {
     15    userlandfs = %HAIKU_VERSION% compat >= R1~alpha1
     16}

  • new file src/data/package_infos/generic/userlandfs_devel 

    diff --git a/src/data/package_infos/generic/userlandfs_devel b/src/data/package_infos/generic/userlandfs_devel
new file mode 100644
index 0000000..be9d719
    - +  
     1name            userlandfs_devel
     2version         %HAIKU_VERSION%
     3architecture    %HAIKU_PACKAGING_ARCH%
     4summary         "UserlandFS development files"
     5
     6description     "The package contains all files associated with UserlandFS
     7needed for development, like static libraries, library symlinks,
     8header files, etc."
     9
     10packager        "The Haiku build system"
     11vendor          "Haiku Project"
     12
     13copyrights      "2001-2013 Haiku, Inc. et al"
     14licenses        "MIT"
     15
     16provides {
     17    userlandfs_devel = %HAIKU_VERSION% compat >= R1~alpha1
     18}
     19
     20requires {
     21    userlandfs == %HAIKU_VERSION% base
     22}

  • src/data/package_infos/generic/userlandfs 

    -- 
1.8.3.4


From 6778c9aea8349b993a6a339d3fbd38f5b1670c02 Mon Sep 17 00:00:00 2001
From: Sean Healy <jalopeura@hotmail.com>
Date: Thu, 28 Aug 2014 19:05:38 +0000
Subject: [PATCH 2/2] Updating copyright date for UserlandFS

---
 src/data/package_infos/generic/userlandfs       | 2 +-
 src/data/package_infos/generic/userlandfs_devel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/package_infos/generic/userlandfs b/src/data/package_infos/generic/userlandfs
index d2b8049..5f7e0ff 100644
    a b description "The package contains the UserlandFS add-on and server."  
    88packager        "The Haiku build system"
    99vendor          "Haiku Project"
    1010
    11 copyrights      "2001-2013 Haiku, Inc. et al"
     11copyrights      "2001-2014 Haiku, Inc. et al"
    1212licenses        "MIT"
    1313
    1414provides {

  • src/data/package_infos/generic/userlandfs_devel 

    diff --git a/src/data/package_infos/generic/userlandfs_devel b/src/data/package_infos/generic/userlandfs_devel
index be9d719..7a1bb46 100644
    a b header files, etc."  
    1010packager        "The Haiku build system"
    1111vendor          "Haiku Project"
    1212
    13 copyrights      "2001-2013 Haiku, Inc. et al"
     13copyrights      "2001-2014 Haiku, Inc. et al"
    1414licenses        "MIT"
    1515
    1616provides {