From 2b45d0e9766213eab2d6667322001f7b8bcc1169 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 9 Jun 2020 15:12:54 +0200 Subject: [PATCH 1/3] pkg/pkg.mk: remove non needed capital letter --- pkg/pkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index 52c58b8682..f701f7e82a 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -1,5 +1,5 @@ # -# Include this file if your Package needs to be checked out by git +# Include this file if your package needs to be checked out by git # # A package is up to date when its '.git-prepared' file is up to date. # Any change to the package makefile will force updating the repository From 4bc8674822a7ffae78e8b62d9314f48d6f222d56 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 9 Jun 2020 15:13:26 +0200 Subject: [PATCH 2/3] pkg/pkg.mk: fix typo on 'prerequisites' --- pkg/pkg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index f701f7e82a..8914369eff 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -64,9 +64,9 @@ $(PKG_PREPARED): $(PKG_PATCHED) # directory is not a git repository for any reason (clean -xdff or others) GIT_IN_PKG = git -C $(PKG_BUILDDIR) --git-dir=.git --work-tree=. -# When $(PKG_PATCHED).d is included $(PKG_PATCHED) pre-requisites will include -# the old pre-requisites forcing a rebuild on pre-requisite removal, but we do -# not want to generate $(PKG_PATCHED).d with the old pre-requisites +# When $(PKG_PATCHED).d is included $(PKG_PATCHED) prerequisites will include +# the old prerequisites forcing a rebuild on prerequisite removal, but we do +# not want to generate $(PKG_PATCHED).d with the old prerequisites PKG_PATCHED_PRE_REQUISITES = $(PKG_PATCHES) $(PKG_DOWNLOADED) $(MAKEFILE_LIST) # Generate dependency file. Force rebuilding on dependency deletion From cb4bce393dd1cdc57d46c628af3f58f7b7134c30 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 9 Jun 2020 15:14:01 +0200 Subject: [PATCH 3/3] pkg/pkg.mk: fix patch prerequisites variable name --- pkg/pkg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index 8914369eff..bb6da2b57f 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -67,7 +67,7 @@ GIT_IN_PKG = git -C $(PKG_BUILDDIR) --git-dir=.git --work-tree=. # When $(PKG_PATCHED).d is included $(PKG_PATCHED) prerequisites will include # the old prerequisites forcing a rebuild on prerequisite removal, but we do # not want to generate $(PKG_PATCHED).d with the old prerequisites -PKG_PATCHED_PRE_REQUISITES = $(PKG_PATCHES) $(PKG_DOWNLOADED) $(MAKEFILE_LIST) +PKG_PATCHED_PREREQUISITES = $(PKG_PATCHES) $(PKG_DOWNLOADED) $(MAKEFILE_LIST) # Generate dependency file. Force rebuilding on dependency deletion # Warning: It will be evaluated before target execution, so use as first step @@ -79,9 +79,9 @@ gen_dependency_files = $(file >$1,$@: $2)$(foreach f,$2,$(file >>$1,$(f):)) # * clean, without removing the 'state' files # * checkout the wanted base commit # * apply patches if there are any. (If none, it does nothing) -$(PKG_PATCHED): $(PKG_PATCHED_PRE_REQUISITES) +$(PKG_PATCHED): $(PKG_PATCHED_PREREQUISITES) $(info [INFO] patch $(PKG_NAME)) - $(call gen_dependency_files,$@.d,$(PKG_PATCHED_PRE_REQUISITES)) + $(call gen_dependency_files,$@.d,$(PKG_PATCHED_PREREQUISITES)) $(Q)$(GIT_IN_PKG) clean $(GIT_QUIET) -xdff '**' $(PKG_STATE:$(PKG_BUILDDIR)/%=':!%*') $(Q)$(GIT_IN_PKG) checkout $(GIT_QUIET) -f $(PKG_VERSION) $(Q)$(GIT_IN_PKG) $(GITFLAGS) am $(GITAMFLAGS) $(PKG_PATCHES)