diff options
| author | Gennady Feldman <gena01@gmail.com> | 2019-01-31 13:02:25 -0500 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-02-08 19:51:45 +0000 |
| commit | bccb4334186cbdc9edecc7ab896e85671da35487 (patch) | |
| tree | 4f9fd03535ca4541f2ab4b06d6dab9190e1e8f4c | |
| parent | e0ddf9af18c79e78d12f7228a055a0dc403c2580 (diff) | |
| download | aports-bccb4334186cbdc9edecc7ab896e85671da35487.tar.bz2 aports-bccb4334186cbdc9edecc7ab896e85671da35487.tar.xz | |
main/linux-vanilla: Don't build VBOXGUEST module.
* This fixes a conflict with the virtualbox guest additions package.
See virtualbox-guest-modules package
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 10 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86 | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86_64 | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-virt.x86 | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-virt.x86_64 | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 4c3ae2ef41..30b3c298dd 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux vanilla kernel" url="http://kernel.org" depends="mkinitfs" @@ -222,12 +222,12 @@ sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb6 af3d633e28e5699b6314c2c57c2c671d2103e1181e5465e32f474dc9a07453090ef44f5028cb3bcca7e528db548a77a8b2fc790a08fdbada0322de62f93de9e6 config-vanilla.aarch64 3c60cb2eee228de79b67d65682d67d25147cfcc321c0dcc27dbefa1eb4ab6ec692fe08df8f14aa868e09a9ad3581b3770a3dd4b9255c585f35f5725e29d2eeb1 config-vanilla.armhf 3c60cb2eee228de79b67d65682d67d25147cfcc321c0dcc27dbefa1eb4ab6ec692fe08df8f14aa868e09a9ad3581b3770a3dd4b9255c585f35f5725e29d2eeb1 config-vanilla.armv7 -cbc431ed447eefc83fa39fbb7396ed7e04739b5210600a20e6a5bd1b8fc42a985d9c4df0deee8e8a3f6a928b5cad870b637d3390ef49090f653c24ccab8f7a1f config-vanilla.x86 -d4c60ff52b83a490293a4cc0b5ddf53c3f15c4b0f28f67c7c0279eb2e6d5de3fa17041c3eaa8e43a4f926b2dda4074c2acf3073d1ae1f923f797692bdf67e968 config-vanilla.x86_64 +e8c1418e217ff1057bd7a1d58869c4cdb820c57574047930f699da259fea01611790147adfc5a432be4355b1d8bc00ee940fe1f3ac56314ac15f6b3385c59413 config-vanilla.x86 +dff70e80f12cf060ea91acb6c5955b0c81acdd3d3acece5e567ffd2242db215cf14a34226bc1c6c5a5e5e8f2f0d3b9bbccff086d52ff1c7239b7529bd4c81d6a config-vanilla.x86_64 96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db config-vanilla.ppc c7e146b33460b4ff69adffb680e794536038c8a6bf5af90a6474fc7dfafeea80a6659f4f4bfe2fd6285a17c39db49f1420636ea1512131edec8ac1d7ab31e7ef config-vanilla.ppc64le c6dc137c3b0518284da53a8876c18a58bd299be4980b3c183949c7e57bef97570d73f3c568888fa392a769226dacc5558082b44b388f79d9a7daa677bbc5f9f4 config-vanilla.s390x 2f4b32df9f0168dd3388443ca8aa8e77a2e061ce68d4227d651fe6a6dec06e7b55d94fec135f6f5b64d573b2c7327d454e98199290b6c720fa5eb47b4bfe143b config-virt.aarch64 -0fbe2986a564664c4081267c10c51f14e7cbf416c2812e898a4b31260a64eebcc11da75e155af099b9e409aba275e7a67dac6ef1147e9fd856f65778a3a62a49 config-virt.x86 -0a3d194ccd06df7dda28775608b23e79a6641be9d545b623bffdeccc66e1f4de224dc419b84fa640b21b1badbffcd1eb33fc52f35a261b9a049699ac3569bbde config-virt.x86_64 +1376439b1aa59f00b38ac0f70b63af902d69891e569e835e9c72fbb7099ff6c62762d5c17cb6518fb9378f2f553a365b3931617b326705b3387d7fbc7971d407 config-virt.x86 +d52d0281801b3515edfa4e6a22ce9faa5a33ef123aaca600988dd42c6498d2ae3581200ef0e2fdf7ebf1312ecc3a07368066b4294dad00df79fc418752675c74 config-virt.x86_64 0d2e07b175129aa1a32021ecf2a3c875da449f9db3ec0642dee899052fa8b599176227ff5920e54dd0c45225d03675aa670a827ab67a7164bbd80539044611af patch-4.19.20.xz" diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86 index b070918fb8..5d0a0c1bf3 100644 --- a/main/linux-vanilla/config-vanilla.x86 +++ b/main/linux-vanilla/config-vanilla.x86 @@ -6241,7 +6241,7 @@ CONFIG_VFIO_PCI_IGD=y # CONFIG_VFIO_MDEV is not set CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m +# CONFIG_VBOXGUEST is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=m diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64 index 449adc3882..f5d46ae130 100644 --- a/main/linux-vanilla/config-vanilla.x86_64 +++ b/main/linux-vanilla/config-vanilla.x86_64 @@ -6260,7 +6260,7 @@ CONFIG_VFIO_PCI_IGD=y # CONFIG_VFIO_MDEV is not set CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m +# CONFIG_VBOXGUEST is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=m diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86 index efdbd69b1a..d4a9752bfb 100644 --- a/main/linux-vanilla/config-virt.x86 +++ b/main/linux-vanilla/config-virt.x86 @@ -3276,7 +3276,7 @@ CONFIG_SYNC_FILE=y # CONFIG_VFIO is not set CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m +# CONFIG_VBOXGUEST is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=m diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64 index 1bf86e5777..174f690ca0 100644 --- a/main/linux-vanilla/config-virt.x86_64 +++ b/main/linux-vanilla/config-virt.x86_64 @@ -3341,7 +3341,7 @@ CONFIG_DCA=m # CONFIG_VFIO is not set CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m +# CONFIG_VBOXGUEST is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=m |