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
1
Issues
1
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
fc67e5a8
Commit
fc67e5a8
authored
Jan 22, 2020
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build-vm, tar2fs: get ARCH from command line argument
tar2fs does not run in hasher and without qemu. This causes build problems for an architecture other than the host.
parent
8117194b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
tar2fs
bin/tar2fs
+5
-1
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+1
-1
No files found.
bin/tar2fs
View file @
fc67e5a8
...
...
@@ -35,7 +35,11 @@ EFIPART=
BOOTLOADER
=
"
$5
"
ARCH
=
"
$(
arch
)
"
# NB: sudo => no GLOBAL_ will do either; mind qemu-*
if
[
-n
"
$6
"
]
;
then
ARCH
=
"
$6
"
else
ARCH
=
"
$(
arch
)
"
fi
case
"
$ARCH
"
in
e2k
)
...
...
features.in/build-vm/lib/90-build-vm.mk
View file @
fc67e5a8
...
...
@@ -45,7 +45,7 @@ tar2fs: check-sudo prepare-tarball-qemu
fi; \
if ! sudo $$TOPDIR/bin/tar2fs \
"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
"$(VM_BOOTLOADER)"; then \
"$(VM_BOOTLOADER)"
"$(ARCH)"
; then \
echo "** error: sudo tar2fs failed, see build log" >&2; \
exit 1; \
fi
...
...
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