Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit f989612

Browse files
committed
remove compile option --with-aarch64
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
1 parent 03ddf53 commit f989612

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
lines changed

build/Makefile.am

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
AUTOMAKE_OPTIONS = -Wno-portability
2+
SHELL=/bin/bash
3+
ARCHPATH=arch/$(shell uname -m)
4+
15
all-local: initrd
26

37
if WITH_KMODULES
48
export INCLUDE_KMODULES=1
59
endif
610

7-
if WITH_AARCH64
8-
ARCHPATH=arch/aarch64
9-
initrd-local:
10-
bash ./make-initrd.sh aarch64
11-
else
12-
ARCHPATH=arch/x86_64
1311
initrd-local:
1412
bash ./make-initrd.sh
15-
endif
1613

1714
cbfs-local:
1815
bash ./make-initrd.sh cbfs

build/make-initrd.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ mkdir -m 0755 -p /tmp/hyperstart-rootfs/dev \
1212
/tmp/hyperstart-rootfs/proc
1313

1414
cp ../src/hyperstart /tmp/hyperstart-rootfs/init
15-
if [ "$1"x == "aarch64"x ]; then
16-
ARCHPATH="arch/aarch64"
17-
else
18-
ARCHPATH="arch/x86_64"
19-
fi
15+
16+
ARCHPATH=arch/$(uname -m)
2017
cp $ARCHPATH/binary/busybox /tmp/hyperstart-rootfs/sbin/
2118
cp $ARCHPATH/binary/iptables /tmp/hyperstart-rootfs/sbin/
2219
cp $ARCHPATH/binary/ipvsadm /tmp/hyperstart-rootfs/sbin/

configure.ac

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@ if test "$fail" = "1" ; then
4040
AC_MSG_ERROR(Unable to find necessary functions)
4141
fi
4242

43-
AC_ARG_WITH([aarch64],
44-
[AS_HELP_STRING([--with-aarch64],
45-
[run hyperstart with 64-bit ARM architecture])],
46-
[],[with_aarch64=no])
47-
48-
if test "x$with_aarch64" != "xno" ; then
49-
AC_DEFINE_UNQUOTED([WITH_AARCH64], 1, [run hyperstart with 64-bit ARM architecture])
50-
fi
51-
52-
AM_CONDITIONAL([WITH_AARCH64], [test "x$with_aarch64" != "xno"])
53-
5443
AC_ARG_WITH([systemdsystemunitdir],
5544
AS_HELP_STRING([--with-systemdsystemunitdir=SYSTEMD_SYSTEM_UNIT_DIR],
5645
[path to install systemd system service]),
@@ -89,7 +78,6 @@ AC_MSG_RESULT([
8978
${PACKAGE} ${VERSION}
9079
prefix: ${prefix}
9180
92-
with-aarch64: ${with_aarch64}
9381
with-kmodules: ${with_kmodules}
9482
9583
vsock-support: ${have_vsock}

0 commit comments

Comments
 (0)