diff --git a/Makefile b/Makefile index b01fd6d4a..49c4d88c4 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ MEDIA_PREFIX?=experimental- endif media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso ifeq ($(STATUS),) - tar cf - $^ alpine/mobylinux.efi | docker build -f Dockerfile.media -t mobylinux/media:$(MEDIA_PREFIX)$(TAG) - + tar cf - $^ alpine/mobylinux.efi alpine/kernel/x86_64/vmlinux | docker build -f Dockerfile.media -t mobylinux/media:$(MEDIA_PREFIX)$(TAG) - docker push mobylinux/media:$(MEDIA_PREFIX)$(TAG) else $(error "git not clean") diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index 017919d51..64994cb72 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -8,6 +8,7 @@ x86_64/vmlinuz64: Dockerfile kernel_config docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-modules.tar | tar xf - && \ docker run --rm --net=none --log-driver=none $$BUILD cat /aufs-utils.tar | tar xf - && \ docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-source-info > etc/kernel-source-info && \ + docker run --rm --net=none --log-driver=none $$BUILD cat /linux/vmlinux > x86_64/vmlinux && \ docker run --rm --net=none --log-driver=none $$BUILD cat /linux/arch/x86_64/boot/bzImage > $@ && \ cp -a patches etc/kernel-patches diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 994d6cb2b..178231c13 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.28 Kernel Configuration +# Linux/x86 4.4.30 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2993,7 +2993,11 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # # Compile-time checks and compiler options # -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_DEBUG_INFO_SPLIT=y +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 diff --git a/alpine/kernel/kernel_config.debug b/alpine/kernel/kernel_config.debug index 9ea1b4103..efb55a455 100644 --- a/alpine/kernel/kernel_config.debug +++ b/alpine/kernel/kernel_config.debug @@ -3,7 +3,6 @@ ## MOBY DEBUG OPTIONS ## CONFIG_LOCKDEP=y -CONFIG_DEBUG_INFO=y CONFIG_FRAME_POINTER=y CONFIG_LOCKUP_DETECTOR=y CONFIG_DETECT_HUNG_TASK=y