rules: fix github archive download

tsl0922 · Oct 11, 2023 · 8775a84 · 8775a84
1 parent 79bb5e8
commit 8775a84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -27,4 +27,5 @@ stamp-h1
 /download
 /romfs
 /images
-/stage
+/stage
+/tmp
diff --git a/trunk/include/download.mk b/trunk/include/download.mk
@@ -5,7 +5,7 @@
 
 ifdef PKG_SOURCE_VERSION
   ifndef PKG_VERSION
-    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
+    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(shell printf '%.8s' $(PKG_SOURCE_VERSION))
   endif
   PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz

diff --git a/trunk/rules.mk b/trunk/rules.mk
@@ -9,6 +9,7 @@ TOOLCHAIN_DIR=$(CONFIG_CROSS_COMPILER_ROOT)
 PKG_CONFIG_LIBDIR=$(STAGING_DIR)/lib/pkgconfig:$(STAGING_DIR)/share/pkgconfig
 
 export TOPDIR PKG_CONFIG_LIBDIR
+export TMP_DIR:=$(TOPDIR)/tmp
 
 CP:=cp -fpR
 LN:=ln -sf
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,5 @@ stamp-h1 @@
     /download
     /romfs
     /images
-    /stage
+    /stage
+    /tmp