Skip to content

Commit 740cb97

Browse files
marc-casavantCopilot
andcommitted
Updated profiling image name generated and fixed typos
Co-authored-by: Copilot <copilot@github.com>
1 parent d6a8e8a commit 740cb97

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

scripts/docker/crossbuild.mk

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,14 @@ crossbuild.help: crossbuild.info
9494
@echo " crossbuild.IMAGE.wipe - remove Docker image"
9595
@echo ""
9696
@echo "Profiling targets:"
97-
@echo " crossbuild.IMAGE.profregen - regenerate Dockerfile.prof using default profile ($(PROFILE))"
97+
@echo " crossbuild.IMAGE.profregen - regenerate Dockerfile.prof using default profile ($(PROFILE))"
9898
@echo " crossbuild.IMAGE.profregen PROFILE=<name> - regenerate using a specific profile"
99-
@echo " crossbuild.IMAGE.profbuild - build profiling image using default profile ($(PROFILE))"
100-
@echo " crossbuild.IMAGE.profbuild PROFILE=<name> - build using a specific profile"
99+
@echo " crossbuild.IMAGE.profbuild - build profiling image using default profile ($(PROFILE))"
101100
@echo ""
102101
@echo "Available profiling profiles (scripts/docker/profiling/profiles/):"
103-
@echo " valgrind-callgrind - callgrind call graph and instruction profiling"
104-
@echo " valgrind-massif - FUTURE: massif heap memory profiling"
105-
@echo " gperftools-cpu - FUTURE: gperftools CPU profiling"
106-
@echo ""
107-
@echo "Profiling examples:"
108-
@echo " make crossbuild.ubuntu24.profregen"
109-
@echo " make crossbuild.ubuntu24.profregen PROFILE=valgrind-callgrind"
110-
@echo " make crossbuild.ubuntu24.profbuild"
111-
@echo " make crossbuild.ubuntu24.profbuild PROFILE=gperftools-cpu"
102+
@echo " profiling1 - callgrind call graph and instruction profiling"
103+
@echo " profiling2 - FUTURE: e.g. massif heap memory profiling"
104+
@echo " profiling3 - FUTURE: e.g. gperftools CPU profiling"
112105
@echo ""
113106
@echo "Use 'make NOCACHE=1 ...' to disregard the Docker cache on build"
114107

@@ -167,10 +160,10 @@ $(DD)/stamp-image.${1}:
167160
crossbuild.${1}.profbuild: $(DD)/stamp-image.${1}-profbuild
168161

169162
$(DD)/stamp-image.${1}-profbuild: $(DT)/${1}/Dockerfile.prof
170-
${Q}echo "BUILD ${1} ($(CB_IPREFIX)/${1}-prof) > $(DD)/build.${1}-profbuild"
163+
${Q}echo "BUILD ${1} (freeradius4-$(PROFILE)/${1}) > $(DD)/build.${1}-profbuild"
171164
${Q}docker build $(DOCKER_BUILD_OPTS) . \
172165
-f $(DT)/${1}/Dockerfile.prof \
173-
-t $(CB_IPREFIX)/${1}-prof \
166+
-t freeradius4-$(PROFILE)/${1} \
174167
>$(DD)/build.${1}-profbuild 2>&1
175168
${Q}touch $(DD)/stamp-image.${1}-profbuild
176169

0 commit comments

Comments
 (0)