M #-: Various fixes for 6.10.0-3 (#20)

- Update one-apps submodule to latest master
- Bump version to 6.10.0-3
- Use common.pkr.hcl instead of plugins.pkr.hcl
- Use alma8 image from local one-apps in service_example
- Add various makefile fixes

apps-code/community-apps/Makefile

@@ -5,23 +5,23 @@ include Makefile.config
 -include Makefile.local
 
 # services
-services: $(patsubst %,packer-%,$(SERVICES))
+services: $(SERVICES:%=packer-%)
 
 # allow individual services targets (e.g., "make service_Lithops")
 $(SERVICES): %: packer-%
 
 # aliases + dependency
-packer-%: ${DIR_EXPORT}/%.qcow2
-	@${INFO} "Packer ${*} done"
+packer-%: $(DIR_EXPORT)/%.qcow2
+	@$(INFO) 'Packer $* done'
 
 # run packer build for given distro or service
-${DIR_EXPORT}/%.qcow2:
-	$(eval DISTRO_NAME := $(shell echo ${*} | sed 's/[0-9].*//'))
-	$(eval DISTRO_VER  := $(shell echo ${*} | sed 's/^.[^0-9]*\(.*\)/\1/'))
-	packer/build.sh "${DISTRO_NAME}" "${DISTRO_VER}" ${@}
+$(DIR_EXPORT)/%.qcow2:
+	$(eval DISTRO_NAME := $(shell echo $* | sed 's/[0-9].*//'))
+	$(eval DISTRO_VER  := $(shell echo $* | sed 's/^.[^0-9]*\(.*\)/\1/'))
+	packer/build.sh '$(DISTRO_NAME)' '$(DISTRO_VER)' $@
 
 clean:
-	-rm -rf ${DIR_EXPORT}/*
+	-if [ -d '$(DIR_EXPORT)' ]; then rm -rf $(DIR_EXPORT)/*; fi
 
 help:
 	@echo 'Usage examples:'

apps-code/community-apps/Makefile.config

@@ -1,6 +1,6 @@
 # context version definition
 VERSION := 6.10.0
-RELEASE := 2
+RELEASE := 3
 
 # log
 VERBOSE         := 1
@@ -15,10 +15,10 @@ SERVICES := service_Lithops service_UERANSIM capone131 service_example
 DIR_ONEAPPS := ../one-apps
 DIR_BUILD   := build
 DIR_EXPORT  := export
-$(shell mkdir -p ${DIR_BUILD} ${DIR_EXPORT})
+$(shell mkdir -p $(DIR_BUILD) $(DIR_EXPORT))
 
 # don't delete exported
-.SECONDARY: $(patsubst %,$(DIR_EXPORT)/%.qcow2,$(SERVICES))
+.SECONDARY: $(SERVICES:%=$(DIR_EXPORT)/%.qcow2)
 
 # logging func
 INFO=sh -c 'if [ $(VERBOSE) = 1 ]; then echo [INFO] $$1; fi' INFO

apps-code/community-apps/packer/capone/common.pkr.hcl

@@ -0,0 +1 @@
+../../../one-apps/packer/common.pkr.hcl

apps-code/community-apps/packer/service_Lithops/common.pkr.hcl

@@ -0,0 +1 @@
+../../../one-apps/packer/common.pkr.hcl

apps-code/community-apps/packer/service_UERANSIM/common.pkr.hcl

@@ -0,0 +1 @@
+../../../one-apps/packer/common.pkr.hcl

apps-code/community-apps/packer/service_example/common.pkr.hcl

@@ -0,0 +1 @@
+../../../one-apps/packer/common.pkr.hcl

apps-code/community-apps/packer/service_example/example.pkr.hcl

@@ -21,7 +21,7 @@ source "qemu" "example" {
   memory      = 2048
   accelerator = "kvm"
 
-  iso_url      = "export/alma8.qcow2"
+  iso_url      = "../one-apps/export/alma8.qcow2"
   iso_checksum = "none"
 
   headless = var.headless