From 041a45b85f07abaa37d0b4e0550f184d776ccf93 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Thu, 6 Jun 2019 15:14:56 +0000 Subject: [PATCH] Use new simplifying macros. --- packages/base/amd64/upgrade/builds/Makefile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/base/amd64/upgrade/builds/Makefile b/packages/base/amd64/upgrade/builds/Makefile index 772ff62f..e9fa8837 100644 --- a/packages/base/amd64/upgrade/builds/Makefile +++ b/packages/base/amd64/upgrade/builds/Makefile @@ -1,18 +1,14 @@ include $(ONL)/make/config.amd64.mk -$(eval $(call onlpm_find_file,KERNEL_3_16,onl-kernel-3.16-lts-x86-64-all:amd64,kernel-3.16-lts-x86_64-all)) -$(eval $(call onlpm_find_file,KERNEL_4_9,onl-kernel-4.9-lts-x86-64-all:amd64,kernel-4.9-lts-x86_64-all)) -$(eval $(call onlpm_find_file,KERNEL_4_14,onl-kernel-4.14-lts-x86-64-all:amd64,kernel-4.14-lts-x86_64-all)) +# All amd64 kernels -> $FILES +$(eval $(call onlpm_find_file_add,X,onl-kernel-3.16-lts-x86-64-all:amd64,kernel-3.16-lts-x86_64-all,FILES)) +$(eval $(call onlpm_find_file_add,X,onl-kernel-4.9-lts-x86-64-all:amd64,kernel-4.9-lts-x86_64-all,FILES)) +$(eval $(call onlpm_find_file_add,X,onl-kernel-4.14-lts-x86-64-all:amd64,kernel-4.14-lts-x86_64-all,FILES)) -# All amd64 kernels -KERNELS := $(KERNEL_3_16) $(KERNEL_4_9) $(KERNEL_4_14) - -# Loader initrd -$(eval $(call onlpm_find_file,INITRD,onl-loader-initrd:amd64,onl-loader-initrd-amd64.cpio.gz)) -$(eval $(call onlpm_find_file,MANIFEST,onl-loader-initrd:amd64,manifest.json)) +# Loader initrd and manifest -> $FILES +$(eval $(call onlpm_find_file_add,X,onl-loader-initrd:amd64,onl-loader-initrd-amd64.cpio.gz,FILES)) +$(eval $(call onlpm_find_file_add,X,onl-loader-initrd:amd64,manifest.json,FILES)) all: mkdir -p files - cp $(KERNELS) files - cp $(INITRD) files - cp $(MANIFEST) files + cp $(FILES) files