aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2018-04-29 21:17:03 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2018-04-29 21:19:41 +0000
commit9c4a5bba62b4aa2dc257f20fdaf8b230192f44df (patch)
tree2e08defcf573fa46b459258a619bce86037c3a5d
parentd4d465d76bf2747660455702e61fd208ee99d656 (diff)
downloadaports-9c4a5bba62b4aa2dc257f20fdaf8b230192f44df.tar.gz
aports-9c4a5bba62b4aa2dc257f20fdaf8b230192f44df.tar.bz2
aports-9c4a5bba62b4aa2dc257f20fdaf8b230192f44df.tar.xz
main/mkinitfs: virtio_net depends on virtio_pci
-rw-r--r--main/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch23
-rw-r--r--main/mkinitfs/APKBUILD6
2 files changed, 27 insertions, 2 deletions
diff --git a/main/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch b/main/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
new file mode 100644
index 0000000000..8b01d294a0
--- /dev/null
+++ b/main/mkinitfs/0001-features-virtio_net-depends-on-virtio_pci.patch
@@ -0,0 +1,23 @@
+From 56d4208345b8da08ada6e6176a0a46cf94f89516 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@alpinelinux.org>
+Date: Sun, 29 Apr 2018 21:14:36 +0000
+Subject: [PATCH] features: virtio_net depends on virtio_pci
+
+---
+ features.d/network.modules | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/features.d/network.modules b/features.d/network.modules
+index caa37a8..e4f084c 100644
+--- a/features.d/network.modules
++++ b/features.d/network.modules
+@@ -2,4 +2,5 @@ kernel/drivers/net/ethernet
+ kernel/net/packet/af_packet.ko
+ kernel/drivers/net/hyperv
+ kernel/drivers/net/vmxnet3
+-kernel/drivers/net/virtio_net*
++kernel/drivers/virtio/virtio_pci.ko
++kernel/drivers/net/virtio_net.ko
+--
+2.17.0
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index baf5b04f93..b64465fc10 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mkinitfs
pkgver=3.2.0
_ver=${pkgver%_git*}
-pkgrel=3
+pkgrel=4
pkgdesc="Tool to generate initramfs images for Alpine"
url="https://git.alpinelinux.org/cgit/mkinitfs"
arch="all"
@@ -17,6 +17,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
0001-skip-hooks-on-diskless-install.patch
0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
0001-features-add-virtio_net-to-network-modules.patch
+ 0001-features-virtio_net-depends-on-virtio_pci.patch
"
builddir="$srcdir/$pkgname-$_ver"
@@ -33,4 +34,5 @@ package() {
sha512sums="906bfbce677d4ece9c9fea7b2a529121740bc9d96ea011be083303cc5c56162f09271b0a673e9e335234ccf2f293109bda1eda333698a95357d0772c86f498af mkinitfs-3.2.0.tar.xz
f5c9b21e53c663dac1b8f33f929dbe067492f0dc1bd5ef5310ef531033f31fc3fa0b6de6dce03cecaf90b8ed47b278d0f1f7c64dbbeede7621c895ee3ea79864 0001-skip-hooks-on-diskless-install.patch
4387357cfcd3441c5d8777e42c0e62a73fa446aacd2faac081947afc39bdd8fb91e12b34f3b69a6827bd7d0705f54514b77c0ff4c38ee0d70553050117c42576 0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch
-530a33638e7ba1faceed9a5cb0a2e08bec5d29d160a99730b7a2fb6c98f93a511908df8ab14cc47884397c9affee899a23896aab1c6c9073015ce077cc16552f 0001-features-add-virtio_net-to-network-modules.patch"
+530a33638e7ba1faceed9a5cb0a2e08bec5d29d160a99730b7a2fb6c98f93a511908df8ab14cc47884397c9affee899a23896aab1c6c9073015ce077cc16552f 0001-features-add-virtio_net-to-network-modules.patch
+e5a6a25ea51b0ef16f525af20f8e44e64f5c4bb56f46b220151fc03cfa2c530ec55e2755a5dca766f9dad467815b5949bd22e029bcda89fbcef0d40bb3fd1a0f 0001-features-virtio_net-depends-on-virtio_pci.patch"