17292f4f5e
Fix wifi on htc-ace by properly setting nl80211 before wext. /etc/conf.d/wpa_supplicant is supposed to get modified twice with the current code in the post-install file. The first one was patched recently to set nl80211 before wext, but that change does not work in practice, for two reasons: 1. The code block does not even get executed, because apk reports that /etc/conf.d/wpa_supplicant was already modified (by a package that was installed before, in its post-install script? I could not find out which one does that though). 2. Even if it worked, the second code block would revert the change and put wext before nl80211 again. Fix this by removing the first code block, and changing the order in the second one. Make it easier to catch such errors in the future, by printing, which files get modified, or get skipped. Set "#!/bin/sh -e", so the script can not fail silently. When doing pmbootstrap -y zap and then pmbootstrap install, the output looks like this: (141/151) Installing postmarketos-base (3-r26) Executing postmarketos-base-3-r26.post-install - Modifying: /etc/fstab - Modifying: /etc/issue - Modifying: /etc/motd - Modifying: /etc/conf.d/syslog - Modifying: /etc/conf.d/wpa_supplicant - Modifying: /etc/sudoers - Modifying: /etc/chrony/chrony.conf
83 lines
2.6 KiB
Text
83 lines
2.6 KiB
Text
pkgname=postmarketos-base
|
|
pkgver=3
|
|
pkgrel=27
|
|
pkgdesc="Meta package for minimal postmarketOS base"
|
|
url="https://postmarketos.org"
|
|
arch="noarch"
|
|
license="GPL3+"
|
|
depends="
|
|
alpine-base
|
|
dbus
|
|
chrony
|
|
cryptsetup
|
|
eudev
|
|
haveged
|
|
htop
|
|
iw
|
|
nano
|
|
openssh
|
|
postmarketos-mkinitfs
|
|
sudo
|
|
tmux
|
|
util-linux
|
|
wpa_supplicant
|
|
shadow
|
|
networkmanager"
|
|
makedepends=""
|
|
install="$pkgname.post-install"
|
|
subpackages="$pkgname-x11"
|
|
source="
|
|
firmwareload.sh
|
|
50-firmware.rules
|
|
networkmanager.conf
|
|
swapfile/swapfile
|
|
swapfile/swapfile.init
|
|
swapfile/swapfile.conf
|
|
devmappings.initd
|
|
deferred-initcalls.init
|
|
"
|
|
options="!check"
|
|
|
|
package() {
|
|
install -D -m644 "$srcdir"/50-firmware.rules \
|
|
"$pkgdir"/etc/udev/rules.d/50-firmware.rules
|
|
install -D -m755 "$srcdir"/firmwareload.sh \
|
|
"$pkgdir"/usr/lib/firmwareload.sh
|
|
|
|
install -d -m755 "$pkgdir"/etc/skel
|
|
|
|
# Install swapfile
|
|
install -Dm755 "$srcdir"/swapfile \
|
|
"$pkgdir"/sbin/swapfile
|
|
install -Dm644 "$srcdir"/swapfile.conf \
|
|
"$pkgdir"/etc/conf.d/swapfile
|
|
install -Dm755 "$srcdir"/swapfile.init \
|
|
"$pkgdir"/etc/init.d/swapfile
|
|
|
|
install -D -m644 "$srcdir"/networkmanager.conf \
|
|
"$pkgdir"/etc/NetworkManager/conf.d/00-postmarketos.conf
|
|
|
|
install -Dm755 "$srcdir"/devmappings.initd \
|
|
"$pkgdir"/etc/init.d/devmappings
|
|
|
|
install -Dm755 "$srcdir"/deferred-initcalls.init \
|
|
"$pkgdir"/etc/init.d/deferred-initcalls
|
|
}
|
|
|
|
x11() {
|
|
install_if="$pkgname xorg-server"
|
|
depends="
|
|
libinput
|
|
xf86-input-libinput
|
|
xf86-video-fbdev"
|
|
mkdir "$subpkgdir"
|
|
}
|
|
|
|
sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af firmwareload.sh
|
|
0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d 50-firmware.rules
|
|
67a031f309a3232ac1e8abc3fedeaee912c035f9c81b4f709248895905a27ab5844ec92c65e55b79af3894450ba3883549d4004f11efebb47114d41f730e4a5f networkmanager.conf
|
|
3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 swapfile
|
|
f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 swapfile.init
|
|
e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 swapfile.conf
|
|
dadd251229eb5759e3cba77c39a4afc6f28bcbe0f272cd3ab41b7ff4fe6a3d2b9ee765e1a0b8f9241274e757ed3b2ce035ee5abe91843e55fb4188a3c401ca78 devmappings.initd
|
|
5fd6dd7f9941e975a6ce559924eb252606943276dc09455bbeb05ff718ecd28f20a08eee8e04ca580e5af71d4c944c256ec04f07b07286394f5dfedfa59273e7 deferred-initcalls.init"
|