projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'MajewskiKrzysztof/exclude_home_project_parameter' into...
[arvados.git]
/
build
/
run-build-packages-one-target.sh
diff --git
a/build/run-build-packages-one-target.sh
b/build/run-build-packages-one-target.sh
index 7a91cb4de15eec13dbd524342b2bb20679666b0e..e06a7329790e3dfa7b1430e33c52a2b86c383cc2 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-21,6
+21,8
@@
Syntax:
Build only a specific package
--only-test <package>
Test only a specific package
Build only a specific package
--only-test <package>
Test only a specific package
+--arch <arch>
+ Build a specific architecture (amd64 or arm64, defaults to native architecture)
--force-build
Build even if the package exists upstream or if it has already been
built locally
--force-build
Build even if the package exists upstream or if it has already been
built locally
@@
-54,7
+56,7
@@
if ! [[ -d "$WORKSPACE" ]]; then
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
- help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,force-build,build-version: \
+ help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,force-build,
arch:,
build-version: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
@@
-90,6
+92,9
@@
while [ $# -gt 0 ]; do
--only-build)
ONLY_BUILD="$2"; shift
;;
--only-build)
ONLY_BUILD="$2"; shift
;;
+ --arch)
+ ARCH="$2"; shift
+ ;;
--debug)
DEBUG=" --debug"
ARVADOS_DEBUG="1"
--debug)
DEBUG=" --debug"
ARVADOS_DEBUG="1"
@@
-164,7
+169,7
@@
if [[ -n "$test_packages" ]]; then
fi
set -e
(cd $WORKSPACE/packages/$TARGET
fi
set -e
(cd $WORKSPACE/packages/$TARGET
- dpkg-scanpackages . 2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz
+ dpkg-scanpackages
--multiversion
. 2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz
apt-ftparchive -o APT::FTPArchive::Release::Origin=Arvados release . > Release
)
fi
apt-ftparchive -o APT::FTPArchive::Release::Origin=Arvados release . > Release
)
fi
@@
-190,7
+195,7
@@
fi
echo $TARGET
cd $TARGET
echo $TARGET
cd $TARGET
-time docker build --tag
=$IMAG
E .
+time docker build --tag
"$IMAGE" --build-arg HOSTTYPE=$HOSTTYP
E .
popd
if test -z "$packages" ; then
popd
if test -z "$packages" ; then
@@
-311,6
+316,7
@@
else
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
--env "FORCE_BUILD=$FORCE_BUILD" \
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
--env "FORCE_BUILD=$FORCE_BUILD" \
+ --env "ARCH=$ARCH" \
"$IMAGE" $COMMAND
then
echo
"$IMAGE" $COMMAND
then
echo