From f8c9f414842095df17533f91ff4d560de3536acd Mon Sep 17 00:00:00 2001 From: "Carl D. Roth" Date: Fri, 6 May 2016 11:12:48 -0700 Subject: [PATCH] Added vendor config packages to loader --- .../base/any/initrds/loader/builds/Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/base/any/initrds/loader/builds/Makefile b/packages/base/any/initrds/loader/builds/Makefile index dc39a03d..b117a086 100644 --- a/packages/base/any/initrds/loader/builds/Makefile +++ b/packages/base/any/initrds/loader/builds/Makefile @@ -13,6 +13,7 @@ PLATFORMS := $(shell onlpm --list-platforms --arch $(ARCH)) endif PLATFORM_PACKAGES := $(foreach p,$(PLATFORMS),onl-platform-config-$(p):$(ARCH)) +VENDOR_PACKAGES := $(foreach p,$(PLATFORMS),$(shell python $(ONL)/tools/onlplatform.py $(p) $(ARCH) vendor)) ROOT := root TARGET := onl-loader-initrd-$(ARCH).cpio.gz @@ -24,6 +25,7 @@ $(TARGET): $(ONLPM) --sudo --force --extract-dir onl-loader-initrd-files:all $(ROOT) $(ONLPM) --sudo --force --extract-dir onl-vendor-config-onl-loader:all $(ROOT) $(ONLPM) --sudo $(foreach p,$(PLATFORM_PACKAGES),--extract-dir $(p) $(ROOT)) + $(MAKE) __vendor_config_data $(ONLPM) --sudo --force --extract-dir onl-vendor-config-onl:all $(ROOT) $(ONL)/tools/sjson.py --kj version $(ONL)/make/version-onl.json --kl platforms $(PLATFORMS) --kv arch $(ARCH) --out manifest.json sudo mkdir -p $(ROOT)/etc/onl/loader && sudo cp manifest.json $(ROOT)/etc/onl/loader @@ -31,7 +33,14 @@ $(TARGET): sudo $(ONL)/tools/cpiomod.py --cpio onl-buildroot-initrd-$(ARCH).cpio.gz --add-directory $(ROOT) --out $@ sudo rm -rf $(ROOT) onl-buildroot-initrd-$(ARCH).cpio.gz - - - - +__vendor_config_data: + set -e ;\ + vpkgs= ;\ + l="$(PLATFORMS)"; for p in $$l; do \ + vpkg=$$(python $(ONL)/tools/onlplatform.py $$p $(ARCH) vendor) ;\ + case " $$vpkgs " in *" $$vpkg "*) continue ;; esac ;\ + vpkgs=$$vpkgs$${vpkgs:+" "}$$vpkg ;\ + echo "Adding vendor package $$vpkg" ;\ + $(ONLPM) --sudo --force --extract-dir $$vpkg $(ROOT) ;\ + done ;\ + :