projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18766: Merge branch 'main' into 18766-fix-ubuntu1804-python3-path
[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 4c55458d4640a8a9a847bdfe017efe46e6ca52bd..e06a7329790e3dfa7b1430e33c52a2b86c383cc2 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-21,8
+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
---
only-
arch <arch>
- Build
only a specific architecture (amd64 or arm64
)
+--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
@@
-56,14
+56,13
@@
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,
only-
arch:,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
fi
TARGET=debian10
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
fi
TARGET=debian10
-ONLY_ARCH=
FORCE_BUILD=0
COMMAND=
DEBUG=
FORCE_BUILD=0
COMMAND=
DEBUG=
@@
-93,8
+92,8
@@
while [ $# -gt 0 ]; do
--only-build)
ONLY_BUILD="$2"; shift
;;
--only-build)
ONLY_BUILD="$2"; shift
;;
- --
only-
arch)
-
ONLY_
ARCH="$2"; shift
+ --arch)
+ ARCH="$2"; shift
;;
--debug)
DEBUG=" --debug"
;;
--debug)
DEBUG=" --debug"
@@
-170,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
@@
-317,7
+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 "
ONLY_ARCH=$ONLY_
ARCH" \
+ --env "
ARCH=$
ARCH" \
"$IMAGE" $COMMAND
then
echo
"$IMAGE" $COMMAND
then
echo