Drop --remote-user configuration option again.
* as Ingo has pointed out, the remote user settings doesn't relate to the build configuration at all, so setting the remote user via HAIKU_REMOTE_USER in UserBuildConfig or via shell environment is the way to go * additionally: drop debug output
This commit is contained in:
@@ -644,7 +644,6 @@ actions UploadPackages1
|
|||||||
if [ -n "$remoteUser" ]; then
|
if [ -n "$remoteUser" ]; then
|
||||||
remote="$remoteUser@$remote"
|
remote="$remoteUser@$remote"
|
||||||
fi
|
fi
|
||||||
echo $remote
|
|
||||||
|
|
||||||
if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
|
if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
|
||||||
for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
|
for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
|
||||||
|
|||||||
@@ -485,7 +485,6 @@ HOST_SHA256=
|
|||||||
HOST_HAIKU_PORTER=
|
HOST_HAIKU_PORTER=
|
||||||
HAIKU_PORTS=
|
HAIKU_PORTS=
|
||||||
HAIKU_PORTS_CROSS=
|
HAIKU_PORTS_CROSS=
|
||||||
HAIKU_REMOTE_USER=
|
|
||||||
|
|
||||||
HAIKU_PACKAGING_ARCHS=
|
HAIKU_PACKAGING_ARCHS=
|
||||||
|
|
||||||
@@ -613,11 +612,6 @@ while [ $# -gt 0 ] ; do
|
|||||||
--include-sources) HAIKU_INCLUDE_SOURCES=1; shift 1;;
|
--include-sources) HAIKU_INCLUDE_SOURCES=1; shift 1;;
|
||||||
--include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
|
--include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
|
||||||
-j*) buildCrossToolsJobs="$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=*) TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`; shift 1;;
|
||||||
--target-arch)
|
--target-arch)
|
||||||
assertparam "$1" $#
|
assertparam "$1" $#
|
||||||
@@ -895,8 +889,6 @@ HOST_HAIKU_PORTER ?= ${HOST_HAIKU_PORTER} ;
|
|||||||
HAIKU_PORTS ?= ${HAIKU_PORTS} ;
|
HAIKU_PORTS ?= ${HAIKU_PORTS} ;
|
||||||
HAIKU_PORTS_CROSS ?= ${HAIKU_PORTS_CROSS} ;
|
HAIKU_PORTS_CROSS ?= ${HAIKU_PORTS_CROSS} ;
|
||||||
|
|
||||||
HAIKU_REMOTE_USER ?= "${HAIKU_REMOTE_USER}" ;
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
for targetArch in $HAIKU_PACKAGING_ARCHS; do
|
for targetArch in $HAIKU_PACKAGING_ARCHS; do
|
||||||
|
|||||||
Reference in New Issue
Block a user