diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-06-26 18:05:23 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-27 11:18:18 +0000 |
| commit | 2f61ee54255dd86e8e227cf6126f33c2dd35ba42 (patch) | |
| tree | 100cb008482803ff813027ece2c8905ee87ba1ba | |
| parent | df5391682cccc4241cb447723725bda11aeccc13 (diff) | |
| download | aports-2f61ee54255dd86e8e227cf6126f33c2dd35ba42.tar.bz2 aports-2f61ee54255dd86e8e227cf6126f33c2dd35ba42.tar.xz | |
main/qemu: install /etc/qemu/bridge.conf
| -rw-r--r-- | main/qemu/APKBUILD | 15 | ||||
| -rw-r--r-- | main/qemu/bridge.conf | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 66e379f190..3c25805ab6 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu pkgver=2.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://qemu.org/" arch="all" @@ -125,6 +125,7 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2 $pkgname-guest-agent.confd $pkgname-guest-agent.initd 80-kvm.rules + bridge.conf " builddir="$srcdir"/$pkgname-$pkgver @@ -213,6 +214,9 @@ package() { make DESTDIR="$pkgdir" install || return 1 paxmark -m "$pkgdir"/usr/bin/qemu-system-* || return 1 + install -Dm640 -g qemu "$srcdir"/bridge.conf \ + "$pkgdir"/etc/qemu/bridge.conf || return 1 + install -Dm644 "$srcdir"/80-kvm.rules \ "$pkgdir"/lib/udev/rules.d/80-kvm.rules || return 1 @@ -285,7 +289,8 @@ bc5f2e41ed3b6d6d30b672adab82e3e1 musl-F_SHLCK-and-F_EXLCK.patch cf2692a166a417d021f0966f9421ede2 configure-ifunc.patch 1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd ea972f2fc5505488f68320bf386106bb qemu-guest-agent.initd -66660f143235201249dc0648b39b86ee 80-kvm.rules" +66660f143235201249dc0648b39b86ee 80-kvm.rules +a2f5570453f2489b6e4023e96f70cb7e bridge.conf" sha256sums="c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec qemu-2.6.0.tar.bz2 af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-load-PIE-executables-to-right-address.patch 6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch @@ -294,7 +299,8 @@ eefd597197223899d3b12d8274af493153e270fd06ea8622e33d6eaeae063d40 musl-F_SHLCK-a 96b7fa37c89d9345328cd60bba3612877c149d2fd06b7de169e71ed9fa2aec33 configure-ifunc.patch d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd 5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5 qemu-guest-agent.initd -37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules" +37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules +2f05021990014a5f832aa17317c1464806dc97c278f88d8284db88378f53cb32 bridge.conf" sha512sums="0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215 qemu-2.6.0.tar.bz2 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch @@ -303,4 +309,5 @@ e3f006c28318669356cd5b778f26774f06b0a40a4ac852573379df63efcc8276869958faec16797a 0f887d4b56d8369801bb6b890f75f544eed32fd43b3086337c79b0d1a0c0ca8e25e0ea5e288f6a1891e817d37e1dba72ed5d6a0bc69016c65e6365ee49478999 configure-ifunc.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd 316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7 qemu-guest-agent.initd -9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules" +9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules +749efa2e764006555b4fd3a8e2f6d1118ad2ea4d45acf99104a41a93cfe66dc9685f72027c17d8211e5716246c2a52322c962cf4b73b27541b69393cd57f53bb bridge.conf" diff --git a/main/qemu/bridge.conf b/main/qemu/bridge.conf new file mode 100644 index 0000000000..27c31c38ab --- /dev/null +++ b/main/qemu/bridge.conf @@ -0,0 +1,9 @@ +# This should have the following permissions: root:qemu 0640 + +# Allow users in the "qemu" group to add devices to "br0". +#allow br0 + +# Uncomment the following line to allow users in the "bob" +# group to have permissions defined in it, iff it has the +# following permissions: root:bob 0640 +#include /etc/qemu/bob.conf |