treewide: move etc/init.d and etc/conf.d into openrc subpackages and cleanup
Moves the remaining init.d and conf.d files into the OpenRC subpackages. Most of these issues were caused by wrongly reimplementing the default_openrc function, which can be caught in the future with https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items/4643. This commit also makes some very minor cleanup of APKBUILDs if it made sense while fixing the subpackages. [ci:skip-grep] Signed-off-by: Aster Boese <asterboese@mailbox.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8871>
This commit is contained in:
parent
535fba79ee
commit
38404b35d3
7 changed files with 45 additions and 53 deletions
|
|
@ -1,7 +1,7 @@
|
|||
maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
|
||||
pkgname=msm-cros-efs-loader
|
||||
pkgver=1.2.1
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="EFS loader for Qualcomm-based Chrome OS devices"
|
||||
url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader"
|
||||
arch="aarch64"
|
||||
|
|
@ -12,21 +12,29 @@ source="$pkgname-$pkgver.tar.gz::$url/-/archive/$_tag/msm-cros-efs-loader-$_tag.
|
|||
rmtfs.confd
|
||||
"
|
||||
options="!check !archcheck"
|
||||
subpackages="$pkgname-rmtfs $pkgname-openrc $pkgname-systemd"
|
||||
subpackages="
|
||||
$pkgname-rmtfs-openrc:rmtfs_openrc
|
||||
$pkgname-openrc
|
||||
$pkgname-systemd
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_tag"
|
||||
|
||||
package() {
|
||||
install -Dm755 "$pkgname.sh" "$pkgdir/usr/sbin/$pkgname"
|
||||
install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
|
||||
install -Dm644 "$srcdir/$pkgname-v$pkgver/10-$pkgname.conf" "$pkgdir"/usr/lib/systemd/system/rmtfs.service.d/10-$pkgname.conf
|
||||
install -Dm644 "$srcdir"/rmtfs.confd "$pkgdir"/etc/conf.d/rmtfs
|
||||
}
|
||||
|
||||
rmtfs() {
|
||||
pkgdesc="RMTFS config for Chrome OS devices"
|
||||
# Must come before the openrc subpackage function to install the config
|
||||
# in this subpackage
|
||||
rmtfs_openrc() {
|
||||
pkgdesc="RMTFS config for Chrome OS devices (OpenRC init scripts)"
|
||||
install_if="$pkgname=$pkgver-r$pkgrel rmtfs-openrc"
|
||||
replaces="rmtfs-openrc"
|
||||
provides="$pkgname-rmtfs=$pkgver-r$pkgrel"
|
||||
replaces="$pkgname-rmtfs rmtfs-openrc"
|
||||
|
||||
install -Dm644 "$srcdir"/rmtfs.confd "$subpkgdir"/etc/conf.d/rmtfs
|
||||
amove etc/conf.d/rmtfs
|
||||
}
|
||||
|
||||
openrc() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
maintainer="sleirsgoevy <sleirsgoevy@gmail.com>"
|
||||
pkgname=samsungipcd
|
||||
pkgver=0.3.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="AT modem emulation using libsamsung-ipc"
|
||||
url="https://gitlab.com/sleirsgoevy/samsungipcd"
|
||||
arch="all"
|
||||
|
|
@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
|
|||
depends="libsamsung-ipc ppp networkmanager-ppp"
|
||||
makedepends="libsamsung-ipc gcc make ppp-dev"
|
||||
subpackages="$pkgname-openrc"
|
||||
install="$pkgname-openrc.post-install"
|
||||
source="
|
||||
samsungipcd-v$pkgver.tgz::$url/-/archive/v$pkgver/samsungipcd-v$pkgver.tar.gz
|
||||
samsungipcd.sh
|
||||
|
|
@ -31,14 +32,6 @@ package() {
|
|||
install -Dm644 "$srcdir/options.ttywc" "$pkgdir/etc/ppp/options.ttywd"
|
||||
}
|
||||
|
||||
openrc() {
|
||||
install_if="$pkgname=$pkgver-r$pkgrel openrc"
|
||||
install="$subpkgname.post-install"
|
||||
depends="openrc"
|
||||
|
||||
mkdir -p "$subpkgdir"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
46203ef88db8cfd31bb0a2d37e4213f1e99834b78e407c3d1a46c089247ba4b7952485dda722ac61e31a5eae4a418ae992259c990e5696344658371c4956b809 samsungipcd-v0.3.0.tgz
|
||||
7bdc6cbc4a9add0f4a5a5d4584fbf4fc64cf4a1f0d93a85e97229eba47bbe66a8e0bd8958b4606141a0189422e13af252d3c0301f61069dc75a64e0a3b59d959 samsungipcd.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue