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
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
0f2411ec
Commit
0f2411ec
authored
Dec 04, 2017
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image.in, build-vm: handle qemu-img absence properly
This isn't a warning cause, this is a error cause!
parent
a173bbd0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+2
-1
Makefile
image.in/Makefile
+4
-0
No files found.
features.in/build-vm/lib/90-build-vm.mk
View file @
0f2411ec
...
...
@@ -39,7 +39,8 @@ convert-image: prepare-image
*) VM_FORMAT="$(IMAGE_TYPE)"; \
esac; \
if ! type -t qemu-img >&/dev/null; then \
echo "** warning: qemu-img not available" >&2; \
echo "** error: qemu-img not available" >&2; \
exit 1; \
else \
qemu-img convert -O "$$VM_FORMAT" \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
...
...
image.in/Makefile
View file @
0f2411ec
...
...
@@ -80,6 +80,10 @@ imagedir:
postprocess
:
| $(addprefix postprocess-
,
$(sort $(POSTPROCESS_TARGETS)))
@
OUTSIZE
=
"
`
ls
-lh
"
$(IMAGE_OUTPATH)
"
|
cut
-f5
-d
' '
`
"
;
\
if
[
!
-n
"
$$
OUTSIZE"
]
;
then
\
echo
"** error:
$(IMAGE_OUTPATH)
missing"
>
&2
;
\
exit
1
;
\
fi
;
\
echo
"** image:
$(IMAGE_OUTPATH)
[
$$
OUTSIZE]"
>
&2
&&
\
echo
"IMAGE_OUTPATH =
$(IMAGE_OUTPATH)
"
&&
\
echo
"IMAGE_OUTFILE =
$(IMAGE_OUTFILE)
"
&&
\
...
...
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