tools/scripts/build_spec.sh: some tweaks and fixes
- Fix the mkdir command - Exec container in privileged mode Change-Id: Icb3b033ccb9c1d0902ae8f75bd1592faf5f404f1 Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> Reviewed-on: http://photon-gerrit.lvn.broadcom.net/c/photon/+/25152 Tested-by: gerrit-photon <svc.photon-ci@broadcom.com> Reviewed-by: Srinidhi Rao <srinidhi.rao@broadcom.com>
This commit is contained in:
parent
db453719b8
commit
c32e25d90e
|
@ -54,12 +54,12 @@ else
|
|||
STAGE=$($READLINK -m "$2")
|
||||
fi
|
||||
|
||||
mkdir -p "$STAGE/LOGS"
|
||||
mkdir -p ${STAGE}/LOGS
|
||||
LOGFILE=stage/LOGS/$(basename "$SPECFILE" .spec).log
|
||||
|
||||
RPM_MACROS+=( --define \"dist .ph$VERSION\" --define \"with_check $WITH_CHECK\" )
|
||||
|
||||
mkdir -p "$STAGE/{RPMS,SRPMS}"
|
||||
mkdir -p ${STAGE}/{RPMS,SRPMS}
|
||||
|
||||
# use &3 for user output
|
||||
exec 3>&1
|
||||
|
@ -108,10 +108,9 @@ function tryrun() {
|
|||
}
|
||||
|
||||
function in_sandbox() {
|
||||
eval docker exec $CONTAINER $@
|
||||
eval docker exec --privileged ${CONTAINER} $@
|
||||
}
|
||||
|
||||
|
||||
function create_sandbox() {
|
||||
docker ps -f "name=$CONTAINER" && docker rm -f $CONTAINER
|
||||
docker inspect --format='{{.Created}}' photon_build_spec:$VERSION.0
|
||||
|
@ -139,7 +138,7 @@ function create_sandbox() {
|
|||
# replace toybox with coreutils and install default build tools
|
||||
run "Replace toybox with coreutils" in_sandbox tdnf remove -y toybox
|
||||
run "Upgrade Packages" in_sandbox tdnf upgrade -y
|
||||
run "Install default build tools" in_sandbox tdnf install -y rpm-build build-essential gmp-devel mpfr-devel tar sed findutils file gzip patch bzip2 createrepo
|
||||
run "Install default build tools" in_sandbox tdnf install -y rpm-build build-essential gmp-devel mpfr-devel tar sed findutils file gzip patch bzip2 createrepo python3
|
||||
run "Create local repo in sandbox" echo -e "[local]\nname=VMWare Photon Linux Local\nbaseurl=file:///usr/src/photon/RPMS\nenabled=1\nskip_if_unavailable=1" | sed 1d | docker exec -i $CONTAINER sh -c 'cat > /etc/yum.repos.d/local.repo'
|
||||
|
||||
run "Create build template image for future use" docker commit "$(docker ps -q -f "name=$CONTAINER")" photon_build_spec:$VERSION.0
|
||||
|
|
Loading…
Reference in New Issue