File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change 3434
3535# The list of packages to be built. The order matters.
3636# wolfictl determines the list and order
37- PKGLIST ?= $(shell $(WOLFICTL ) text --dir . --type name)
37+ PKG_FULL_LIST ?= $(shell $(WOLFICTL ) text --dir . --type name-version )
3838
3939all : ${KEY} .build-packages
4040
@@ -46,21 +46,25 @@ clean:
4646
4747.PHONY : list list-yaml
4848list :
49+ $(eval PKGLIST ?= $(shell $(WOLFICTL ) text --dir . --type name) )
4950 $(info $(PKGLIST ) )
5051 @printf ' '
5152
5253list-yaml :
54+ $(eval PKGLIST ?= $(shell $(WOLFICTL ) text --dir . --type name) )
5355 $(info $(addsuffix .yaml,$(PKGLIST ) ) )
5456 @printf ' '
5557
56- .build-packages : $(addprefix package/ ,${PKGLIST} )
58+ .build-packages : $(addsuffix .apk, $( addprefix packages/ $( ARCH ) / ,${PKG_FULL_LIST}) )
5759
5860package/% :
5961 $(eval yamlfile := $* .yaml)
6062 $(eval pkgver := $(shell $(MELANGE ) package-version $(yamlfile ) ) )
61- $(MAKE ) yamlfile= $( yamlfile ) pkgname= $* packages/$(ARCH ) /$(pkgver ) .apk
63+ $(MAKE ) packages/$(ARCH ) /$(pkgver ) .apk
6264
6365packages/$(ARCH ) /% .apk : $(KEY )
66+ $(eval pkgname := $(word 1, $(subst -, , $* ) ) )
67+ $(eval yamlfile := $(pkgname ) .yaml)
6468 @mkdir -p ./$(pkgname ) /
6569 $(eval SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=% ct --follow $(yamlfile ) ) )
6670 @SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH ) $(MELANGE ) build $(yamlfile ) $(MELANGE_OPTS ) --source-dir ./$(pkgname ) / --log-policy builtin:stderr,$(TARGETDIR ) /buildlogs/$* .log
You can’t perform that action at this time.
0 commit comments