Skip to content

Commit 74ed368

Browse files
committed
based on qemu-10
1 parent 9bc1200 commit 74ed368

File tree

9 files changed

+63
-8
lines changed

9 files changed

+63
-8
lines changed

build-hnp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PKGS=zstd \
22
zlib \
33
pcre2 \
44
libglib \
5-
qemu
5+
qemu-10
66
STAMP=$(patsubst %,%/.stamp,$(PKGS))
77

88
all: copy

build-hnp/libglib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ all: download/glib
1616
cd temp/glib && echo "cpu_family = 'aarch64'" >> cross.txt
1717
cd temp/glib && echo "cpu = 'aarch64'" >> cross.txt
1818
cd temp/glib && echo "endian = 'little'" >> cross.txt
19-
cd temp/glib && PKG_CONFIG=$(shell which pkg-config) PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig meson --cross-file cross.txt --prefix=/data/app/harmonix.org/harmonix_1.0 -Dselinux=false -Dinstalled_tests=false -Ddtrace=disabled -Dsystemtap=disabled -Dselinux=disabled -Dlibelf=disabled -Dlibmount=disabled -Ddefault_library=both build
19+
cd temp/glib && PKG_CONFIG=$(shell which pkg-config) PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig meson --cross-file cross.txt --prefix=/ -Dselinux=false -Dinstalled_tests=false -Ddtrace=disabled -Dsystemtap=disabled -Dselinux=disabled -Dlibelf=disabled -Dlibmount=disabled -Ddefault_library=both build
2020
cd temp/glib/build && meson compile
2121
mkdir -p ../buildroot
2222
cd temp/glib/build && DESTDIR=$(shell pwd)/build meson install
23-
cp -rfv ./build/data/app/harmonix.org/harmonix_1.0/. ../buildroot | tee file.lst
23+
cp -rfv ./build/. ../buildroot | tee file.lst
2424

2525
download/glib:
2626
mkdir -p download

build-hnp/pcre2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ all: download/pcre2-10.45.tar.gz
33
mkdir -p temp build
44
cd temp && tar xvf ../download/pcre2-10.45.tar.gz
55
cd temp/pcre2-10.45 && mkdir build
6-
cd temp/pcre2-10.45/build && PKG_CONFIG=/usr/bin/false cmake ../ -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_INSTALL_PREFIX=/data/app/harmonix.org/harmonix_1.0 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_CXX_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_BUILD_TYPE=RelWithDebInfo
6+
cd temp/pcre2-10.45/build && PKG_CONFIG=/usr/bin/false cmake ../ -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_CXX_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_BUILD_TYPE=RelWithDebInfo
77
cd temp/pcre2-10.45/build && make -j $(shell nproc) && make install DESTDIR=$(shell pwd)/build
88
mkdir -p ../buildroot
9-
cp -rfv build/data/app/harmonix.org/harmonix_1.0/. ../buildroot | tee file.lst
9+
cp -rfv build/. ../buildroot | tee file.lst
1010

1111
download/pcre2-10.45.tar.gz:
1212
mkdir -p download

build-hnp/qemu-10/Makefile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
include ../utils/Makefrag
2+
3+
all: download/qemu
4+
rm -rf temp build
5+
mkdir -p temp build/bin
6+
cd download/qemu && git worktree add -f $(shell pwd)/temp/qemu HEAD
7+
cd temp/qemu && \
8+
PKG_CONFIG=$(shell which pkg-config) \
9+
PKG_CONFIG_PATH= \
10+
PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig:$(shell pwd)/../buildroot/share/pkgconfig \
11+
PKG_CONFIG_SYSROOT_DIR=$(shell pwd)/../buildroot \
12+
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 -UTARGET_NR_mq_open -D__user= -D__force= ${CFLAGS}" \
13+
./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 --enable-tcg-interpreter --disable-werror --static \
14+
--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
15+
cd temp/qemu && make -j $(shell nproc) && make install DESTDIR=$(shell pwd)/build
16+
$(OHOS_SDK_HOME)/native/llvm/bin/llvm-strip ./build/usr/local/bin/*
17+
mkdir -p ../sysroot/bin
18+
cp -rv ./build/usr/local/bin/qemu-aarch64 ../sysroot/bin/qemu-harmonix-aarch64
19+
cp -rv ./build/usr/local/bin/qemu-x86_64 ../sysroot/bin/qemu-harmonix-x86_64
20+
cp -rv ./scripts/* ../sysroot/bin/
21+
22+
download/qemu:
23+
mkdir -p download
24+
cd download && git clone -b termony-qemu-10-vroot --depth=100 https://github.com/hackeris/harmony-qemu qemu
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#/bin/env sh
2+
3+
echo 'Downloading alpine minimal root filesystem'
4+
5+
mkdir -p /data/storage/el2/base/temp
6+
cd /data/storage/el2/base/temp
7+
rm -f alpine-minirootfs.tar.gz
8+
wget https://dl-cdn.alpinelinux.org/alpine/v3.22/releases/aarch64/alpine-minirootfs-3.22.1-aarch64.tar.gz -O alpine-minirootfs.tar.gz
9+
echo 'Done.'
10+
11+
echo 'Preparing alpine minimal root filesystem'
12+
rm -rf /data/storage/el2/base/files/alpine_aarch64
13+
mkdir /data/storage/el2/base/files/alpine_aarch64
14+
15+
cd /data/storage/el2/base/files
16+
tar xvf /data/storage/el2/base/temp/alpine-minirootfs.tar.gz -C alpine_aarch64
17+
18+
echo 'Alpine root filesystem installed to /data/storage/el2/base/files/alpine_aarch64'
19+
echo 'You can run harmonix_run_alpine to start.'
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#/bin/env sh
2+
3+
echo 'Will remove alpine root filesystem at /data/storage/el2/base/files/alpine_aarch64'
4+
echo 'Press any key to continue, or Ctrl+C to break'
5+
read -n 1 key
6+
7+
rm -rf /data/storage/el2/base/files/alpine_aarch64
8+
9+
echo 'Alpine root filesystem at /data/storage/el2/base/files/alpine_aarch64 has been removed.'
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#/bin/env sh
2+
cd /data/storage/el2/base/files/alpine_aarch64
3+
qemu-harmonix-aarch64 -E PATH=/bin:/sbin:/usr/bin -E HOME=/root -L . ./bin/busybox sh -c 'cd ~ && sh'

build-hnp/utils/Makefrag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export STRIP := $(OHOS_SDK_HOME)/native/llvm/bin/llvm-strip
1717
export CFLAGS := -I$(shell pwd)/../buildroot/include -Wno-int-conversion -O2
1818
export CXXFLAGS := -I$(shell pwd)/../buildroot/include -O2
1919
export LDFLAGS := -L$(shell pwd)/../buildroot/lib
20-
export PREFIX := /data/app/harmonix.org/harmonix_1.0
20+
export PREFIX := /
2121

2222
define define_autotools_package
2323
all: download/$(SOURCE_FILE)

build-hnp/zstd/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ all: download/zstd-1.5.7.tar.gz
44
cd temp && tar xvf ../download/zstd-1.5.7.tar.gz
55
cd temp/zstd-1.5.7 && cat ../../0001-qsort.diff | patch -Np1
66
cd temp/zstd-1.5.7 && mkdir build-zstd
7-
cd temp/zstd-1.5.7/build-zstd && PKG_CONFIG=/usr/bin/false cmake ../build/cmake -DCMAKE_INSTALL_PREFIX=/data/app/harmonix.org/harmonix_1.0 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_C_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_CXX_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang++ -DCMAKE_AR=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ar -DCMAKE_BUILD_TYPE=RelWithDebInfo -DZSTD_BUILD_STATIC=ON -DZSTD_BUILD_SHARED=ON
7+
cd temp/zstd-1.5.7/build-zstd && PKG_CONFIG=/usr/bin/false cmake ../build/cmake -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_C_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang -DCMAKE_CXX_COMPILER=$(OHOS_SDK_HOME)/native/llvm/bin/aarch64-unknown-linux-ohos-clang++ -DCMAKE_AR=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ar -DCMAKE_BUILD_TYPE=RelWithDebInfo -DZSTD_BUILD_STATIC=ON -DZSTD_BUILD_SHARED=ON
88
cd temp/zstd-1.5.7/build-zstd && make -j $(shell nproc) && make install DESTDIR=$(shell pwd)/build
99
mkdir -p ../buildroot
10-
cp -rfv build/data/app/harmonix.org/harmonix_1.0/. ../buildroot | tee file.lst
10+
cp -rfv build/. ../buildroot | tee file.lst
1111

1212
download/zstd-1.5.7.tar.gz:
1313
mkdir -p download

0 commit comments

Comments
 (0)