move kernel and modules into arch specified path

Signed-off-by: Gao feng <omarapazanadi@gmail.com>

Author: gao-feng

build/Makefile.am

@@ -5,9 +5,11 @@ export INCLUDE_KMODULES=1
 endif
 
 if WITH_AARCH64
+ARCHPATH=arch/aarch64
 initrd-local:
 	bash ./make-initrd.sh aarch64
 else
+ARCHPATH=arch/x86_64
 initrd-local:
 	bash ./make-initrd.sh
 endif
@@ -16,8 +18,10 @@ cbfs-local:
 	bash ./make-initrd.sh cbfs
 
 kernel-local:
+	cp $(ARCHPATH)/kernel_config ./kernel_config
 	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
+	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/kernel >kernel.new && mv -f kernel.new $(ARCHPATH)/kernel
+	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/modules.tar > $(ARCHPATH)/modules.tar
+	mv $(ARCHPATH)/kernel_config $(ARCHPATH)/kernel_config.old
+	hyperctl run --rm hyperstart-dev:latest cat /root/build/result/kernel_config > $(ARCHPATH)/kernel_config
+	rm ./kernel_config

build/kernel_aarch64 renamed to build/arch/aarch64/kernel

@@ -24,13 +24,7 @@ cp $ARCHPATH/binary/socat /tmp/hyperstart-rootfs/sbin/
 cp $ARCHPATH/binary/mount.nfs /tmp/hyperstart-rootfs/sbin/mount.nfs4
 
 if [ "$INCLUDE_KMODULES"x == "1"x ]; then
-	if [ "$1"x = "aarch64"x ]; then
-		echo "build hyperstart for aarch64"
-		tar -xf modules_aarch64.tar -C \
-			/tmp/hyperstart-rootfs/lib/modules
-	else
-		tar -xf modules.tar -C /tmp/hyperstart-rootfs/lib/modules
-	fi
+	tar -xf $ARCHPATH/modules.tar -C /tmp/hyperstart-rootfs/lib/modules
 fi
 
 # create symlinks to busybox and iptables
@@ -77,7 +71,7 @@ if [ "$1"x = "cbfs"x ]; then
 	mkdir .cbfs
 	dd if=/dev/zero of=.cbfs/boot.bin bs=4096 count=1
 	cbfstool .cbfs/cbfs.rom create -s 8128k -B .cbfs/boot.bin -m x86  0x1000
-	cbfstool .cbfs/cbfs.rom add -f kernel -n vmlinuz -t raw
+	cbfstool .cbfs/cbfs.rom add -f $ARCHPATH/kernel -n vmlinuz -t raw
 	cbfstool .cbfs/cbfs.rom add -f hyper-initrd.img -n initrd -t raw
 	echo 'console=ttyS0 panic=1 no_timer_check' > .cbfs/cmdline
 	cbfstool .cbfs/cbfs.rom add -f .cbfs/cmdline -n cmdline -t raw