From 7c9145f0ce3c43113c6425811dc17760d22b8ed6 Mon Sep 17 00:00:00 2001
From: Apaczer <94932128+Apaczer@users.noreply.github.com>
Date: Sun, 23 Apr 2023 22:29:39 +0200
Subject: [PATCH] use BUILDROOT&CFW_HASH & real GMENU2X COMMIT_HASH in package
 CFLAGS (#31)

update workflow to accomodate CFW_HASH
---
 .github/workflows/build.yml | 18 +++++++++++++++---
 package/gmenu2x/gmenu2x.mk  |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 239864a2..31ef0aeb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,13 +26,19 @@ jobs:
         key: ${{ inputs.submodule }}-uclibc-ccache-${{ github.sha }}
         restore-keys: |
           ${{ inputs.submodule }}-uclibc-ccache-
-
+    
+    - name: generate cfw hash
+      run: |
+        git config --global --add safe.directory /__w/buildroot/buildroot 
+        echo "cfwsha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      id: cfwsha
+    
     - name: build
       run: |
         cd ${{ inputs.submodule || '.' }}
         #apt update && apt install -y wget unzip build-essential git bc swig libncurses-dev libpython3-dev libssl-dev cpio rsync subversion
         make miyoo_uclibc_defconfig
-        make sdk
+        make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}"
  
     - name: generate-graphs
       run: |
@@ -81,12 +87,18 @@ jobs:
         restore-keys: |
           ${{ inputs.submodule }}-musl-ccache-
 
+    - name: generate cfw hash
+      run: |
+        git config --global --add safe.directory /__w/buildroot/buildroot 
+        echo "cfwsha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      id: cfwsha
+
     - name: build
       run: |
         cd ${{ inputs.submodule || '.' }}
         #apt update && apt install -y wget unzip build-essential git bc swig libncurses-dev libpython3-dev libssl-dev cpio rsync subversion
         make miyoo_musl_defconfig
-        make sdk
+        make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}"
 
     - name: generate-graphs
       run: |
diff --git a/package/gmenu2x/gmenu2x.mk b/package/gmenu2x/gmenu2x.mk
index 417b790d..0488b921 100644
--- a/package/gmenu2x/gmenu2x.mk
+++ b/package/gmenu2x/gmenu2x.mk
@@ -5,15 +5,15 @@ GMENU2X_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_sound sdl_ttf
 
 PLATFORM = miyoo
 BUILDTIME := $(shell date +%s)
-COMMIT_HASH := $(shell git rev-parse --short HEAD)
+BUILDROOT_HASH := $(shell git rev-parse --short HEAD)
 SDL_CFLAGS  = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__=$(BUILDTIME) -D__COMMIT_HASH__=$(COMMIT_HASH) -DLOG_LEVEL=3
+CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__=$(BUILDTIME) -D__CFW_HASH__=$(CFW_HASH) -D__BUILDROOT_HASH__=$(BUILDROOT_HASH) -DLOG_LEVEL=3
 CFLAGS += -Isrc 
 CFLAGS += -O0 -ggdb -g3 $(SDL_CFLAGS)
 CFLAGS += -DTARGET_MIYOO
 
 define GMENU2X_BUILD_CMDS
-    $(MAKE) CFLAGS="$(CFLAGS)" CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" STRIP="$(TARGET_STRIP)" LD="$(TARGET_LD)" -C $(@D) -f Makefile.miyoo dist
+    $(MAKE) CFLAGS="$(CFLAGS) -D__COMMIT_HASH__=$(shell git -C $(GMENU2X_DL_DIR)/git rev-parse --short HEAD)" CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" STRIP="$(TARGET_STRIP)" LD="$(TARGET_LD)" -C $(@D) -f Makefile.miyoo dist
 endef
 
 define GMENU2X_INSTALL_TARGET_CMDS