Change default NetworkManager DHCP client to dhcpcd (!278)

Remove the override in ouya-ouya (and in postmarketos-base) and add an
override for raspbery-pi3

Fixes #210
This commit is contained in:
Luca Weiss 2019-03-14 10:07:00 +00:00
parent 97fd10aed4
commit 40d110fcc9
6 changed files with 12 additions and 11 deletions

View File

@ -2,7 +2,7 @@
pkgname=device-ouya-ouya
pkgver=1
pkgdesc="Ouya"
pkgrel=8
pkgrel=9
url="https://postmarketos.org"
arch="armv7"
license="MIT"
@ -69,4 +69,4 @@ kernel_mainline() {
sha512sums="846d2c0d769deeff31891dcf61498c553781c04d0cd5377f76d3ebf788ec5526740138656f1875e7c571e22a747c256d519930ecea8dbf7e186aeabb1773a90b deviceinfo
bf442fac4dc0594e055ed7a7d8232b5c884e2e77543273e8c4f32b5fe3c199561c86d8a5f665e17406057ca7863fabb93e789fe5e168fcd89d2982e0046232ad fb.modes
d01ac1f451275b1a269aab3c8f7fe20b482c952d00c4457ea496b45780c052f8ef98a5ba22a4af009ca128858374c1d3fb97e458102b09f7c40f3d7a718326c1 initfs-hook.sh
549e8759ef362e115103be7fedeb9b5894728a9a2d6177f4192e5f6b3962708455d37084eeb2527ff187d8acd560a4c41e30d6e1997331fab4f3a67df25a67bc networkmanager.conf"
b0737a8fb7a60b2d24e4e124dbeb7044832a683a78887454d13d4078039338fb04579ce9066140733222409e7f53255bfde2c6725bd3848752a27e112717c28c networkmanager.conf"

View File

@ -1,5 +1,2 @@
[main]
dhcp=dhcpcd
[keyfile]
unmanaged-devices=interface-name:p2p0

View File

@ -2,7 +2,7 @@
pkgname="device-raspberry-pi3"
pkgdesc="Raspberry Pi 3B/3B+"
pkgver=0.1
pkgrel=4
pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
@ -11,7 +11,7 @@ depends="postmarketos-base raspberrypi-bootloader linux-rpi mesa-dri-vc4 bluetoo
makedepends="devicepkg-dev"
install="$pkgname.post-install"
subpackages="$pkgname-weston"
source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini"
source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini networkmanager.conf"
build() {
devicepkg_build $startdir $pkgname
@ -24,6 +24,8 @@ package() {
install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt
install -Dm644 "$srcdir"/95-vchiq-permissions.rules \
"$pkgdir"/etc/udev/rules.d/95-vchiq-permissions.rules
install -Dm644 "$srcdir"/networkmanager.conf \
"$pkgdir"/etc/NetworkManager/conf.d/10-rpi3.conf
}
weston() {
@ -37,4 +39,5 @@ b95a66c8fa165aca2170ebb3f8688e78e1dd78d3ddb4d26c289ea77e406eec3bbfecb5a32997df86
a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548 usercfg.txt
ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2 cmdline.txt
7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d 95-vchiq-permissions.rules
320a466009c5abb416f70a60b45b3403ef1d1b4ac68a762c8028cd4615d537c48d906afe101e7335907a0274cc25b0b9b547e02ee69950e6792a7b54759c7cd9 weston.ini"
320a466009c5abb416f70a60b45b3403ef1d1b4ac68a762c8028cd4615d537c48d906afe101e7335907a0274cc25b0b9b547e02ee69950e6792a7b54759c7cd9 weston.ini
0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf"

View File

@ -0,0 +1,2 @@
[main]
dhcp=internal

View File

@ -1,6 +1,6 @@
pkgname=postmarketos-base
pkgver=3
pkgrel=23
pkgrel=24
pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org"
arch="noarch"
@ -71,7 +71,7 @@ x11() {
sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af firmwareload.sh
0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d 50-firmware.rules
a525bd9716aff2ded60ae5e6f7c369d73b03d984b09f12e65d32e2fb3f1538ca0e330752b2c55df6a1ab29867cbf2d22e38c32523af9e9b46bb06085fcb3fcec networkmanager.conf
a06e4c1ed66eab2882ccab885c714ca6e5a08b85625bf9cd4bf929320a333dd228658a89b6363876c0480bc5c3f08a38ac6951aa96b8099431d606475613b8e0 networkmanager.conf
3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 swapfile
f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 swapfile.init
e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 swapfile.conf

View File

@ -1,6 +1,5 @@
[main]
plugins+=ifupdown
dhcp=internal
[ifupdown]
managed=true