talksik/Adv360-Pro-ZMK
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile errors that prevent builds on macOS (#409)

Browse Source
This commit is contained in:
David Whetstone
2024-04-02 13:31:29 -07:00
committed by GitHub
parent dd3da03b9d
commit 742d19ef63
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba
Many thanks to all those who have submitted issues and pull requests to make this firmware better! Many thanks to all those who have submitted issues and pull requests to make this firmware better!
## Config repo ## Config repo
14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409)
18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385) 18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385)
12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376) 12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376)
Makefile
+4 -5
View File
@@ -1,8 +1,7 @@
DOCKER := "$(shell { command -v podman || command -v docker; })" DOCKER := $(shell { command -v podman || command -v docker; })
TIMESTAMP := "$(shell date -u +"%Y%m%d%H%M")" TIMESTAMP := $(shell date -u +"%Y%m%d%H%M")
COMMIT := "$(shell git rev-parse --short HEAD 2>/dev/null)" COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
detected_OS := "$(shell uname)" # Classify UNIX OS ifeq ($(shell uname),Darwin)
ifeq ($(strip $(detected_OS)),Darwin) #We only care if it's OS X
SELINUX1 := SELINUX1 :=
SELINUX2 := SELINUX2 :=
else else