Merge pull request #341 from gao-feng/arch2

bug fix on aarch64

Author: gao-feng

.gitignore

@@ -15,9 +15,10 @@ build/hyper-initrd.img
 data/hyperstart.service
 build/cbfs.rom
 build/root/*
-build/*iso
 build/daemon
-build/kernel_config.old
+build/Dockerfile
+build/arch/aarch64/kernel_config.old
+build/arch/x86_64/kernel_config.old
 build/.*
 src/.*
 Makefile

build/Dockerfile.aarch64

@@ -0,0 +1,29 @@
+FROM centos:7
+MAINTAINER Hyper Developers <dev@hyper.sh>
+
+RUN yum install -y patch gcc ncurses-devel make openssl-devel bc perl
+
+ENV KERNEL_VERSION 4.9.51
+ENV LOCALVERSION -hyper
+ENV KERNEL_RELEASE ${KERNEL_VERSION}${LOCALVERSION}
+
+ENV KBUILD_BUILD_USER    dev
+ENV KBUILD_BUILD_HOST    hyper.sh
+ENV KBUILD_BUILD_VERSION 1
+
+RUN mkdir /root/build/ && mkdir /root/build/result/
+RUN curl -fSL https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.gz | tar -zx -C /root/build
+
+COPY kernel_config /root/build/linux-${KERNEL_VERSION}/.config
+COPY kernel_patch/ /root/build/kernel_patch/
+
+RUN cd /root/build/linux-${KERNEL_VERSION}/ && for patch in /root/build/kernel_patch/*.patch; do patch -p1 <$patch || exit 1; done
+RUN cd /root/build/linux-${KERNEL_VERSION}/ && make silentoldconfig && make -j 8
+
+# install to /root/build/result/ so that we can get them from it
+RUN cp /root/build/linux-${KERNEL_VERSION}/arch/arm64/boot/Image.gz /root/build/result/kernel
+RUN mkdir /root/build/result/modules &&\
+    cd /root/build/linux-${KERNEL_VERSION}/ && make modules_install INSTALL_MOD_PATH="/root/build/result/modules" &&\
+    cd /root/build/result/modules/lib/modules/ && rm -f ${KERNEL_RELEASE}/{build,source} &&\
+    tar -cf /root/build/result/modules.tar ${KERNEL_RELEASE}/ && rm -rf /root/build/result/modules
+RUN cp /root/build/linux-${KERNEL_VERSION}/.config /root/build/result/kernel_config

build/Dockerfile renamed to build/Dockerfile.x86_64

@@ -1,23 +1,26 @@
+AUTOMAKE_OPTIONS = -Wno-portability
+SHELL=/bin/bash
+ARCH=$(shell uname -m)
+ARCHPATH=arch/$(ARCH)
+
 all-local: initrd
 
 if WITH_KMODULES
 export INCLUDE_KMODULES=1
 endif
 
-if WITH_AARCH64
-initrd-local:
-	bash ./make-initrd.sh aarch64
-else
 initrd-local:
 	bash ./make-initrd.sh
-endif
 
 cbfs-local:
 	bash ./make-initrd.sh cbfs
 
 kernel-local:
-	hyperctl build -t hyperstart-dev:latest .
-	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/kernel >kernel.new && mv -f kernel.new kernel
-	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/modules.tar >modules.tar
-	mv kernel_config kernel_config.old
-	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/kernel_config >kernel_config
+	cp $(ARCHPATH)/kernel_config ./kernel_config
+	cp Dockerfile.$(ARCH) Dockerfile
+	hyperctl build -t hyperstart-dev-$(ARCH):latest -f Dockerfile .
+	hyperctl run --rm hyperstart-dev-$(ARCH):latest cat /root/build/result/kernel >kernel.new && mv -f kernel.new $(ARCHPATH)/kernel
+	hyperctl run --rm hyperstart-dev-$(ARCH):latest cat /root/build/result/modules.tar > $(ARCHPATH)/modules.tar
+	mv $(ARCHPATH)/kernel_config $(ARCHPATH)/kernel_config.old
+	hyperctl run --rm hyperstart-dev-$(ARCH):latest cat /root/build/result/kernel_config > $(ARCHPATH)/kernel_config
+	rm ./kernel_config

build/Makefile.am

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.36 Kernel Configuration
+# Linux/arm64 4.9.51 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1755,8 +1755,8 @@ CONFIG_RTC_INTF_DEV=y
 #
 # on-CPU RTC drivers
 #
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
 # CONFIG_RTC_DRV_SNVS is not set
 
 #