From 721907f3d3e3ea6fd4c03390d51521cbb2748865 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Sun, 14 Jun 2020 14:07:29 -0500 Subject: [PATCH] finalize the package build system --- makefile | 8 ++++++++ packages/filesystem/font-source-code-pro/makefile | 8 ++++++++ packages/filesystem/makefile | 6 ++++++ packages/filesystem/xsecurelock/makefile | 5 +++++ packages/initramfs/makefile | 8 ++++++++ packages/kernel/makefile | 8 ++++++++ packages/makefile | 7 +++++++ 7 files changed, 50 insertions(+) diff --git a/makefile b/makefile index 2804f14..bc718f0 100644 --- a/makefile +++ b/makefile @@ -69,6 +69,10 @@ clean_basefs: clean_initramfs: rm -r build/PrawnOS-initramfs.cpio.gz +.PHONY: clean_packages +packages: + cd packages && $(MAKE) clean + .PHONY: clean_pbuilder clean_pbuilder: rm -r build/prawnos-pbuilder-armhf-base.tgz @@ -81,6 +85,7 @@ clean_all: $(MAKE) clean_basefs $(MAKE) clean_initramfs $(MAKE) clean_pbuilder + $(MAKE) clean_packages #:::::::::::::::::::::::::::::: premake prep :::::::::::::::::::::::::::::: .PHONY: build_dirs @@ -124,6 +129,9 @@ filesystem: packages: cd packages && $(MAKE) +.PHONY: packages_install +install_packages: + cd packages && $(MAKE) install INSTALL_TARGET=/tmp/ #:::::::::::::::::::::::::::::: image management :::::::::::::::::::::::::: .PHONY: kernel_inject diff --git a/packages/filesystem/font-source-code-pro/makefile b/packages/filesystem/font-source-code-pro/makefile index 70e958c..1bf1a59 100644 --- a/packages/filesystem/font-source-code-pro/makefile +++ b/packages/filesystem/font-source-code-pro/makefile @@ -1,8 +1,10 @@ + #import all shared make vars PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel) include $(PRAWNOS_ROOT)/scripts/common.mk VERSION := $(shell cd src/; dpkg-parsechangelog --show-field Version) +EMPTY := "" font-source-code-pro_$(VERSION)_all.deb: @echo Building $@ @@ -17,3 +19,9 @@ clean: .PHONY: upload upload: dput deb.prawnos.com *.changes + +install: +ifndef INSTALL_TARGET + $(error INSTALL_TARGET is not set) +endif + cp font-source-code-pro_$(VERSION)_all.deb $(INSTALL_TARGET) diff --git a/packages/filesystem/makefile b/packages/filesystem/makefile index 0da5639..b2f1182 100644 --- a/packages/filesystem/makefile +++ b/packages/filesystem/makefile @@ -13,3 +13,9 @@ clean: for dir in $(SUBDIRS) ; do \ make clean -C $$dir ; \ done + +install: + $(info filesystem install target is $(INSTALL_TARGET)) + for dir in $(SUBDIRS) ; do \ + make install INSTALL_TARGET=$(INSTALL_TARGET) -C $$dir ; \ + done diff --git a/packages/filesystem/xsecurelock/makefile b/packages/filesystem/xsecurelock/makefile index a373b11..1df1d2a 100644 --- a/packages/filesystem/xsecurelock/makefile +++ b/packages/filesystem/xsecurelock/makefile @@ -26,4 +26,9 @@ clean: upload: dput deb.prawnos.com *.changes +install: +ifndef INSTALL_TARGET + $(error INSTALL_TARGET is not set) +endif + cp xsecurelock_$(VERSION)_armhf.deb $(INSTALL_TARGET) diff --git a/packages/initramfs/makefile b/packages/initramfs/makefile index cd1346a..d9937ce 100644 --- a/packages/initramfs/makefile +++ b/packages/initramfs/makefile @@ -3,3 +3,11 @@ include $(PRAWNOS_ROOT)/scripts/common.mk all: @echo TODO + + +clean: + @echo TODO + + +install: + @echo TODO diff --git a/packages/kernel/makefile b/packages/kernel/makefile index cd1346a..d9937ce 100644 --- a/packages/kernel/makefile +++ b/packages/kernel/makefile @@ -3,3 +3,11 @@ include $(PRAWNOS_ROOT)/scripts/common.mk all: @echo TODO + + +clean: + @echo TODO + + +install: + @echo TODO diff --git a/packages/makefile b/packages/makefile index 0da5639..ec8ff78 100644 --- a/packages/makefile +++ b/packages/makefile @@ -13,3 +13,10 @@ clean: for dir in $(SUBDIRS) ; do \ make clean -C $$dir ; \ done + + +install: + @echo packages install target is $(INSTALL_TARGET) + for dir in $(SUBDIRS) ; do \ + make install INSTALL_TARGET=$(INSTALL_TARGET) -C $$dir ; \ + done