update kernel build

build kernel/modules in the hyperstart-dev:latest container
remove build/modules/ directroy and add modules.tar instead

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>

Makefile.am

@@ -4,3 +4,5 @@ initrd-local:
 	@echo finish make initrd
 cbfs-local:
 	@echo finish make cbfs
+kernel-local:
+	@echo finish make kernel

build/Dockerfile

@@ -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
+
+ENV KERNEL_VERSION 4.4.7
+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/x86_64/boot/bzImage /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/Makefile.am

@@ -10,3 +10,8 @@ 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

build/kernel_config

@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-hyper"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y

build/kernel_version

@@ -1,2 +0,0 @@
-# v4.4.7+
-084b4a5aa4b90975f7ac6b4714a6b449430ef4c4

build/make-initrd.sh

@@ -5,7 +5,7 @@ mkdir -p root/lib
 
 cp ../src/init ./root
 cp busybox ./root
-cp modules -R ./root/lib/
+tar -xf modules.tar -C ./root/lib/
 
 ldd ./root/init | while read line
 do

build/modules/4.4.7-hyper+/modules.alias

@@ -1,107 +0,0 @@
-# Aliases extracted from modules themselves.
-alias devname:net/tun tun
-alias char-major-10-200 tun
-alias rtnl-link-veth veth
-alias net-pf-16-proto-12 nfnetlink
-alias nfnetlink-subsys-7 nfnetlink_acct
-alias nfnetlink-subsys-3 nfnetlink_queue
-alias nf-logger-7-1 nfnetlink_log
-alias nf-logger-10-1 nfnetlink_log
-alias nf-logger-2-1 nfnetlink_log
-alias nfnetlink-subsys-4 nfnetlink_log
-alias nfnetlink-subsys-2 nf_conntrack_netlink
-alias nfnetlink-subsys-1 nf_conntrack_netlink
-alias ip_conntrack_netlink nf_conntrack_netlink
-alias ip6t_tcp xt_tcpudp
-alias ip6t_udp xt_tcpudp
-alias ipt_tcp xt_tcpudp
-alias ipt_udp xt_tcpudp
-alias xt_udp xt_tcpudp
-alias xt_tcp xt_tcpudp
-alias arpt_MARK xt_mark
-alias ip6t_MARK xt_mark
-alias ipt_MARK xt_mark
-alias ip6t_mark xt_mark
-alias ipt_mark xt_mark
-alias ip6t_connmark xt_connmark
-alias ipt_connmark xt_connmark
-alias ip6t_CONNMARK xt_connmark
-alias ipt_CONNMARK xt_connmark
-alias ip6t_SET xt_set
-alias ipt_SET xt_set
-alias ip6t_set xt_set
-alias ipt_set xt_set
-alias xt_SET xt_set
-alias ip6t_DNAT xt_nat
-alias ip6t_SNAT xt_nat
-alias ipt_DNAT xt_nat
-alias ipt_SNAT xt_nat
-alias ip6t_CHECKSUM xt_CHECKSUM
-alias ipt_CHECKSUM xt_CHECKSUM
-alias arpt_CLASSIFY xt_CLASSIFY
-alias ip6t_CLASSIFY xt_CLASSIFY
-alias ipt_CLASSIFY xt_CLASSIFY
-alias ip6t_HMARK xt_HMARK
-alias ipt_HMARK xt_HMARK
-alias ipt_NETMAP xt_NETMAP
-alias ip6t_NETMAP xt_NETMAP
-alias ipt_REDIRECT xt_REDIRECT
-alias ip6t_REDIRECT xt_REDIRECT
-alias ip6t_TCPMSS xt_TCPMSS
-alias ipt_TCPMSS xt_TCPMSS
-alias ip6t_addrtype xt_addrtype
-alias ipt_addrtype xt_addrtype
-alias ip6t_connbytes xt_connbytes
-alias ipt_connbytes xt_connbytes
-alias ip6t_connlimit xt_connlimit
-alias ipt_connlimit xt_connlimit
-alias ip6t_conntrack xt_conntrack
-alias ipt_conntrack xt_conntrack
-alias ip6t_ipvs xt_ipvs
-alias ipt_ipvs xt_ipvs
-alias ip6t_length xt_length
-alias ipt_length xt_length
-alias ip6t_mac xt_mac
-alias ipt_mac xt_mac
-alias ip6t_nfacct xt_nfacct
-alias ipt_nfacct xt_nfacct
-alias ip6t_cgroup xt_cgroup
-alias ipt_cgroup xt_cgroup
-alias ip6t_pkttype xt_pkttype
-alias ipt_pkttype xt_pkttype
-alias ip6t_recent xt_recent
-alias ipt_recent xt_recent
-alias ip6t_socket xt_socket
-alias ipt_socket xt_socket
-alias ip6t_state xt_state
-alias ipt_state xt_state
-alias ip6t_statistic xt_statistic
-alias ipt_statistic xt_statistic
-alias ip6t_string xt_string
-alias ipt_string xt_string
-alias ip6t_tcpmss xt_tcpmss
-alias ipt_tcpmss xt_tcpmss
-alias ip6t_time xt_time
-alias ipt_time xt_time
-alias ip6t_u32 xt_u32
-alias ipt_u32 xt_u32
-alias nfnetlink-subsys-6 ip_set
-alias ip_set_bitmap:ip ip_set_bitmap_ip
-alias ip_set_bitmap:ip,mac ip_set_bitmap_ipmac
-alias ip_set_bitmap:port ip_set_bitmap_port
-alias ip_set_hash:ip ip_set_hash_ip
-alias ip_set_hash:ip,mark ip_set_hash_ipmark
-alias ip_set_hash:ip,port ip_set_hash_ipport
-alias ip_set_hash:ip,port,ip ip_set_hash_ipportip
-alias ip_set_hash:ip,port,net ip_set_hash_ipportnet
-alias ip_set_hash:mac ip_set_hash_mac
-alias ip_set_hash:net ip_set_hash_net
-alias ip_set_hash:net,port ip_set_hash_netport
-alias ip_set_hash:net,iface ip_set_hash_netiface
-alias ip_set_hash:net,net ip_set_hash_netnet
-alias ip_set_hash:net,port,net ip_set_hash_netportnet
-alias ip_set_list:set ip_set_list_set
-alias ip_conntrack nf_conntrack_ipv4
-alias nf_conntrack-2 nf_conntrack_ipv4
-alias nf-nat-2 nf_nat_ipv4
-alias nf-logger-2-0 nf_log_ipv4

build/modules/4.4.7-hyper+/modules.builtin

@@ -1,75 +0,0 @@
-kernel/fs/binfmt_misc.ko
-kernel/fs/binfmt_script.ko
-kernel/fs/mbcache.ko
-kernel/fs/9p/9p.ko
-kernel/fs/exportfs/exportfs.ko
-kernel/fs/ext4/ext4.ko
-kernel/fs/jbd2/jbd2.ko
-kernel/fs/nls/nls_base.ko
-kernel/fs/xfs/xfs.ko
-kernel/crypto/crypto.ko
-kernel/crypto/crypto_wq.ko
-kernel/crypto/crypto_algapi.ko
-kernel/crypto/aead.ko
-kernel/crypto/crypto_blkcipher.ko
-kernel/crypto/chainiv.ko
-kernel/crypto/eseqiv.ko
-kernel/crypto/crypto_hash.ko
-kernel/crypto/pcompress.ko
-kernel/crypto/akcipher.ko
-kernel/crypto/cryptomgr.ko
-kernel/crypto/hmac.ko
-kernel/crypto/crypto_null.ko
-kernel/crypto/sha256_generic.ko
-kernel/crypto/aes_generic.ko
-kernel/crypto/crc32c_generic.ko
-kernel/crypto/crct10dif_common.ko
-kernel/crypto/crct10dif_generic.ko
-kernel/crypto/rng.ko
-kernel/crypto/drbg.ko
-kernel/crypto/jitterentropy_rng.ko
-kernel/block/cfq-iosched.ko
-kernel/drivers/acpi/fan.ko
-kernel/drivers/acpi/processor.ko
-kernel/drivers/acpi/thermal.ko
-kernel/drivers/base/firmware_class.ko
-kernel/drivers/block/brd.ko
-kernel/drivers/block/loop.ko
-kernel/drivers/block/virtio_blk.ko
-kernel/drivers/block/xen-blkfront.ko
-kernel/drivers/char/virtio_console.ko
-kernel/drivers/input/input-core.ko
-kernel/drivers/misc/eeprom/eeprom_93cx6.ko
-kernel/drivers/net/virtio_net.ko
-kernel/drivers/net/xen-netfront.ko
-kernel/drivers/pci/pci-stub.ko
-kernel/drivers/pci/xen-pcifront.ko
-kernel/drivers/rtc/rtc-cmos.ko
-kernel/drivers/scsi/scsi_mod.ko
-kernel/drivers/scsi/virtio_scsi.ko
-kernel/drivers/scsi/sd_mod.ko
-kernel/drivers/scsi/sg.ko
-kernel/drivers/thermal/thermal_sys.ko
-kernel/drivers/tty/serial/serial_core.ko
-kernel/drivers/tty/serial/8250/8250.ko
-kernel/drivers/tty/serial/8250/8250_base.ko
-kernel/drivers/tty/serial/8250/8250_pci.ko
-kernel/drivers/virtio/virtio.ko
-kernel/drivers/virtio/virtio_ring.ko
-kernel/drivers/virtio/virtio_mmio.ko
-kernel/drivers/virtio/virtio_pci.ko
-kernel/drivers/virtio/virtio_balloon.ko
-kernel/drivers/xen/xenbus/xenbus_probe_frontend.ko
-kernel/net/9p/9pnet.ko
-kernel/net/9p/9pnet_virtio.ko
-kernel/net/ipv4/tcp_cubic.ko
-kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/inet6_hashtables.ko
-kernel/net/packet/af_packet.ko
-kernel/net/unix/unix.ko
-kernel/lib/bitrev.ko
-kernel/lib/crc16.ko
-kernel/lib/crc-t10dif.ko
-kernel/lib/crc32.ko
-kernel/lib/libcrc32c.ko
-kernel/lib/zlib_inflate/zlib_inflate.ko