Remove more features I won't be using.
This commit is contained in:
1 parent
c587f511bc
commit
e2fda5e379
5 files changed
+1
-1093
No files matched your search
@@ -84,7 +84,6 @@ help:
|
||||
@echo \ \ clean_caches: Removes intermediate image build artifacts \(that improve rebuild speed\)
|
||||
@echo \ \ clean_downloads: Removes files downloaded during image builds
|
||||
@echo \ \ clean: Run clean_caches and clean_downloads
|
||||
@echo \ \ osbuildvm-images: Build a image that can be used to build images inside a VM
|
||||
@echo
|
||||
@echo There are also some common conversion rules:
|
||||
@echo \ \ foo.ext4.simg will build foo.ext4 and then convert it with img2simg
|
||||
@@ -95,9 +94,6 @@ help:
|
||||
@echo custom @suffix to change the name of the produced file. For example:
|
||||
@echo " make cs9-qemu-minimal-ostree@gdb.$(HOST_ARCH).qcow2 DEFINES='extra_rpms=[\"gdb\"]'"
|
||||
@echo
|
||||
@echo If you pass VM=1, then the images used from \"make osbuildvm-images\" will be used to do the
|
||||
@echo actual building. This means that you don\'t need sudo rights to run osbuild, and it means
|
||||
@echo architectures other than the current ones can be built.
|
||||
@echo
|
||||
@echo Available image targets \(for $(HOST_ARCH)\) are:
|
||||
@echo
|
||||
@@ -181,22 +177,8 @@ clean_caches:
|
||||
.PHONY: clean
|
||||
clean: clean_downloads clean_caches
|
||||
|
||||
ifeq ($(VM), 1)
|
||||
VM_SUDO=
|
||||
VM_OSBUILD="osbuildvm/osbuildvm --arch=$(HOST_ARCH)"
|
||||
else
|
||||
VM_SUDO=sudo
|
||||
VM_OSBUILD=sudo osbuild
|
||||
endif
|
||||
|
||||
.PHONY: osbuildvm-images
|
||||
osbuildvm-images: $(BUILDDIR)
|
||||
osbuild-mpp osbuildvm/osbuildvm.mpp.yml _build/osbuildvm-$(HOST_ARCH).json
|
||||
$(VM_OSBUILD) --store $(STOREDIR) --output-directory $(OUTPUTDIR) --export osbuildvm _build/osbuildvm-$(HOST_ARCH).json
|
||||
cp $(OUTPUTDIR)/osbuildvm/disk.qcow2 _build/osbuildvm-$(HOST_ARCH).img
|
||||
cp $(OUTPUTDIR)/osbuildvm/initramfs _build/osbuildvm-$(HOST_ARCH).initramfs
|
||||
cp $(OUTPUTDIR)/osbuildvm/vmlinuz _build/osbuildvm-$(HOST_ARCH).vmlinuz
|
||||
$(VM_SUDO) rm -rf $(OUTPUTDIR)/osbuildvm
|
||||
|
||||
%.ext4.simg : %.ext4
|
||||
img2simg $< $@
|
||||
|
||||
Reference in new issue
Block a user