mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-26 22:46:32 +00:00
Allow setting BUILDDIR in the build to dictate where to find directories (#1153)
This allows building many components without elevated permissions or needing to do it within a container.
This commit is contained in:
parent
2c3c066ea0
commit
d7c09e15b9
2
.github/workflows/dev.yml
vendored
2
.github/workflows/dev.yml
vendored
@ -74,7 +74,7 @@ jobs:
|
|||||||
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
||||||
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
||||||
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
||||||
haos-builder make VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
|
haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
|
||||||
|
|
||||||
- name: Upload images
|
- name: Upload images
|
||||||
uses: appleboy/scp-action@master
|
uses: appleboy/scp-action@master
|
||||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -69,7 +69,7 @@ jobs:
|
|||||||
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
||||||
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
||||||
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
||||||
haos-builder make VERSION_DEV="" ${{ matrix.board.name }}
|
haos-builder make BUILDDIR=/build VERSION_DEV="" ${{ matrix.board.name }}
|
||||||
|
|
||||||
- name: Upload disk image
|
- name: Upload disk image
|
||||||
if: ${{ matrix.board.name != 'ova' }}
|
if: ${{ matrix.board.name != 'ova' }}
|
||||||
|
7
Makefile
7
Makefile
@ -1,7 +1,8 @@
|
|||||||
RELEASE_DIR = /build/release
|
BUILDDIR:=$(shell pwd)
|
||||||
|
RELEASE_DIR = $(BUILDDIR)/release
|
||||||
|
|
||||||
BUILDROOT=/build/buildroot
|
BUILDROOT=$(BUILDDIR)/buildroot
|
||||||
BUILDROOT_EXTERNAL=/build/buildroot-external
|
BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
|
||||||
DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
|
DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
|
||||||
VERSION_DATE := $(shell date --utc +'%Y%m%d')
|
VERSION_DATE := $(shell date --utc +'%Y%m%d')
|
||||||
VERSION_DEV := "dev$(VERSION_DATE)"
|
VERSION_DEV := "dev$(VERSION_DATE)"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user