Browse Source

qcacld-3.0: Limit cherry-picked change Ids to 50

The change Ids of the most recent cherry-picked git commits are appended
to the build tag. In some cases, we have seen build tags containing
thousands of change Ids. To avoid this, limit the number of change Ids
to 50. This should be sufficient to know if some recent change is in the
build or not, without including an unbounded number of change Ids in the
build tag.

Change-Id: I3713cb8e095730ced44d88f7d05a92c2dc77f8b0
CRs-Fixed: 2311431
Dustin Brown 6 năm trước cách đây
mục cha
commit
b0c53a848e
1 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 4 4
      Kbuild

+ 4 - 4
Kbuild

@@ -2401,16 +2401,16 @@ endif
 # inject some build related information
 ifeq ($(CONFIG_BUILD_TAG), y)
 CLD_CHECKOUT = $(shell cd "$(WLAN_ROOT)" && \
-	git reflog | grep -vm1 cherry-pick | grep -oE ^[0-f]+)
+	git reflog | grep -vm1 "}: cherry-pick: " | grep -oE ^[0-f]+)
 CLD_IDS = $(shell cd "$(WLAN_ROOT)" && \
-	git log $(CLD_CHECKOUT)~..HEAD | \
+	git log -50 $(CLD_CHECKOUT)~..HEAD | \
 		sed -nE 's/^\s*Change-Id: (I[0-f]{10})[0-f]{30}\s*$$/\1/p' | \
 		paste -sd "," -)
 
 CMN_CHECKOUT = $(shell cd "$(WLAN_COMMON_INC)" && \
-	git reflog | grep -vm1 cherry-pick | grep -oE ^[0-f]+)
+	git reflog | grep -vm1 "}: cherry-pick: " | grep -oE ^[0-f]+)
 CMN_IDS = $(shell cd "$(WLAN_COMMON_INC)" && \
-	git log $(CMN_CHECKOUT)~..HEAD | \
+	git log -50 $(CMN_CHECKOUT)~..HEAD | \
 		sed -nE 's/^\s*Change-Id: (I[0-f]{10})[0-f]{30}\s*$$/\1/p' | \
 		paste -sd "," -)