github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4007 from deitch/fix-update-component-too-broad-match

Browse Source 
Fix update component too broad match
This commit is contained in:
Avi Deitcher 2024-03-05 00:16:15 -08:00 committed by GitHub
commit 17f5ecaefd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/Makefile
View File

@ -69,8 +69,8 @@ SPACE := $(eval) $(eval)
PERIOD := .
# series - convert a version to a series, e.g. 6.6.13 -> 6.6.x
series = $(word 1,$(subst ., ,$(1))).$(word 2,$(subst ., ,$(1))).x
# serieswildcard - convert a version with or without a hash to a wildcard, e.g. 6.6.13-anbcd -> 6.6.-*
serieswildcard = $(word 1,$(subst ., ,$(1))).$(word 2,$(subst ., ,$(1))).[0-9]+-[0-9a-f]+.*
# serieswithhash - convert a version with or without a hash to a series with a hash, e.g. 6.6.13-anbcd -> 6.6.x-[0-9a-f]+
serieswithhash = $(word 1,$(subst ., ,$(1))).$(word 2,$(subst ., ,$(1))).[0-9]+-[0-9a-f]+
# word 1 is the release, word 2 is the tool
RELEASESEP := PART
@ -195,7 +195,7 @@ tag-debugkernel-%:
# will update hash for same semver and/or patch version
update-kernel-hash-yaml-%:
$(eval NEWTAG=$(shell $(MAKE) tag-plainkernel-$*))
$(eval OLDTAG=$(call serieswildcard,$(NEWTAG)))
$(eval OLDTAG=$(call serieswithhash,$(NEWTAG)))
@cd $(REPO_ROOT) && ./scripts/update-component-sha.sh --hash "$(OLDTAG)" "$(NEWTAG)"
# find and replace any usage of the normal kernel with semver for most recent series

2
scripts/update-component-sha.sh
View File

@ -69,7 +69,7 @@ case "${mode}" in
fi
old=$1
new=$2
git grep -E -l "\b($old)([[:space:]].*)?$" -- '*.yml' '*.yaml' '*.yml.in' '*.yaml.in' '*/Dockerfile' '*/Makefile' | grep -v /vendor/ | while read -r file; do sed -ri.bak -e "s,$old,$new,g" "$file"; done
git grep -E -l "\b($old)([[:space:]]|$)?" -- '*.yml' '*.yaml' '*.yml.in' '*.yaml.in' '*/Dockerfile' '*/Makefile' | grep -v /vendor/ | while read -r file; do sed -ri.bak -e "s,($old)([[:space:]]|$)?,$new\2,g" "$file"; done
;;
--image)
if [ $# -lt 1 ] ; then

2
test/cases/020_kernel/019_config_6.6.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:6.6.13-93250a118b43a85609ca27778784c161977024e6
image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04

2
test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
View File

@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for
# testing.
FROM linuxkit/kernel:6.6.13-93250a118b43a85609ca27778784c161977024e6 AS ksrc
FROM linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5 AS ksrc
# Extract headers and compile module
FROM linuxkit/kernel:6.6.13-builder AS build

2
test/cases/020_kernel/119_kmod_6.6.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:6.6.13-93250a118b43a85609ca27778784c161977024e6
image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04