github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-23 05:58:04 +00:00
Code Issues Projects Releases Wiki Activity

snap: Put the yq binary in the staging bin directory

Browse Source 
Rather than putting the `yq` binary in the staging directory itself,
put it in the `bin/` sub-directory.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2022-05-19 14:38:01 +01:00
parent d7b4ce049e
commit 27d903b76a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
snap/snapcraft.yaml
View File

@ -46,7 +46,8 @@ parts:
# put everything in stage # put everything in stage
cd ${SNAPCRAFT_STAGE} cd ${SNAPCRAFT_STAGE}
yq_path="./yq" mkdir -p "${SNAPCRAFT_STAGE}/bin/"
yq_path="${SNAPCRAFT_STAGE}/bin/yq"
yq_pkg="github.com/mikefarah/yq" yq_pkg="github.com/mikefarah/yq"
goos="linux" goos="linux"
case "$(uname -m)" in case "$(uname -m)" in
@ -82,7 +83,7 @@ parts:
override-build: | override-build: |
[ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "s390x" ] && sudo apt-get --no-install-recommends install -y protobuf-compiler [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "s390x" ] && sudo apt-get --no-install-recommends install -y protobuf-compiler
yq=${SNAPCRAFT_STAGE}/yq yq=${SNAPCRAFT_STAGE}/bin/yq
# set GOPATH # set GOPATH
export GOPATH=${SNAPCRAFT_STAGE}/gopath export GOPATH=${SNAPCRAFT_STAGE}/gopath
@ -185,7 +186,7 @@ parts:
- bison - bison
- flex - flex
override-build: | override-build: |
yq=${SNAPCRAFT_STAGE}/yq yq=${SNAPCRAFT_STAGE}/bin/yq
export PATH="${PATH}:${SNAPCRAFT_STAGE}" export PATH="${PATH}:${SNAPCRAFT_STAGE}"
export GOPATH=${SNAPCRAFT_STAGE}/gopath export GOPATH=${SNAPCRAFT_STAGE}/gopath
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
@ -249,7 +250,7 @@ parts:
- libselinux1-dev - libselinux1-dev
- ninja-build - ninja-build
override-build: | override-build: |
yq=${SNAPCRAFT_STAGE}/yq yq=${SNAPCRAFT_STAGE}/bin/yq
export GOPATH=${SNAPCRAFT_STAGE}/gopath export GOPATH=${SNAPCRAFT_STAGE}/gopath
export GO111MODULE="auto" export GO111MODULE="auto"
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}