From f5975a7468633ef96266c3519bc96e2b234207c0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 22 Jan 2020 14:44:13 +0100 Subject: [PATCH] Remove more remnants from image-based engine Signed-off-by: Sebastiaan van Stijn --- .gitignore | 2 -- deb/Makefile | 4 ---- rpm/Makefile | 6 ------ 3 files changed, 12 deletions(-) diff --git a/.gitignore b/.gitignore index 91761704c8..fb2211a927 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ build debbuild rpmbuild -tmp -artifacts sources *.tar diff --git a/deb/Makefile b/deb/Makefile index 5a82540b33..d8af4bf91e 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -54,10 +54,6 @@ clean: ## remove build artifacts [ ! -d sources ] || $(CHOWN) -R $(shell id -u):$(shell id -g) sources $(RM) -r sources -engine-$(ARCH).tar: - $(MAKE) -C ../image image-linux - docker save -o $@ $$(cat ../image/image-linux) - .PHONY: deb deb: ubuntu debian ## build all deb packages except for raspbian diff --git a/rpm/Makefile b/rpm/Makefile index 761a002b77..19ff4df917 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -54,12 +54,6 @@ help: ## show make targets clean: ## remove build artifacts [ ! -d rpmbuild ] || $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild $(RM) -r rpmbuild/ - [ ! -d artifacts ] || $(CHOWN) -R $(shell id -u):$(shell id -g) artifacts - $(RM) -r artifacts/ - [ ! -d tmp ] || $(CHOWN) -R $(shell id -u):$(shell id -g) tmp - $(RM) -r tmp/ - -docker rm docker2oci - $(MAKE) -C ../image clean .PHONY: rpm rpm: fedora centos ## build all rpm packages