File tree Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Original file line number Diff line number Diff line change 3
3
*******************************************************************************
4
4
5
5
=== 1.0.6 ===
6
+ * Updated build scripts.
6
7
7
8
=== 1.0.5 ===
8
9
* Added memswap() function for vertical flipping support of the image.
Original file line number Diff line number Diff line change @@ -154,12 +154,8 @@ endef
154
154
155
155
define binconfig =
156
156
$(eval name=$(1 ) )
157
- <<<<<<< Updated upstream
158
- $(eval $(call _modconfig,$(1 ) ,$(1 ) ) )
159
- =======
160
157
$(eval publisher=1)
161
- $(eval $(call _modconfig,$(1 ) ,) )
162
- >>>>>>> Stashed changes
158
+ $(eval $(call _modconfig,$(name ) ,$(publisher ) ) )
163
159
endef
164
160
165
161
define hdrconfig =
Original file line number Diff line number Diff line change @@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
78
78
test -f " $( $( @) _PATH) /.git/config" || $(GIT ) clone " $( $( @) _URL) " " $( $( @) _PATH) "
79
79
mkdir -p $(dir $($(@ ) _PATH) )
80
80
$(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
83
83
$(GIT ) -c advice.detachedHead=false -C " $( $( @) _PATH) " checkout -B " $( $( @) _BRANCH) " " origin/$( $( @) _BRANCH) " || \
84
84
$(GIT ) -c advice.detachedHead=false -C " $( $( @) _PATH) " checkout " refs/tags/$( $( @) _BRANCH) " || \
85
85
$(GIT ) -c advice.detachedHead=false -C " $( $( @) _PATH) " checkout -B " $( $( @) _NAME) -$( $( @) _BRANCH) " " origin/$( $( @) _NAME) -$( $( @) _BRANCH) " || \
You can’t perform that action at this time.
0 commit comments