Skip to content

Commit 01525f2

Browse files
committed
profiling image build targets renamed
1 parent 53dc778 commit 01525f2

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

scripts/docker/crossbuild.mk

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ crossbuild.help: crossbuild.info
102102
@echo " crossbuild.IMAGE.profile.regen - regenerate Dockerfile.prof using default profile ($(PROFILE))"
103103
@echo " crossbuild.IMAGE.profile.regen PROFILE=<name> - regenerate using a specific profile"
104104
@echo " crossbuild.IMAGE.profile.build - build profiling image using default profile ($(PROFILE))"
105-
@echo " crossbuild.IMAGE.profile.reset - remove profiling stamp and Dockerfile.prof to force rebuild"
105+
@echo " crossbuild.IMAGE.profile.reset - remove profiling stamp to force rebuild"
106106
@echo ""
107107
@echo "Use 'make NOCACHE=1 ...' to disregard the Docker cache on build"
108108

@@ -158,15 +158,15 @@ $(DD)/stamp-image.${1}:
158158
# Build the profiling image
159159
#
160160
.PHONY: crossbuild.${1}.profile.build
161-
crossbuild.${1}.profile.build: $(DD)/stamp-image.${1}-profbuild
161+
crossbuild.${1}.profile.build: $(DD)/stamp-image.${1}-profile.build
162162

163-
$(DD)/stamp-image.${1}-profbuild: $(DT)/${1}/Dockerfile.prof
164-
${Q}echo "BUILD ${1} (freeradius4-$(PROFILE)/${1}) > $(DD)/build.${1}-profbuild"
163+
$(DD)/stamp-image.${1}-profile.build: $(DT)/${1}/Dockerfile.prof
164+
${Q}echo "BUILD ${1} (freeradius4-$(PROFILE)/${1}) > $(DD)/build.${1}-profile.build"
165165
${Q}docker build $(DOCKER_BUILD_OPTS) . \
166166
-f $(DT)/${1}/Dockerfile.prof \
167167
-t freeradius4-$(PROFILE)/${1} \
168-
>$(DD)/build.${1}-profbuild 2>&1
169-
${Q}touch $(DD)/stamp-image.${1}-profbuild
168+
>$(DD)/build.${1}-profile.build 2>&1
169+
${Q}touch $(DD)/stamp-image.${1}-profile.build
170170

171171
#
172172
# Start up the docker container
@@ -293,13 +293,12 @@ $(DT)/${1}/Dockerfile.prof: $(DOCKER_TMPL) $(CB_DIR)/m4/profiling.deb.m4
293293
$$< > $$@
294294

295295
#
296-
# Remove profiling stamp and Dockerfile so next profbuild starts clean
296+
# Remove profiling stamp so next profile.build starts clean
297297
#
298298
.PHONY: crossbuild.${1}.profile.reset
299299
crossbuild.${1}.profile.reset:
300300
${Q}echo RESET profiling ${1}
301-
${Q}rm -f $(DD)/stamp-image.${1}-profbuild
302-
${Q}rm -f $(DT)/${1}/Dockerfile.prof
301+
${Q}rm -f $(DD)/stamp-image.${1}-profile.build
303302

304303
#
305304
# Run the build test

0 commit comments

Comments
 (0)