Added OpenSSH and Git optional packages for x86_64.
This commit is the first done from Haiku x86_64! Uncovered a few networking bugs so hopefully this'll push OK... :)
This commit is contained in:
parent
48ec1c9d22
commit
622506c485
|
@ -1134,9 +1134,7 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
|
||||||
|
|
||||||
# Git
|
# Git
|
||||||
if [ IsOptionalHaikuImagePackageAdded Git ] {
|
if [ IsOptionalHaikuImagePackageAdded Git ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) = x86 {
|
||||||
Echo "No optional package Git available for $(TARGET_ARCH)" ;
|
|
||||||
} else {
|
|
||||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||||
InstallOptionalHaikuImagePackage
|
InstallOptionalHaikuImagePackage
|
||||||
git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
|
git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
|
||||||
|
@ -1148,6 +1146,13 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
|
||||||
: $(baseURL)/git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
|
: $(baseURL)/git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
|
||||||
: : true ;
|
: : 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)" ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1695,15 +1700,17 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] {
|
||||||
|
|
||||||
# OpenSSH
|
# OpenSSH
|
||||||
if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
|
||||||
Echo "No optional package OpenSSH available for $(TARGET_ARCH)" ;
|
|
||||||
} else {
|
|
||||||
if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
|
if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
|
||||||
Exit "Optional package OpenSSH requires the HAIKU_IMAGE_HOST_NAME"
|
Exit "Optional package OpenSSH requires the HAIKU_IMAGE_HOST_NAME"
|
||||||
"variable to be set!" ;
|
"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
|
InstallOptionalHaikuImagePackage
|
||||||
openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip
|
openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip
|
||||||
: $(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
|
: $(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
|
||||||
|
@ -1715,6 +1722,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
||||||
|
|
||||||
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
|
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
|
||||||
: "sshd user" ;
|
: "sshd user" ;
|
||||||
|
} else {
|
||||||
|
Echo "No optional package OpenSSH available for $(TARGET_ARCH)" ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue