Skip to content

Commit

Permalink
Added OpenSSH and Git optional packages for x86_64.
Browse files Browse the repository at this point in the history
This commit is the first done from Haiku x86_64! Uncovered a few
networking bugs so hopefully this'll push OK... :)
  • Loading branch information
aejsmith committed Dec 29, 2012
1 parent 48ec1c9 commit 622506c
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions build/jam/OptionalPackages
Expand Up @@ -1134,9 +1134,7 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {

# Git
if [ IsOptionalHaikuImagePackageAdded Git ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Git available for $(TARGET_ARCH)" ;
} else {
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
Expand All @@ -1148,6 +1146,13 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
: $(baseURL)/git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
git-1.8.0-x86_64-2012-12-29.zip
: $(baseURL)/git-1.8.0-x86_64-2012-12-29.zip
: : true ;
} else {
Echo "No optional package Git available for $(TARGET_ARCH)" ;
}
}

Expand Down Expand Up @@ -1695,15 +1700,17 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] {

# OpenSSH
if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package OpenSSH available for $(TARGET_ARCH)" ;
} else {
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
Exit "Optional package OpenSSH requires the HAIKU_IMAGE_HOST_NAME"
"variable to be set!" ;
}

if $(HAIKU_GCC_VERSION[1]) >= 4 {
if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
openssh-6.0p1-x86_64-2012-12-29.zip
: $(baseURL)/openssh-6.0p1-x86_64-2012-12-29.zip ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip
: $(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
Expand All @@ -1715,6 +1722,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {

AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
: "sshd user" ;
} else {
Echo "No optional package OpenSSH available for $(TARGET_ARCH)" ;
}
}

Expand Down

0 comments on commit 622506c

Please sign in to comment.