Skip to content

Commit b38bd5d

Browse files
committed
Updated build scripts
1 parent 58c61a6 commit b38bd5d

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*******************************************************************************
44

55
=== 1.0.6 ===
6+
* Updated build scripts.
67

78
=== 1.0.5 ===
89
* Added memswap() function for vertical flipping support of the image.

make/configure.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,8 @@ endef
154154

155155
define binconfig =
156156
$(eval name=$(1))
157-
<<<<<<< Updated upstream
158-
$(eval $(call _modconfig,$(1),$(1)))
159-
=======
160157
$(eval publisher=1)
161-
$(eval $(call _modconfig,$(1),))
162-
>>>>>>> Stashed changes
158+
$(eval $(call _modconfig,$(name),$(publisher)))
163159
endef
164160

165161
define hdrconfig =

make/modules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
7878
test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
7979
mkdir -p $(dir $($(@)_PATH))
8080
$(GIT) -C "$($(@)_PATH)" reset --hard
81-
$(GIT) -C "$($(@)_PATH)" fetch origin --force
82-
$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
81+
$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
82+
$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
8383
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
8484
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
8585
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \

0 commit comments

Comments
 (0)