Add support for specifying remote ssh login user.
* add option --remote-user to configure, which sets HAIKU_REMOTE_USER * add evaluation of HAIKU_REMOTE_USER variable when ssh-ing into git.haiku-os.org
This commit is contained in:
parent
492ac4160a
commit
86d7e28306
@ -640,6 +640,11 @@ rule UploadPackages target : packages
|
||||
actions UploadPackages1
|
||||
{
|
||||
remote=git.haiku-os.org
|
||||
remoteUser=$(HAIKU_REMOTE_USER)
|
||||
if [ -n "$remoteUser" ]; then
|
||||
remote="$remoteUser@$remote"
|
||||
fi
|
||||
echo $remote
|
||||
|
||||
if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
|
||||
for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
|
||||
@ -667,6 +672,10 @@ rule BuildRemoteHaikuPortsRepository target : packages
|
||||
actions BuildRemoteHaikuPortsRepository1
|
||||
{
|
||||
remote=git.haiku-os.org
|
||||
remoteUser=$(HAIKU_REMOTE_USER)
|
||||
if [ -n "$remoteUser" ]; then
|
||||
remote="$remoteUser@$remote"
|
||||
fi
|
||||
|
||||
repoArch=$(TARGET_PACKAGING_ARCH)
|
||||
scp $(2) $remote:hpkg-upload/$repoArch
|
||||
|
10
configure
vendored
10
configure
vendored
@ -72,6 +72,8 @@ options:
|
||||
-j<n> Only relevant for --build-cross-tools and
|
||||
--build-cross-tools-gcc4. Is passed on to the
|
||||
make building the build tools.
|
||||
--remote-user <username> Use given username when logging into
|
||||
git.haiku-os.org (via ssh).
|
||||
--target=TARGET Select build target platform.
|
||||
[default=${TARGET_PLATFORM}]
|
||||
valid targets=r5,bone,dano,haiku
|
||||
@ -483,6 +485,7 @@ HOST_SHA256=
|
||||
HOST_HAIKU_PORTER=
|
||||
HAIKU_PORTS=
|
||||
HAIKU_PORTS_CROSS=
|
||||
HAIKU_REMOTE_USER=
|
||||
|
||||
HAIKU_PACKAGING_ARCHS=
|
||||
|
||||
@ -610,6 +613,11 @@ while [ $# -gt 0 ] ; do
|
||||
--include-sources) HAIKU_INCLUDE_SOURCES=1; shift 1;;
|
||||
--include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
|
||||
-j*) buildCrossToolsJobs="$1"; shift 1;;
|
||||
--remote-user)
|
||||
assertparam "$1" $#
|
||||
HAIKU_REMOTE_USER=$2
|
||||
shift 2
|
||||
;;
|
||||
--target=*) TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`; shift 1;;
|
||||
--target-arch)
|
||||
assertparam "$1" $#
|
||||
@ -887,6 +895,8 @@ HOST_HAIKU_PORTER ?= ${HOST_HAIKU_PORTER} ;
|
||||
HAIKU_PORTS ?= ${HAIKU_PORTS} ;
|
||||
HAIKU_PORTS_CROSS ?= ${HAIKU_PORTS_CROSS} ;
|
||||
|
||||
HAIKU_REMOTE_USER ?= "${HAIKU_REMOTE_USER}" ;
|
||||
|
||||
EOF
|
||||
|
||||
for targetArch in $HAIKU_PACKAGING_ARCHS; do
|
||||
|
Loading…
Reference in New Issue
Block a user