Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
2e70a8f8
Commit
2e70a8f8
authored
5 years ago
by
Ivan A. Melnikov
Committed by
Michael Shigorin
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build-vm: Don't copy in .host/qemu* if tar2fs won't be called
(gkebfm@ thinks it was a terrible idea in the first place and mike@ agrees; this is a rework TODO item)
parent
1ef77caf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+4
-5
No files found.
features.in/build-vm/lib/90-build-vm.mk
View file @
2e70a8f8
...
...
@@ -36,7 +36,7 @@ check-qemu:
exit 1; \
fi
tar2fs: check-sudo
tar2fs: check-sudo
prepare-tarball-qemu
@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
TOPDIR=/usr/share/mkimage-profiles; \
fi; \
...
...
@@ -47,9 +47,8 @@ tar2fs: check-sudo
exit 1; \
fi
prepare-image:
@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot
@#if qemu is used
# copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot if qemu is used
prepare-tarball-qemu:
@(cd "$(BUILDDIR)/.work/chroot/"; \
tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:
...
...
@@ -80,7 +79,7 @@ post-convert:
@rm -f "$(VM_RAWDISK)"; \
if [ "0$(DEBUG)" -le 1 ]; then rm -f "$(VM_TARBALL)"; fi
convert-image:
prepare-image
convert-image/$(IMAGE_TYPE) post-convert; @:
convert-image: convert-image/$(IMAGE_TYPE) post-convert; @:
run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment