Conflicts are simple overlapping changes.
Showing the changes to scripts (3 of 371 files). Show all
Unified · Split
| @@ -386,7 +386,7 @@ ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) · 385 unmodified lines | |||
| 386 | cmd_update_lto_symversions = \ | 386 | cmd_update_lto_symversions = \ |
| 387 | rm -f $@.symversions \ | 387 | rm -f $@.symversions \ |
| 388 | $(foreach n, $(filter-out FORCE,$^), \ | 388 | $(foreach n, $(filter-out FORCE,$^), \ |
| 389 | $(if $(wildcard $(n).symversions), \ | 389 | $(if $(shell test -s $(n).symversions && echo y), \ |
| 390 | ; cat $(n).symversions >> $@.symversions)) | 390 | ; cat $(n).symversions >> $@.symversions)) |
| 391 | else | 391 | else |
| 392 | cmd_update_lto_symversions = echo >/dev/null | 392 | cmd_update_lto_symversions = echo >/dev/null |
| @@ -131,11 +131,14 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" · 130 unmodified lines | |||
| 131 | if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then | 131 | if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then |
| 132 | # full scm version string | 132 | # full scm version string |
| 133 | res="$res$(scm_version)" | 133 | res="$res$(scm_version)" |
| 134 | elif [ -z "${LOCALVERSION}" ]; then | 134 | elif [ "${LOCALVERSION+set}" != "set" ]; then |
| 135 | # append a plus sign if the repository is not in a clean | 135 | # If the variable LOCALVERSION is not set, append a plus |
| 136 | # annotated or signed tagged state (as git describe only | 136 | # sign if the repository is not in a clean annotated or |
| 137 | # looks at signed or annotated tags - git tag -a/-s) and | 137 | # signed tagged state (as git describe only looks at signed |
| 138 | # LOCALVERSION= is not specified | 138 | # or annotated tags - git tag -a/-s). |
| 139 | # | ||
| 140 | # If the variable LOCALVERSION is set (including being set | ||
| 141 | # to an empty string), we don't want to append a plus sign. | ||
| 139 | scm=$(scm_version --short) | 142 | scm=$(scm_version --short) |
| 140 | res="$res${scm:++}" | 143 | res="$res${scm:++}" |
| 141 | fi | 144 | fi |
| @@ -44,7 +44,7 @@ def read_spdxdata(repo): · 43 unmodified lines | |||
| 44 | continue | 44 | continue |
| 45 | 45 | ||
| 46 | exception = None | 46 | exception = None |
| 47 | for l in open(el.path).readlines(): | 47 | for l in open(el.path, encoding="utf-8").readlines(): |
| 48 | if l.startswith('Valid-License-Identifier:'): | 48 | if l.startswith('Valid-License-Identifier:'): |
| 49 | lid = l.split(':')[1].strip().upper() | 49 | lid = l.split(':')[1].strip().upper() |
| 50 | if lid in spdx.licenses: | 50 | if lid in spdx.licenses: |