diff --git a/Makefile b/Makefile index 0f03849db..449a79c39 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ alpine/initrd.img: alpine/initrd-test.img: $(MAKE) -C alpine initrd-test.img -alpine/kernel/x86_64/vmlinuz64: - $(MAKE) -C alpine/kernel x86_64/vmlinuz64 +kernel/x86_64/vmlinuz64: + $(MAKE) -C kernel alpine/mobylinux-bios.iso: $(MAKE) -C alpine mobylinux-bios.iso @@ -24,8 +24,8 @@ alpine/gce.img.tar.gz: QEMU_IMAGE=mobylinux/qemu:0fb8c648e8ed9ef6b1ec449587aeab6c53872744@sha256:606f30d815102e73bc01c07915dc0d5f153b0252c63f5f0ed1e39621ec656eb5 # interactive versions need to use volume mounts -qemu: alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 - docker run -it --rm -v $(CURDIR)/alpine/initrd.img:/tmp/initrd.img -v $(CURDIR)/alpine/kernel/x86_64/vmlinuz64:/tmp/vmlinuz64 $(QEMU_IMAGE) +qemu: alpine/initrd.img kernel/x86_64/vmlinuz64 + docker run -it --rm -v $(CURDIR)/alpine/initrd.img:/tmp/initrd.img -v $(CURDIR)/kernel/x86_64/vmlinuz64:/tmp/vmlinuz64 $(QEMU_IMAGE) qemu-iso: alpine/mobylinux-bios.iso docker run -it --rm -v $(CURDIR)/alpine/mobylinux-bios.iso:/tmp/mobylinux-bios.iso $(QEMU_IMAGE) @@ -60,19 +60,19 @@ bin/regextract: | bin curl -fsSL https://circleci.com/api/v1/project/justincormack/regextract/latest/artifacts/0/\$$CIRCLE_ARTIFACTS/darwin/amd64/regextract > $@ chmod a+x $@ -hyperkit: hyperkit.sh bin/com.docker.hyperkit bin/com.docker.slirp alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 +hyperkit: hyperkit.sh bin/com.docker.hyperkit bin/com.docker.slirp alpine/initrd.img kernel/x86_64/vmlinuz64 ./hyperkit.sh define check_test_log @cat $1 |grep -q 'Moby test suite PASSED' endef -hyperkit-test: hyperkit.sh bin/com.docker.hyperkit bin/com.docker.slirp alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64 +hyperkit-test: hyperkit.sh bin/com.docker.hyperkit bin/com.docker.slirp alpine/initrd-test.img kernel/x86_64/vmlinuz64 rm -f disk.img INITRD=alpine/initrd-test.img script -q /dev/null ./hyperkit.sh | tee test.log $(call check_test_log, test.log) -test: alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64 +test: alpine/initrd-test.img kernel/x86_64/vmlinuz64 tar cf - $^ | docker run --rm -i $(QEMU_IMAGE) 2>&1 | tee test.log $(call check_test_log, test.log) @@ -88,22 +88,22 @@ endif MEDIA_IMAGE=mobylinux/media:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) INITRD_IMAGE=mobylinux/mobylinux:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) KERNEL_IMAGE=mobylinux/kernel:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) -media: Dockerfile.media alpine/initrd.img alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso +media: Dockerfile.media alpine/initrd.img alpine/initrd-test.img kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso ifeq ($(STATUS),) - tar cf - $^ alpine/mobylinux.efi alpine/kernel/x86_64/vmlinux alpine/kernel/x86_64/kernel-headers.tar alpine/kernel/x86_64/kernel-dev.tar | docker build -f Dockerfile.media -t $(MEDIA_IMAGE) - + tar cf - $^ alpine/mobylinux.efi kernel/x86_64/vmlinux kernel/x86_64/kernel-headers.tar kernel/x86_64/kernel-dev.tar | docker build -f Dockerfile.media -t $(MEDIA_IMAGE) - docker push $(MEDIA_IMAGE) [ -f $(MOBYLINUX_TAG) ] docker tag $(shell cat $(MOBYLINUX_TAG)) $(INITRD_IMAGE) docker push $(INITRD_IMAGE) - tar cf - Dockerfile.kernel alpine/kernel/x86_64/vmlinuz64 | docker build -f Dockerfile.kernel -t $(KERNEL_IMAGE) - + tar cf - Dockerfile.kernel kernel/x86_64/vmlinuz64 | docker build -f Dockerfile.kernel -t $(KERNEL_IMAGE) - docker push $(KERNEL_IMAGE) else $(error "git not clean") endif -EBPF_TAG=alpine/base/ebpf/ebpf.tag +EBPF_TAG=ebpf/ebpf.tag EBPF_IMAGE=mobylinux/ebpf:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) -ebpf: alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 +ebpf: alpine/initrd.img kernel/x86_64/vmlinuz64 ifeq ($(STATUS),) [ -f $(EBPF_TAG) ] docker tag $(shell cat $(EBPF_TAG)) $(EBPF_IMAGE) @@ -112,14 +112,14 @@ else $(error "git not clean") endif -MEDIA_FILES=alpine/kernel/x86_64/vmlinuz64 alpine/kernel/x86_64/vmlinux alpine/initrd.img alpine/mobylinux-efi.iso alpine/mobylinux.efi -MEDIA_FILES_OPT=alpine/kernel/x86_64/kernel-headers.tar alpine/kernel/x86_64/kernel-dev.tar alpine/initrd-test.img +MEDIA_FILES=kernel/x86_64/vmlinuz64 kernel/x86_64/vmlinux alpine/initrd.img alpine/mobylinux-efi.iso alpine/mobylinux.efi +MEDIA_FILES_OPT=kernel/x86_64/kernel-headers.tar kernel/x86_64/kernel-dev.tar alpine/initrd-test.img get: ifeq ($(STATUS),) IMAGE=$$( docker create mobylinux/media:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) /dev/null ) && \ - mkdir -p alpine/kernel/x86_64 && \ - for FILE in $(MEDIA_FILES); do docker cp $$IMAGE:$$(basename $$FILE) $$FILE || exit; done; \ + mkdir -p kernel/x86_64 && \ + for FILE in $(MEDIA_FILES); do docker cp $$IMAGE:$$(basename $$FILE) $$FILE || exit; done; \ for FILE in $(MEDIA_FILES_OPT); do docker cp $$IMAGE:$$(basename $$FILE) $$FILE; done; \ docker rm $$IMAGE else @@ -132,6 +132,7 @@ ifeq ($(STATUS),) TMP_EXTRACT=$$(mktemp -d) && \ for FILE in $(MEDIA_FILES) $(MEDIA_FILES_OPT); do mkdir -p $$(dirname $$FILE); done; \ bin/regextract mobylinux/media:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) | tar xf - -C $$TMP_EXTRACT && \ + mkdir -p kernel/x86_64 && \ for FILE in $(MEDIA_FILES); do cp $$TMP_EXTRACT/$$(basename $$FILE) $$FILE || exit; done; \ for FILE in $(MEDIA_FILES_OPT); do cp $$TMP_EXTRACT/$$(basename $$FILE) $$FILE; done; \ rm -Rf $$TMP_EXTRACT @@ -156,4 +157,5 @@ clean: $(MAKE) -C alpine clean $(MAKE) -C containers clean $(MAKE) -C test clean + $(MAKE) -C kernel clean rm -rf bin disk.img test.log diff --git a/alpine/Makefile b/alpine/Makefile index 716f7b9dc..1ceb76b4b 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -61,26 +61,26 @@ moby.img: Dockerfile etc usr init ../test/test.img: $(MAKE) -C ../test -kernel/x86_64/kernel.img: - $(MAKE) -C kernel +../kernel/x86_64/kernel.img: + $(MAKE) -C ../kernel -initrd.img: moby.img kernel/x86_64/kernel.img ../containers/container.img +initrd.img: moby.img ../kernel/x86_64/kernel.img ../containers/container.img cat $^ > $@ initrd-test.img: initrd.img ../test/test.img cat $^ > $@ # outputs tarball of mobylinux-efi.iso mobylinux.efi -mobylinux-efi.iso: initrd.img kernel/x86_64/vmlinuz64 - tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(EFI_IMAGE) | tar xf - +mobylinux-efi.iso: initrd.img ../kernel/x86_64/vmlinuz64 + tar cf - initrd.img -C ../kernel/x86_64 vmlinuz64 | docker run --rm --net=none --log-driver=none -i $(EFI_IMAGE) | tar xf - -mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64 - tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(BIOS_IMAGE) >$@ +mobylinux-bios.iso: initrd.img ../kernel/x86_64/vmlinuz64 + tar cf - initrd.img -C ../kernel/x86_64 vmlinuz64 | docker run --rm --net=none --log-driver=none -i $(BIOS_IMAGE) >$@ gce: gce.img.tar.gz -gce.img.tar.gz: initrd.img kernel/x86_64/vmlinuz64 - tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(GCE_IMAGE) >$@ +gce.img.tar.gz: initrd.img ../kernel/x86_64/vmlinuz64 + tar cf - initrd.img -C ../kernel/x86_64 vmlinuz64 | docker run --rm --net=none --log-driver=none -i $(GCE_IMAGE) >$@ gce-upload: ifeq ($(FORCE_GSUTIL_AUTH),1) @@ -93,11 +93,9 @@ endif google/cloud-sdk \ gsutil cp -a public-read /gce.img.tar.gz gs://docker-for-gcp-images/latest/gce.img.tar.gz -common: initrd.img kernel/x86_64/vmlinuz64 - -ami: common +ami: initrd.img ../kernel/x86_64/vmlinuz64 tar cf - \ - cloud initrd.img kernel/x86_64/vmlinuz64 \ + cloud initrd.img -C .. kernel/x86_64/vmlinuz64 \ | \ docker build -t moby-ami:build -f cloud/Dockerfile.ami - # The EBS device seems not to show up without mounting in /dev, even @@ -155,9 +153,9 @@ uploadvhd: azure moby-azure:build \ uploadvhd >./cloud/azure/vhd_blob_url.out -azure: common vhdartifact +azure: initrd.img ../kernel/x86_64/vmlinuz64 vhdartifact tar cf - \ - cloud initrd.img kernel/x86_64/vmlinuz64 \ + cloud initrd.img -C .. kernel/x86_64/vmlinuz64 \ | \ docker build -t moby-azure:build -f cloud/Dockerfile.azure - tar cf - \ @@ -200,6 +198,5 @@ clean: docker images -q moby-azure:raw2vhd | xargs docker rmi -f || true docker volume rm vhdartifact || true $(MAKE) -C packages clean - $(MAKE) -C kernel clean .DELETE_ON_ERROR: diff --git a/hyperkit.sh b/hyperkit.sh index fdabaafee..fe5fba5e5 100755 --- a/hyperkit.sh +++ b/hyperkit.sh @@ -2,7 +2,7 @@ set -e -KERNEL="alpine/kernel/x86_64/vmlinuz64" +KERNEL="kernel/x86_64/vmlinuz64" : ${INITRD:="alpine/initrd.img"} CMDLINE="earlyprintk=serial console=ttyS0" diff --git a/alpine/kernel/.gitignore b/kernel/.gitignore similarity index 100% rename from alpine/kernel/.gitignore rename to kernel/.gitignore diff --git a/alpine/kernel/Dockerfile b/kernel/Dockerfile similarity index 100% rename from alpine/kernel/Dockerfile rename to kernel/Dockerfile diff --git a/alpine/kernel/Dockerfile.4.4 b/kernel/Dockerfile.4.4 similarity index 100% rename from alpine/kernel/Dockerfile.4.4 rename to kernel/Dockerfile.4.4 diff --git a/alpine/kernel/Dockerfile.aufs b/kernel/Dockerfile.aufs similarity index 100% rename from alpine/kernel/Dockerfile.aufs rename to kernel/Dockerfile.aufs diff --git a/alpine/kernel/Makefile b/kernel/Makefile similarity index 100% rename from alpine/kernel/Makefile rename to kernel/Makefile diff --git a/alpine/kernel/README.md b/kernel/README.md similarity index 100% rename from alpine/kernel/README.md rename to kernel/README.md diff --git a/alpine/kernel/kernel_config b/kernel/kernel_config similarity index 100% rename from alpine/kernel/kernel_config rename to kernel/kernel_config diff --git a/alpine/kernel/kernel_config.4.4 b/kernel/kernel_config.4.4 similarity index 100% rename from alpine/kernel/kernel_config.4.4 rename to kernel/kernel_config.4.4 diff --git a/alpine/kernel/kernel_config.aufs b/kernel/kernel_config.aufs similarity index 100% rename from alpine/kernel/kernel_config.aufs rename to kernel/kernel_config.aufs diff --git a/alpine/kernel/kernel_config.debug b/kernel/kernel_config.debug similarity index 100% rename from alpine/kernel/kernel_config.debug rename to kernel/kernel_config.debug diff --git a/alpine/kernel/patches-4.4/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch b/kernel/patches-4.4/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch similarity index 100% rename from alpine/kernel/patches-4.4/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch rename to kernel/patches-4.4/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch diff --git a/alpine/kernel/patches-4.4/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch b/kernel/patches-4.4/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch similarity index 100% rename from alpine/kernel/patches-4.4/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch rename to kernel/patches-4.4/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch diff --git a/alpine/kernel/patches-4.4/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch b/kernel/patches-4.4/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch similarity index 100% rename from alpine/kernel/patches-4.4/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch rename to kernel/patches-4.4/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch diff --git a/alpine/kernel/patches-4.4/0004-vsock-make-listener-child-lock-ordering-explicit.patch b/kernel/patches-4.4/0004-vsock-make-listener-child-lock-ordering-explicit.patch similarity index 100% rename from alpine/kernel/patches-4.4/0004-vsock-make-listener-child-lock-ordering-explicit.patch rename to kernel/patches-4.4/0004-vsock-make-listener-child-lock-ordering-explicit.patch diff --git a/alpine/kernel/patches-4.4/0005-VSOCK-transport-specific-vsock_transport-functions.patch b/kernel/patches-4.4/0005-VSOCK-transport-specific-vsock_transport-functions.patch similarity index 100% rename from alpine/kernel/patches-4.4/0005-VSOCK-transport-specific-vsock_transport-functions.patch rename to kernel/patches-4.4/0005-VSOCK-transport-specific-vsock_transport-functions.patch diff --git a/alpine/kernel/patches-4.4/0006-VSOCK-defer-sock-removal-to-transports.patch b/kernel/patches-4.4/0006-VSOCK-defer-sock-removal-to-transports.patch similarity index 100% rename from alpine/kernel/patches-4.4/0006-VSOCK-defer-sock-removal-to-transports.patch rename to kernel/patches-4.4/0006-VSOCK-defer-sock-removal-to-transports.patch diff --git a/alpine/kernel/patches-4.4/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch b/kernel/patches-4.4/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch similarity index 100% rename from alpine/kernel/patches-4.4/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch rename to kernel/patches-4.4/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch diff --git a/alpine/kernel/patches-4.4/0008-VSOCK-Introduce-virtio_transport.ko.patch b/kernel/patches-4.4/0008-VSOCK-Introduce-virtio_transport.ko.patch similarity index 100% rename from alpine/kernel/patches-4.4/0008-VSOCK-Introduce-virtio_transport.ko.patch rename to kernel/patches-4.4/0008-VSOCK-Introduce-virtio_transport.ko.patch diff --git a/alpine/kernel/patches-4.4/0009-VSOCK-Introduce-vhost_vsock.ko.patch b/kernel/patches-4.4/0009-VSOCK-Introduce-vhost_vsock.ko.patch similarity index 100% rename from alpine/kernel/patches-4.4/0009-VSOCK-Introduce-vhost_vsock.ko.patch rename to kernel/patches-4.4/0009-VSOCK-Introduce-vhost_vsock.ko.patch diff --git a/alpine/kernel/patches-4.4/0010-VSOCK-Add-Makefile-and-Kconfig.patch b/kernel/patches-4.4/0010-VSOCK-Add-Makefile-and-Kconfig.patch similarity index 100% rename from alpine/kernel/patches-4.4/0010-VSOCK-Add-Makefile-and-Kconfig.patch rename to kernel/patches-4.4/0010-VSOCK-Add-Makefile-and-Kconfig.patch diff --git a/alpine/kernel/patches-4.4/0011-VSOCK-Use-kvfree.patch b/kernel/patches-4.4/0011-VSOCK-Use-kvfree.patch similarity index 100% rename from alpine/kernel/patches-4.4/0011-VSOCK-Use-kvfree.patch rename to kernel/patches-4.4/0011-VSOCK-Use-kvfree.patch diff --git a/alpine/kernel/patches-4.4/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch b/kernel/patches-4.4/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch similarity index 100% rename from alpine/kernel/patches-4.4/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch rename to kernel/patches-4.4/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch diff --git a/alpine/kernel/patches-4.4/0013-virtio-vsock-fix-include-guard-typo.patch b/kernel/patches-4.4/0013-virtio-vsock-fix-include-guard-typo.patch similarity index 100% rename from alpine/kernel/patches-4.4/0013-virtio-vsock-fix-include-guard-typo.patch rename to kernel/patches-4.4/0013-virtio-vsock-fix-include-guard-typo.patch diff --git a/alpine/kernel/patches-4.4/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch b/kernel/patches-4.4/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch similarity index 100% rename from alpine/kernel/patches-4.4/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch rename to kernel/patches-4.4/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch diff --git a/alpine/kernel/patches-4.4/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch b/kernel/patches-4.4/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch similarity index 100% rename from alpine/kernel/patches-4.4/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch rename to kernel/patches-4.4/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch diff --git a/alpine/kernel/patches-4.4/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch b/kernel/patches-4.4/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch similarity index 100% rename from alpine/kernel/patches-4.4/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch rename to kernel/patches-4.4/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch diff --git a/alpine/kernel/patches-4.4/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch b/kernel/patches-4.4/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch similarity index 100% rename from alpine/kernel/patches-4.4/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch rename to kernel/patches-4.4/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch diff --git a/alpine/kernel/patches-4.4/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch b/kernel/patches-4.4/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch similarity index 100% rename from alpine/kernel/patches-4.4/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch rename to kernel/patches-4.4/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch diff --git a/alpine/kernel/patches-4.4/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch b/kernel/patches-4.4/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch similarity index 100% rename from alpine/kernel/patches-4.4/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch rename to kernel/patches-4.4/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch diff --git a/alpine/kernel/patches-4.4/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch b/kernel/patches-4.4/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch similarity index 100% rename from alpine/kernel/patches-4.4/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch rename to kernel/patches-4.4/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch diff --git a/alpine/kernel/patches-4.4/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch b/kernel/patches-4.4/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch similarity index 100% rename from alpine/kernel/patches-4.4/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch rename to kernel/patches-4.4/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch diff --git a/alpine/kernel/patches-4.4/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch b/kernel/patches-4.4/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch similarity index 100% rename from alpine/kernel/patches-4.4/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch rename to kernel/patches-4.4/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch diff --git a/alpine/kernel/patches-4.4/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch b/kernel/patches-4.4/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch similarity index 100% rename from alpine/kernel/patches-4.4/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch rename to kernel/patches-4.4/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch diff --git a/alpine/kernel/patches-4.4/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch b/kernel/patches-4.4/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch similarity index 100% rename from alpine/kernel/patches-4.4/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch rename to kernel/patches-4.4/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch diff --git a/alpine/kernel/patches-4.4/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch b/kernel/patches-4.4/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch similarity index 100% rename from alpine/kernel/patches-4.4/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch rename to kernel/patches-4.4/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch diff --git a/alpine/kernel/patches-4.4/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch b/kernel/patches-4.4/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch similarity index 100% rename from alpine/kernel/patches-4.4/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch rename to kernel/patches-4.4/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch diff --git a/alpine/kernel/patches-4.4/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch b/kernel/patches-4.4/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch similarity index 100% rename from alpine/kernel/patches-4.4/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch rename to kernel/patches-4.4/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch diff --git a/alpine/kernel/patches-4.4/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch b/kernel/patches-4.4/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch similarity index 100% rename from alpine/kernel/patches-4.4/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch rename to kernel/patches-4.4/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch diff --git a/alpine/kernel/patches-4.4/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch b/kernel/patches-4.4/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch similarity index 100% rename from alpine/kernel/patches-4.4/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch rename to kernel/patches-4.4/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch diff --git a/alpine/kernel/patches-4.4/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch b/kernel/patches-4.4/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch similarity index 100% rename from alpine/kernel/patches-4.4/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch rename to kernel/patches-4.4/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch diff --git a/alpine/kernel/patches-4.4/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch b/kernel/patches-4.4/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch similarity index 100% rename from alpine/kernel/patches-4.4/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch rename to kernel/patches-4.4/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch diff --git a/alpine/kernel/patches-4.4/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch b/kernel/patches-4.4/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch similarity index 100% rename from alpine/kernel/patches-4.4/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch rename to kernel/patches-4.4/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch diff --git a/alpine/kernel/patches-4.4/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch b/kernel/patches-4.4/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch similarity index 100% rename from alpine/kernel/patches-4.4/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch rename to kernel/patches-4.4/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch diff --git a/alpine/kernel/patches-4.4/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch b/kernel/patches-4.4/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch similarity index 100% rename from alpine/kernel/patches-4.4/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch rename to kernel/patches-4.4/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch diff --git a/alpine/kernel/patches-4.4/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch b/kernel/patches-4.4/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch similarity index 100% rename from alpine/kernel/patches-4.4/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch rename to kernel/patches-4.4/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch diff --git a/alpine/kernel/patches-4.4/0036-kcm-Kernel-Connection-Multiplexor-module.patch b/kernel/patches-4.4/0036-kcm-Kernel-Connection-Multiplexor-module.patch similarity index 100% rename from alpine/kernel/patches-4.4/0036-kcm-Kernel-Connection-Multiplexor-module.patch rename to kernel/patches-4.4/0036-kcm-Kernel-Connection-Multiplexor-module.patch diff --git a/alpine/kernel/patches-4.4/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch b/kernel/patches-4.4/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch similarity index 100% rename from alpine/kernel/patches-4.4/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch rename to kernel/patches-4.4/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch diff --git a/alpine/kernel/patches-4.4/0038-net-Add-Qualcomm-IPC-router.patch b/kernel/patches-4.4/0038-net-Add-Qualcomm-IPC-router.patch similarity index 100% rename from alpine/kernel/patches-4.4/0038-net-Add-Qualcomm-IPC-router.patch rename to kernel/patches-4.4/0038-net-Add-Qualcomm-IPC-router.patch diff --git a/alpine/kernel/patches-4.4/0039-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.4/0039-hv_sock-introduce-Hyper-V-Sockets.patch similarity index 100% rename from alpine/kernel/patches-4.4/0039-hv_sock-introduce-Hyper-V-Sockets.patch rename to kernel/patches-4.4/0039-hv_sock-introduce-Hyper-V-Sockets.patch diff --git a/alpine/kernel/patches-4.4/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch b/kernel/patches-4.4/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch similarity index 100% rename from alpine/kernel/patches-4.4/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch rename to kernel/patches-4.4/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch diff --git a/alpine/kernel/patches-4.4/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch b/kernel/patches-4.4/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch similarity index 100% rename from alpine/kernel/patches-4.4/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch rename to kernel/patches-4.4/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch diff --git a/alpine/kernel/patches-4.4/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.4/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch similarity index 100% rename from alpine/kernel/patches-4.4/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch rename to kernel/patches-4.4/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch diff --git a/alpine/kernel/patches-4.4/0043-fs-add-filp_clone_open-API.patch b/kernel/patches-4.4/0043-fs-add-filp_clone_open-API.patch similarity index 100% rename from alpine/kernel/patches-4.4/0043-fs-add-filp_clone_open-API.patch rename to kernel/patches-4.4/0043-fs-add-filp_clone_open-API.patch diff --git a/alpine/kernel/patches-4.4/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch b/kernel/patches-4.4/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch similarity index 100% rename from alpine/kernel/patches-4.4/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch rename to kernel/patches-4.4/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch diff --git a/alpine/kernel/patches-4.9/0001-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch b/kernel/patches-4.9/0001-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch similarity index 100% rename from alpine/kernel/patches-4.9/0001-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch rename to kernel/patches-4.9/0001-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch diff --git a/alpine/kernel/patches-4.9/0002-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9/0002-hv_sock-introduce-Hyper-V-Sockets.patch similarity index 100% rename from alpine/kernel/patches-4.9/0002-hv_sock-introduce-Hyper-V-Sockets.patch rename to kernel/patches-4.9/0002-hv_sock-introduce-Hyper-V-Sockets.patch diff --git a/alpine/kernel/patches-4.9/0003-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9/0003-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch similarity index 100% rename from alpine/kernel/patches-4.9/0003-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch rename to kernel/patches-4.9/0003-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch diff --git a/alpine/kernel/patches-4.9/0004-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9/0004-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch similarity index 100% rename from alpine/kernel/patches-4.9/0004-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch rename to kernel/patches-4.9/0004-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch diff --git a/alpine/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch b/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch similarity index 100% rename from alpine/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch rename to kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch diff --git a/alpine/kernel/patches-4.9/0006-Drivers-hv-vmbus-Base-host-signaling-strictly-on-the.patch b/kernel/patches-4.9/0006-Drivers-hv-vmbus-Base-host-signaling-strictly-on-the.patch similarity index 100% rename from alpine/kernel/patches-4.9/0006-Drivers-hv-vmbus-Base-host-signaling-strictly-on-the.patch rename to kernel/patches-4.9/0006-Drivers-hv-vmbus-Base-host-signaling-strictly-on-the.patch diff --git a/alpine/kernel/patches-4.9/0007-Drivers-hv-vmbus-On-write-cleanup-the-logic-to-inter.patch b/kernel/patches-4.9/0007-Drivers-hv-vmbus-On-write-cleanup-the-logic-to-inter.patch similarity index 100% rename from alpine/kernel/patches-4.9/0007-Drivers-hv-vmbus-On-write-cleanup-the-logic-to-inter.patch rename to kernel/patches-4.9/0007-Drivers-hv-vmbus-On-write-cleanup-the-logic-to-inter.patch diff --git a/alpine/kernel/patches-4.9/0008-Drivers-hv-vmbus-On-the-read-path-cleanup-the-logic-.patch b/kernel/patches-4.9/0008-Drivers-hv-vmbus-On-the-read-path-cleanup-the-logic-.patch similarity index 100% rename from alpine/kernel/patches-4.9/0008-Drivers-hv-vmbus-On-the-read-path-cleanup-the-logic-.patch rename to kernel/patches-4.9/0008-Drivers-hv-vmbus-On-the-read-path-cleanup-the-logic-.patch diff --git a/alpine/kernel/patches-4.9/0009-Drivers-hv-vmbus-finally-fix-hv_need_to_signal_on_re.patch b/kernel/patches-4.9/0009-Drivers-hv-vmbus-finally-fix-hv_need_to_signal_on_re.patch similarity index 100% rename from alpine/kernel/patches-4.9/0009-Drivers-hv-vmbus-finally-fix-hv_need_to_signal_on_re.patch rename to kernel/patches-4.9/0009-Drivers-hv-vmbus-finally-fix-hv_need_to_signal_on_re.patch diff --git a/alpine/kernel/patches-4.9/0010-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9/0010-Drivers-hv-vss-Improve-log-messages.patch similarity index 100% rename from alpine/kernel/patches-4.9/0010-Drivers-hv-vss-Improve-log-messages.patch rename to kernel/patches-4.9/0010-Drivers-hv-vss-Improve-log-messages.patch diff --git a/alpine/kernel/patches-4.9/0011-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9/0011-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch similarity index 100% rename from alpine/kernel/patches-4.9/0011-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch rename to kernel/patches-4.9/0011-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch diff --git a/alpine/kernel/patches-4.9/0012-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9/0012-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch similarity index 100% rename from alpine/kernel/patches-4.9/0012-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch rename to kernel/patches-4.9/0012-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch