RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

download: don't overwrite VERSION variable 

In package-defaults.mk the VERSION variable contains the final package
version, which is a combination of `PKG_VERSION`, `PKG_RELEASE` and if
used, parameters of `PKG_SOURCE_VERSION`. While this works fine for
building, within the package Makefile the content VERSION varies:

When building a package from a release tarball, the content of VERSION
contains the actual package version, however when building from source
(i.e. Git), the VERSION is overwritten by `PKG_SOURCE_VERSION`.

To fix the overwrite, this commit switches from `VERSION` in download.mk
to `SOURCE_VERSION` which isn't used anywhere else yet.

As a result, Makefiles may pass the package version to be included
inside the binary.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2024-04-17 07:07:41 +02:00
parent eec18118d0
commit 9fc79e2e26
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/download.mk
View File

@ -168,7 +168,7 @@ define DownloadMethod/cvs
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
cvs -d $(URL) export $(VERSION) $(SUBDIR) && \ cvs -d $(URL) export $(SOURCE_VERSION) $(SUBDIR) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
@ -184,10 +184,10 @@ define DownloadMethod/svn
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
( svn help export | grep -q trust-server-cert && \ ( svn help export | grep -q trust-server-cert && \
svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \ svn export --non-interactive --trust-server-cert -r$(SOURCE_VERSION) $(URL) $(SUBDIR) || \
svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \ svn export --non-interactive -r$(SOURCE_VERSION) $(URL) $(SUBDIR) ) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
export TAR_TIMESTAMP="`svn info -r$(VERSION) --show-item last-changed-date $(URL)`" && \ export TAR_TIMESTAMP="`svn info -r$(SOURCE_VERSION) --show-item last-changed-date $(URL)`" && \
$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \ rm -rf $(SUBDIR); \
@ -205,7 +205,7 @@ define DownloadMethod/github_archive
$(SCRIPT_DIR)/dl_github_archive.py \ $(SCRIPT_DIR)/dl_github_archive.py \
--dl-dir="$(DL_DIR)" \ --dl-dir="$(DL_DIR)" \
--url="$(URL)" \ --url="$(URL)" \
--version="$(VERSION)" \ --version="$(SOURCE_VERSION)" \
--subdir="$(SUBDIR)" \ --subdir="$(SUBDIR)" \
--source="$(FILE)" \ --source="$(FILE)" \
--hash="$(MIRROR_HASH)" \ --hash="$(MIRROR_HASH)" \
@ -227,7 +227,7 @@ define DownloadMethod/rawgit
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
git clone $(OPTS) $(URL) $(SUBDIR) && \ git clone $(OPTS) $(URL) $(SUBDIR) && \
(cd $(SUBDIR) && git checkout $(VERSION)) && \ (cd $(SUBDIR) && git checkout $(SOURCE_VERSION)) && \
export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
echo "Generating formal git archive (apply .gitattributes rules)" && \ echo "Generating formal git archive (apply .gitattributes rules)" && \
(cd $(SUBDIR) && git config core.abbrev 8 && \ (cd $(SUBDIR) && git config core.abbrev 8 && \
@ -250,7 +250,7 @@ define DownloadMethod/bzr
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
bzr export --per-file-timestamps -r$(VERSION) $(SUBDIR) $(URL) && \ bzr export --per-file-timestamps -r$(SOURCE_VERSION) $(SUBDIR) $(URL) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
export TAR_TIMESTAMP="" && \ export TAR_TIMESTAMP="" && \
$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@ -266,7 +266,7 @@ define DownloadMethod/hg
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
hg clone -r $(VERSION) $(URL) $(SUBDIR) && \ hg clone -r $(SOURCE_VERSION) $(URL) $(SUBDIR) && \
export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \
find $(SUBDIR) -name .hg | xargs rm -rf && \ find $(SUBDIR) -name .hg | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
@ -283,7 +283,7 @@ define DownloadMethod/darcs
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
darcs get -t $(VERSION) $(URL) $(SUBDIR) && \ darcs get -t $(SOURCE_VERSION) $(URL) $(SUBDIR) && \
export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \ export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \
find $(SUBDIR) -name _darcs | xargs rm -rf && \ find $(SUBDIR) -name _darcs | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
@ -293,12 +293,12 @@ define DownloadMethod/darcs
) )
endef endef
Validate/cvs=VERSION SUBDIR Validate/cvs=SOURCE_VERSION SUBDIR
Validate/svn=VERSION SUBDIR Validate/svn=SOURCE_VERSION SUBDIR
Validate/git=VERSION SUBDIR Validate/git=SOURCE_VERSION SUBDIR
Validate/bzr=VERSION SUBDIR Validate/bzr=SOURCE_VERSION SUBDIR
Validate/hg=VERSION SUBDIR Validate/hg=SOURCE_VERSION SUBDIR
Validate/darcs=VERSION SUBDIR Validate/darcs=SOURCE_VERSION SUBDIR
define Download/Defaults define Download/Defaults
URL:= URL:=
@ -311,7 +311,7 @@ define Download/Defaults
MIRROR:=1 MIRROR:=1
MIRROR_HASH=$$(MIRROR_MD5SUM) MIRROR_HASH=$$(MIRROR_MD5SUM)
MIRROR_MD5SUM:=x MIRROR_MD5SUM:=x
VERSION:= SOURCE_VERSION:=
OPTS:= OPTS:=
SUBMODULES:= SUBMODULES:=
endef endef
@ -326,7 +326,7 @@ define Download/default
$(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR))) $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
$(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)) $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
$(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH)) $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
VERSION:=$(PKG_SOURCE_VERSION) SOURCE_VERSION:=$(PKG_SOURCE_VERSION)
$(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM)) $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
$(if $(PKG_HASH),HASH:=$(PKG_HASH)) $(if $(PKG_HASH),HASH:=$(PKG_HASH))
endef endef