Ticket #3489: newOptionalPackages.diff

File newOptionalPackages.diff, 6.4 KB (added by scottmc, 15 years ago)

fixed SQLite location in list and updated OpenSSH zip to include script to set up keys on boot

  • build/jam/OptionalPackageDependencies

     
    33# For transitive dependencies dependants should be listed before their
    44# dependencies.
    55
     6OptionalPackageDependencies Subversion : OpenSSL APR-util Neon LibIconv SQLite ;
    67OptionalPackageDependencies APR-util : APR ;
    78OptionalPackageDependencies BeHappy : BeBook NetSurf ;
    89OptionalPackageDependencies Development : DevelopmentBase Perl ;
    … …  
    1011OptionalPackageDependencies LibLayout : DevelopmentBase ;
    1112OptionalPackageDependencies NetSurf : OpenSSL ;
    1213OptionalPackageDependencies OpenSSH : OpenSSL ;
    13 OptionalPackageDependencies Subversion : OpenSSL ;
     14

  • build/jam/OptionalPackages

     
    2626#   DevelopmentMin      - development headers, libs, tools, from sources only
    2727#   Firefox
    2828#   KeymapSwitcher
     29#   LibIconv
    2930#   LibLayout
    3031#   Links
     32#   Neon
    3133#   NetSurf
    3234#   OpenSound
    3335#   OpenSSH
    … …  
    3537#   P7zip
    3638#   Pe
    3739#   Perl
     40#   Python
    3841#   Rsync
     42#   SQLite
    3943#   Subversion
    4044#   Tar
    4145#   UserlandFS
    … …  
    5155    if $(TARGET_ARCH) != x86 {
    5256        Echo "No optional package APR available for $(TARGET_ARCH)" ;
    5357    } else {
    54         local baseURL = http://haiku-files.org/files/optional-packages ;
    55         InstallOptionalHaikuImagePackage apr-0.9.17-gcc2-2008-05-20
    56             : $(baseURL)/apr-0.9.17-gcc2-2008-05-20.zip
     58        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr ;
     59        InstallOptionalHaikuImagePackage apr-1.3.3-gcc2-haiku-2009-05-08
     60            : $(baseURL)/apr-1.3.3-gcc2-haiku-2009-05-08.zip
    5761            :
    5862        ;
    5963    }
    … …  
    6569    if $(TARGET_ARCH) != x86 {
    6670        Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
    6771    } else {
    68         local baseURL = http://haiku-files.org/files/optional-packages ;
    69         InstallOptionalHaikuImagePackage apr-util-0.9.15-gcc2-2008-05-15
    70             : $(baseURL)/apr-util-0.9.15-gcc2-2008-05-15.zip
     72        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr-util ;
     73        InstallOptionalHaikuImagePackage apr-util-1.3.4-gcc2-haiku-2009-05-08
     74            : $(baseURL)/apr-util-1.3.4-gcc2-haiku-2009-05-08.zip
    7175            :
    7276        ;
    7377    }
    … …  
    310314    if $(TARGET_ARCH) != x86 {
    311315        Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
    312316    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
     317        local baseURL = http://haiku-files.org/files/optional-packages ;
    313318        InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
    314             : http://haiku-files.org/files/optional-packages/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
     319            : $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
    315320            : apps
    316321        ;
    317322        AddSymlinkToHaikuImage home config be Applications
    … …  
    347352}
    348353
    349354
     355# LibIconv
     356if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
     357    if $(TARGET_ARCH) != x86 {
     358        Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
     359    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
     360        Echo "No optional package LibIconv available for gcc4" ;
     361    } else {
     362        local baseURL = http://www.haiku-ports.de/packages/dev-libs/libiconv ;
     363        InstallOptionalHaikuImagePackage libiconv-1.13-gcc2-haiku-2009-05-22
     364            : $(baseURL)/libiconv-1.13-gcc2-haiku-2009-05-22.zip
     365            :
     366        ;
     367    }
     368}
     369
     370
    350371# LibLayout library
    351372if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
    352373    if $(TARGET_ARCH) != x86 {
    … …  
    380401}
    381402
    382403
     404# Neon
     405if [ IsOptionalHaikuImagePackageAdded Neon ] {
     406    if $(TARGET_ARCH) != x86 {
     407        Echo "No optional package Neon available for $(TARGET_ARCH)" ;
     408    } else {
     409        local baseURL = http://www.haiku-ports.de/packages/net-misc/neon ;
     410        InstallOptionalHaikuImagePackage neon-0.28.4-gcc2-haiku-2009-05-23
     411            : $(baseURL)/neon-0.28.4-gcc2-haiku-2009-05-23.zip
     412            :
     413        ;
     414    }
     415}
     416
     417
    383418# NetSurf web browser
    384419if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
    385420    if $(TARGET_ARCH) != x86 {
    … …  
    421456                "variable to be set!" ;
    422457        }
    423458
    424         local baseURL = http://haiku-files.org/files/optional-packages ;
    425         InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
    426             : $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
     459        local baseURL = http://www.haiku-ports.de/packages/net-misc/openssh ;
     460        InstallOptionalHaikuImagePackage openssh-5.2p1-gcc2-haiku-2009-05-27
     461            : $(baseURL)/openssh-5.2p1-gcc2-haiku-2009-05-27.zip
    427462            :
    428463        ;
    429464
    … …  
    453488    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
    454489        Echo "No optional package P7zip available for gcc4" ;
    455490    } else {
    456         InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-20
    457             : http://haiku-files.org/files/optional-packages/p7zip-4.65-gcc2-haiku-2009-05-20.zip
     491        local baseURL = http://www.haiku-ports.de/packages/app-arch/p7zip ;
     492        InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-24
     493            : $(baseURL)/p7zip-4.65-gcc2-haiku-2009-05-24.zip
    458494            :
    459495        ;
    460496
    … …  
    511547}
    512548
    513549
     550# Python
     551if [ IsOptionalHaikuImagePackageAdded Python ] {
     552    if $(TARGET_ARCH) != x86 {
     553        Echo "No optional package Python available for $(TARGET_ARCH)" ;
     554    } else {
     555        local baseURL = http://www.haiku-ports.de/packages/dev-lang/python ;
     556        InstallOptionalHaikuImagePackage python-2.6.2-gcc2-haiku-2009-05-14
     557            : $(baseURL)/python-2.6.2-gcc2-haiku-2009-05-14.zip
     558            :
     559        ;
     560    }
     561}
     562
     563
     564# SQLite
     565if [ IsOptionalHaikuImagePackageAdded SQLite ] {
     566    if $(TARGET_ARCH) != x86 {
     567        Echo "No optional package SQLite available for $(TARGET_ARCH)" ;
     568    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
     569        Echo "No optional package SQLite available for gcc4" ;
     570    } else {
     571        local baseURL = http://www.haiku-ports.de/packages/dev-db/sqlite ;
     572        InstallOptionalHaikuImagePackage sqlite-3.6.14-gcc2-haiku-2009-05-10
     573            : $(baseURL)/sqlite-3.6.14-gcc2-haiku-2009-05-10.zip
     574            :
     575        ;
     576    }
     577}
     578
     579
    514580# Rsync
    515581if [ IsOptionalHaikuImagePackageAdded Rsync ] {
    516582    if $(TARGET_ARCH) != x86 {
    … …  
    530596    if $(TARGET_ARCH) != x86 {
    531597        Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
    532598    } else {
    533         InstallOptionalHaikuImagePackage Subversion
    534             : http://haiku.mlotz.ch/subversion-1.4.6-haiku-20080628.zip
    535             : home
     599        local baseURL = http://www.haiku-ports.de/packages/dev-util/subversion ;
     600        InstallOptionalHaikuImagePackage subversion-1.6.2-gcc2-haiku-2009-05-20
     601            : $(baseURL)/subversion-1.6.2-gcc2-haiku-2009-05-20.zip
     602            :
    536603        ;
    537604    }
    538605}