Skip to content

Commit 2d671a2

Browse files
committed
enable qemu system
1 parent 3a4519b commit 2d671a2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

build-hnp/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ harmonix-public.hnp: $(STAMP) Makefile
2020
rm -rf sysroot
2121
mkdir -p sysroot/bin
2222
mkdir -p sysroot/lib
23+
mkdir -p sysroot/usr/share/qemu
2324

2425
cp -r buildroot/lib/libz.so* sysroot/lib/
26+
cp -r buildroot/lib/libzstd.so* sysroot/lib/
2527
cp -r buildroot/lib/libssl.so* sysroot/lib/
2628
cp -r buildroot/lib/libidn2.so* sysroot/lib/
2729
cp -r buildroot/lib/libcrypto.so* sysroot/lib/
2830

2931
cp -r buildroot/bin/wget sysroot/bin/hmx_wget
3032
cp -r buildroot/bin/harmonix sysroot/bin/
3133
cp -r buildroot/bin/qemu-* sysroot/bin/
34+
cp -vr buildroot/usr/share/qemu sysroot/usr/share
3235

3336
# create hnp manually
3437
cp hnp.json sysroot

build-hnp/qemu-10/Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ all: download/qemu
1111
PKG_CONFIG_PATH= \
1212
PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig:$(shell pwd)/../buildroot/share/pkgconfig \
1313
PKG_CONFIG_buildroot_DIR=$(shell pwd)/../buildroot \
14-
CFLAGS="-D_UAPI_LINUX_VIRTIO_VSOCK_H -D_UAPI_LINUX_VIRTIO_TYPES_H -D_UAPI_LINUX_VIRTIO_RING_H -D_UAPI_LINUX_VIRTIO_PMEM_H -D_UAPI_LINUX_VIRTIO_NET_H -D_UAPI_LINUX_VIRTIO_IOMMU_H -D_UAPI_LINUX_VIRTIO_FS_H -D_UAPI_LINUX_VIRTIO_CONSOLE_H -D_UAPI_LINUX_VIRTIO_CONFIG_H -D_LINUX_SYSINFO_H -UHAVE_OPENAT2_H -D__user= -D__force= ${CFLAGS} -I$(shell pwd)/../buildroot/include/glib-2.0 -I$(shell pwd)/../buildroot/lib/glib-2.0/include -L$(shell pwd)/../buildroot/lib" \
15-
./configure --target-list=aarch64-linux-user,x86_64-linux-user --cross-prefix= --host-cc=cc --disable-kvm --disable-xen --disable-rust --disable-docs --disable-system --disable-werror \
16-
--disable-bsd-user --disable-guest-agent --disable-gcrypt --disable-debug-info --disable-debug-tcg --enable-attr --disable-brlapi --disable-linux-aio --disable-bzip2 --disable-cap-ng --disable-curl --disable-fdt --disable-glusterfs --disable-gnutls --disable-nettle --disable-gtk --disable-rdma --disable-libiscsi --disable-vnc-jpeg --disable-kvm --disable-lzo --disable-curses --disable-libnfs --disable-numa --disable-opengl --disable-rbd --disable-vnc-sasl --disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer --disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --enable-linux-user --disable-tools
14+
CFLAGS="-D_UAPI_LINUX_VIRTIO_VSOCK_H -D_UAPI_LINUX_VIRTIO_TYPES_H -D_UAPI_LINUX_VIRTIO_RING_H -D_UAPI_LINUX_VIRTIO_PMEM_H -D_UAPI_LINUX_VIRTIO_NET_H -D_UAPI_LINUX_VIRTIO_IOMMU_H -D_UAPI_LINUX_VIRTIO_FS_H -D_UAPI_LINUX_VIRTIO_CONSOLE_H -D_UAPI_LINUX_VIRTIO_CONFIG_H -D_LINUX_SYSINFO_H -UHAVE_OPENAT2_H -D__user= -D__force= ${CFLAGS} -Wno-unused-command-line-argument -I$(shell pwd)/../buildroot/include/glib-2.0 -I$(shell pwd)/../buildroot/lib/glib-2.0/include -L$(shell pwd)/../buildroot/lib" \
15+
./configure --target-list=aarch64-linux-user,x86_64-linux-user,aarch64-softmmu,x86_64-softmmu --cross-prefix= --host-cc=cc --disable-kvm --disable-xen --disable-rust --disable-docs --disable-werror \
16+
--disable-bsd-user --disable-guest-agent --disable-gcrypt --disable-debug-info --disable-debug-tcg --enable-attr --disable-brlapi --disable-linux-aio --disable-bzip2 --disable-cap-ng --disable-curl --disable-glusterfs --disable-gnutls --disable-nettle --disable-gtk --disable-rdma --disable-libiscsi --disable-vnc-jpeg --disable-kvm --disable-lzo --disable-curses --disable-libnfs --disable-numa --disable-opengl --disable-rbd --disable-vnc-sasl --disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer --disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --enable-linux-user --disable-tools --disable-libudev --disable-passt
1717
cd temp/qemu && make -j $(shell nproc) && make install DESTDIR=$(shell pwd)/build
1818
$(OHOS_SDK_HOME)/native/llvm/bin/llvm-strip ./build/usr/local/bin/*
1919
mkdir -p ../buildroot/bin
20+
mkdir -p ../buildroot/usr/share/qemu
2021
cp -rv ./build/usr/local/bin/qemu-aarch64 ../buildroot/bin/qemu-harmonix-aarch64
2122
cp -rv ./build/usr/local/bin/qemu-x86_64 ../buildroot/bin/qemu-harmonix-x86_64
23+
cp -rv ./build/usr/local/bin/qemu-system-* ../buildroot/bin/
2224
cp -rv ./scripts/* ../buildroot/bin/
25+
cp -rv ./build/usr/local/share/qemu/bios-256k.bin ../buildroot/usr/share/qemu/
26+
cp -rv ./build/usr/local/share/qemu/efi-e1000.rom ../buildroot/usr/share/qemu/
27+
cp -rv ./build/usr/local/share/qemu/kvmvapic.bin ../buildroot/usr/share/qemu/
28+
cp -rv ./build/usr/local/share/qemu/linuxboot_dma.bin ../buildroot/usr/share/qemu/
29+
cp -rv ./build/usr/local/share/qemu/vgabios-stdvga.bin ../buildroot/usr/share/qemu/
2330

2431
download/qemu:
2532
mkdir -p download

0 commit comments

Comments
 (0)