init
Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
commit
565c0145cf
75
0001-Use-Arch-Linux-device-access-groups.patch
Normal file
75
0001-Use-Arch-Linux-device-access-groups.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com>
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Tue, 6 Mar 2018 23:39:47 +0100
|
||||
Subject: [PATCH] Use Arch Linux' device access groups
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
cdrom → optical
|
||||
dialout → uucp
|
||||
tape → storage
|
||||
---
|
||||
rules/50-udev-default.rules.in | 14 +++++++-------
|
||||
sysusers.d/basic.conf.in | 6 +++---
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
|
||||
index 191f56f42..f81c4d0fc 100644
|
||||
--- a/rules/50-udev-default.rules.in
|
||||
+++ b/rules/50-udev-default.rules.in
|
||||
@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
|
||||
-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
|
||||
+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
|
||||
|
||||
SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
|
||||
|
||||
@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
|
||||
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
|
||||
|
||||
SUBSYSTEM=="block", GROUP="disk"
|
||||
-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
|
||||
-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
|
||||
-KERNEL=="sch[0-9]*", GROUP="cdrom"
|
||||
-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
|
||||
-KERNEL=="pktcdvd", GROUP="cdrom"
|
||||
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
|
||||
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
|
||||
+KERNEL=="sch[0-9]*", GROUP="optical"
|
||||
+KERNEL=="pktcdvd[0-9]*", GROUP="optical"
|
||||
+KERNEL=="pktcdvd", GROUP="optical"
|
||||
|
||||
-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
|
||||
+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
|
||||
SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
|
||||
KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
|
||||
KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
|
||||
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
|
||||
index 8e358c02d..33e513a36 100644
|
||||
--- a/sysusers.d/basic.conf.in
|
||||
+++ b/sysusers.d/basic.conf.in
|
||||
@@ -24,14 +24,14 @@ g utmp - - -
|
||||
|
||||
# Hardware access groups
|
||||
g audio - - -
|
||||
-g cdrom - - -
|
||||
-g dialout - - -
|
||||
g disk - - -
|
||||
g input - - -
|
||||
g kvm - - -
|
||||
g lp - - -
|
||||
+g optical - - -
|
||||
g render - - -
|
||||
-g tape - - -
|
||||
+g storage - - -
|
||||
+g uucp - - -
|
||||
g video - - -
|
||||
|
||||
# Default group for normal users
|
||||
--
|
||||
2.16.2
|
||||
|
||||
172
PKGBUILD
Normal file
172
PKGBUILD
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
# Maintainer: Christian Hesse <mail@eworm.de>
|
||||
# Maintainer: Dave Reisner <dreisner@archlinux.org>
|
||||
# Maintainer: Tom Gundersen <teg@jklm.no>
|
||||
# Stripped by fbt@fleshless.org to only provide the libs.
|
||||
|
||||
pkgbase=systemd-libs-standalone
|
||||
pkgname=('systemd-libs-systemd' 'systemd-libs-udev')
|
||||
# Can be from either systemd or systemd-stable
|
||||
_commit='a09c170122cf3b37c3e4431bf082f9dbdc07fc70'
|
||||
pkgver=241.7
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
url='https://www.github.com/systemd/systemd'
|
||||
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
|
||||
'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
|
||||
'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
|
||||
'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
|
||||
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
|
||||
'bash-completion')
|
||||
options=('strip')
|
||||
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
|
||||
'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
||||
source=(# fragment is latest tag for source verification, final merge in prepare()
|
||||
"git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
|
||||
"git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
|
||||
'0001-Use-Arch-Linux-device-access-groups.patch'
|
||||
'initcpio-hook-udev'
|
||||
'initcpio-install-systemd'
|
||||
'initcpio-install-udev'
|
||||
'arch.conf'
|
||||
'loader.conf'
|
||||
'splash-arch.bmp'
|
||||
'systemd-user.pam'
|
||||
'systemd-hook'
|
||||
'systemd-binfmt.hook'
|
||||
'systemd-catalog.hook'
|
||||
'systemd-daemon-reload.hook'
|
||||
'systemd-hwdb.hook'
|
||||
'systemd-sysctl.hook'
|
||||
'systemd-sysusers.hook'
|
||||
'systemd-tmpfiles.hook'
|
||||
'systemd-udev-reload.hook'
|
||||
'systemd-update.hook')
|
||||
sha512sums=('SKIP'
|
||||
'SKIP'
|
||||
'9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
|
||||
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
|
||||
'01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
|
||||
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
|
||||
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
|
||||
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
|
||||
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
|
||||
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
|
||||
'6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
|
||||
'5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
|
||||
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
|
||||
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
|
||||
'471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
|
||||
'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
|
||||
'08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
|
||||
'577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
|
||||
'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
|
||||
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
|
||||
|
||||
_backports=(
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "$pkgbase-stable"
|
||||
|
||||
# add upstream repository for cherry-picking
|
||||
git remote add -f upstream ../systemd
|
||||
# merge the latest stable commit (fast-foward only to make sure
|
||||
# the verified tag is in)
|
||||
git merge --ff-only "${_commit}"
|
||||
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
git cherry-pick -n "${_c}"
|
||||
done
|
||||
for _c in "${_reverts[@]}"; do
|
||||
git revert -n "${_c}"
|
||||
done
|
||||
|
||||
# Replace cdrom/dialout/tape groups with optical/uucp/storage
|
||||
patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
cd "$pkgbase-stable"
|
||||
|
||||
local _version _count
|
||||
_version="$(git describe --abbrev=0 --tags)"
|
||||
_count="$(git rev-list --count ${_version}..)"
|
||||
printf '%s.%s' "${_version#v}" "${_count}"
|
||||
}
|
||||
|
||||
build() {
|
||||
local _timeservers=({0..3}.arch.pool.ntp.org)
|
||||
local _nameservers=(
|
||||
# We use these public name services, ordered by their
|
||||
# privacy policy (hopefully):
|
||||
# * Cloudflare (https://1.1.1.1/)
|
||||
# * Quad9 without filtering (https://www.quad9.net/)
|
||||
# * Google (https://developers.google.com/speed/public-dns/)
|
||||
1.1.1.1
|
||||
9.9.9.10
|
||||
8.8.8.8
|
||||
2606:4700:4700::1111
|
||||
2620:fe::10
|
||||
2001:4860:4860::8888
|
||||
)
|
||||
|
||||
local _meson_options=(
|
||||
-Dversion-tag="${pkgver}-${pkgrel}-arch"
|
||||
|
||||
-Dgnu-efi=true
|
||||
-Dima=false
|
||||
-Dlibidn2=true
|
||||
-Dlz4=true
|
||||
|
||||
-Ddbuspolicydir=/usr/share/dbus-1/system.d
|
||||
-Ddefault-hierarchy=hybrid
|
||||
-Ddefault-locale=C
|
||||
-Ddefault-kill-user-processes=false
|
||||
-Dfallback-hostname='archlinux'
|
||||
-Dntp-servers="${_timeservers[*]}"
|
||||
-Ddns-servers="${_nameservers[*]}"
|
||||
-Drpmmacrosdir=no
|
||||
-Dsysvinit-path=
|
||||
-Dsysvrcnd-path=
|
||||
)
|
||||
|
||||
arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
|
||||
|
||||
ninja -C build
|
||||
}
|
||||
|
||||
#check() {
|
||||
# meson test -C build
|
||||
#}
|
||||
|
||||
package_systemd-libs-systemd() {
|
||||
pkgdesc='systemd client libraries'
|
||||
depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
|
||||
license=('LGPL2.1')
|
||||
provides=('libsystemd' 'libsystemd.so')
|
||||
conflicts=('libsystemd')
|
||||
replaces=('libsystemd')
|
||||
|
||||
DESTDIR="$srcdir/full-install" meson install -C build
|
||||
|
||||
# runtime libraries shipped with systemd-libs
|
||||
install -d -m0755 "$pkgdir"/usr/lib
|
||||
mv "$srcdir/full-install/usr/lib/"lib{nss,systemd}*.so* "$pkgdir/usr/lib/"
|
||||
}
|
||||
|
||||
package_systemd-libs-udev() {
|
||||
pkgdesc="udev client libraries"
|
||||
depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
|
||||
license=('LGPL2.1')
|
||||
provides=('libudev' 'libudev.so')
|
||||
|
||||
# udev libs
|
||||
install -d -m0755 "$pkgdir"/usr/lib
|
||||
cp --archive "$srcdir/full-install/usr/lib/"libudev* "$pkgdir/usr/lib/"
|
||||
}
|
||||
|
||||
# vim:ft=sh syn=sh et sw=2:
|
||||
Loading…
Reference in New Issue
Block a user