Rework and organize the filesystem build

filesystem/makefile

@@ -1,8 +1,63 @@
-filesystem_packages:
-	$(MAKE) -C packages all
+ifndef FILESYSTEM_MK
+FILESYSTEM_MK := 1
+ifndef PRAWNOS_ROOT
+PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel)
+endif
+include $(PRAWNOS_ROOT)/scripts/BuildScripts/BuildCommon.mk
+
+FS_BUILD_LOG := $(PRAWNOS_BUILD_LOGS)/fs-log.txt
+
+PRAWNOS_FILESYSTEM_PACKAGES := $(PRAWNOS_FILESYSTEM)/packages
+
+PACKAGES_BUILT := $(PRAWNOS_FILESYSTEM_PACKAGES)/.packages_built
+
+.PHONY: filesystem \
+				pbuilder_create \
+				pbuilder_update \
+				filesystem_packages \
+				filesystem_packages_clean \
+				filesystem_packages_install
+
+### Filesystem Image
+
+filesystem: $(PRAWNOS_IMAGE_BASE)
+
+### Packages
+
+filesystem_packages: $(PRAWNOS_BUILD)
 
 filesystem_packages_clean:
-	$(MAKE) -C packages clean
+	$(MAKE) -C $(PRAWNOS_FILESYSTEM_PACKAGES) clean
+	rm -f $(PRAWNOS_PACKAGES_BUILT)
 
 filesystem_packages_install:
-	$(MAKE) -C packages INSTALL_TARGET=$(INSTALL_TARGET) install
+ifndef INSTALL_TARGET
+	$(error INSTALL_TARGET is not set)
+endif
+	$(MAKE) -C $(PRAWNOS_FILESYSTEM_PACKAGES) INSTALL_TARGET=$(INSTALL_TARGET) install
+
+### Pbuilder
+
+pbuilder_create: $(PBUILDER_CHROOT)
+
+#TODO: should only update if not updated for a day
+pbuilder_update: $(PBUILDER_CHROOT)
+	@echo UPDATING $(PBUILDER_CHROOT)
+	pbuilder update --basetgz $(PBUILDER_CHROOT) --configfile $(PBUILDER_RC)
+
+### REAL TARGETS
+
+$(PACKAGES_BUILT): $(PRAWNOS_BUILD)
+	$(MAKE) -C $(PRAWNOS_FILESYSTEM_PACKAGES) all
+	touch $(PACKAGES_BUILT)
+
+$(PBUILDER_CHROOT): $(PRAWNOS_BUILD)
+	@echo BUILDING $(PBUILDER_CHROOT)
+	pbuilder create --basetgz $(PBUILDER_CHROOT) --configfile $(PBUILDER_RC)
+
+$(PRAWNOS_IMAGE_BASE): $(PRAWNOS_BUILD) $(PACKAGES_BUILT)
+	rm -rf $(FS_BUILD_LOG)
+	$(PRAWNOS_FILESYSTEM_SCRIPTS_BUILD) $(KVER) $(DEBIAN_SUITE) $(PRAWNOS_IMAGE_BASE) $(PRAWNOS_ROOT) $(PRAWNOS_SHARED_SCRIPTS) $(PRAWNOS_FILESYSTEM_RESOURCES) 2>&1 | tee $(FS_BUILD_LOG)
+
+
+endif

filesystem/packages/.gitignore

@@ -0,0 +1 @@
+.packages_built

filesystem/packages/flashmap/makefile

@@ -1,3 +1,4 @@
+.DEFAULT_GOAL := default
 #import all shared make vars
 PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel)
 include $(PRAWNOS_ROOT)/scripts/BuildScripts/BuildCommon.mk
@@ -9,6 +10,9 @@ PACKAGE_NAME_DEB := $(PACKAGE_NAME).deb
 
 PACKAGE_LOCAL_BUILD_DEPS :=
 
+
+default: $(PACKAGE_NAME_DEB)
+
 $(PACKAGE_NAME_DEB):
 	$(PRAWNOS_PACKAGE_SCRIPTS_PBUILD) $(PACKAGE_NAME_DEB) \
                                             $(PBUILDER_VARS) \

filesystem/packages/font-source-code-pro/makefile

@@ -1,3 +1,4 @@
+.DEFAULT_GOAL := default
 #import all shared make vars
 PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel)
 include $(PRAWNOS_ROOT)/scripts/BuildScripts/BuildCommon.mk
@@ -7,6 +8,8 @@ VERSION := $(shell cd src/; dpkg-parsechangelog --show-field Version)
 PACKAGE_NAME := font-source-code-pro_$(VERSION)_all
 PACKAGE_NAME_DEB := $(PACKAGE_NAME).deb
 
+default: $(PACKAGE_NAME_DEB)
+
 $(PACKAGE_NAME_DEB):
 	@echo Building $@
 	cd src/; debuild -us -uc

filesystem/packages/mosys/makefile

@@ -1,3 +1,4 @@
+.DEFAULT_GOAL := default
 #import all shared make vars
 PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel)
 include $(PRAWNOS_ROOT)/scripts/BuildScripts/BuildCommon.mk
@@ -9,6 +10,8 @@ PACKAGE_NAME_DEB := $(PACKAGE_NAME).deb
 
 PACKAGE_LOCAL_BUILD_DEPS := flashmap
 
+default: $(PACKAGE_NAME_DEB)
+
 $(PACKAGE_NAME_DEB):
 	$(PRAWNOS_PACKAGE_SCRIPTS_PBUILD) $(PACKAGE_NAME_DEB) \
                                             $(PBUILDER_VARS) \

filesystem/packages/xsecurelock/makefile

@@ -1,3 +1,4 @@
+.DEFAULT_GOAL := default
 #import all shared make vars
 PRAWNOS_ROOT := $(shell git rev-parse --show-toplevel)
 include $(PRAWNOS_ROOT)/scripts/BuildScripts/BuildCommon.mk
@@ -9,6 +10,8 @@ PACKAGE_NAME_DEB := $(PACKAGE_NAME).deb
 
 PACKAGE_LOCAL_BUILD_DEPS :=
 
+default: $(PACKAGE_NAME_DEB)
+
 $(PACKAGE_NAME_DEB):
 	$(PRAWNOS_PACKAGE_SCRIPTS_PBUILD) $(PACKAGE_NAME_DEB) \
                                             $(PBUILDER_VARS) \