systemd/linux-pam-pmos: rename from linux-pam (MR 5769) (MR 5563)
This should ensure that postmarketos-base-systemd installs our linux-pam package, not the one from alpine. (The old way to pin our package was based on fragile version pinning, as our pam wasn't bumped to 9999, but had the same version as aports). fixes #3170 [ci:skip-build]: already built successfully in CI
This commit is contained in:
+15
-5
@@ -1,12 +1,9 @@
|
||||
# Forked from Alpine enable systemd
|
||||
# MODIFIED base-sessionl.pamd for systemd!
|
||||
|
||||
pkgname=linux-pam
|
||||
# MUST be kept in sync to avoid accidentally pulling in the alpine version
|
||||
# we hard depend on this exact version in postmarketos-base-systemd. When updating
|
||||
# the package here it must also be updated in postmarketos-base-systemd.
|
||||
pkgname=linux-pam-pmos
|
||||
pkgver=1.6.1
|
||||
pkgrel=1
|
||||
pkgrel=0
|
||||
pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
|
||||
url="https://www.kernel.org/pub/linux/libs/pam"
|
||||
arch="all"
|
||||
@@ -63,6 +60,8 @@ build() {
|
||||
}
|
||||
|
||||
package() {
|
||||
provides="linux-pam=$pkgver-r$pkgrel"
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
# install our pam.d files
|
||||
@@ -81,12 +80,23 @@ package() {
|
||||
&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
|
||||
}
|
||||
|
||||
dev() {
|
||||
default_dev
|
||||
provides="$provides linux-pam-dev=$pkgver-r$pkgrel"
|
||||
}
|
||||
|
||||
manual() {
|
||||
provides="$provides linux-pam-manual=$pkgver-r$pkgrel"
|
||||
pkgdesc="$pkgdesc (manual)"
|
||||
|
||||
amove usr/share/doc/Linux-PAM
|
||||
}
|
||||
|
||||
doc() {
|
||||
default_doc
|
||||
provides="$provides linux-pam-doc=$pkgver-r$pkgrel"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea Linux-PAM-1.6.1.tar.xz
|
||||
c6054ec6832f604c0654cf074e4e241c44037fd41cd37cca7da94abe008ff72adc4466d31bd254517eda083c7ec3f6aefd37785b3ee3d0d4553250bd29963855 Linux-PAM-1.6.1-docs.tar.xz
|
||||
@@ -1,7 +1,7 @@
|
||||
# Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
|
||||
# pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
|
||||
pkgname=postmarketos-base-systemd
|
||||
pkgver=9
|
||||
pkgver=10
|
||||
pkgrel=0
|
||||
pkgdesc="Meta package for running postmarketOS with systemd"
|
||||
url="https://postmarketos.org"
|
||||
@@ -14,7 +14,7 @@ depends="
|
||||
systemd
|
||||
systemd-timesyncd
|
||||
tzdata
|
||||
linux-pam=1.6.1-r1
|
||||
linux-pam-pmos
|
||||
systemd-services
|
||||
"
|
||||
replaces="alpine-baselayout postmarketos-base systemd systemd-logind"
|
||||
|
||||
Reference in New Issue
Block a user