mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
core/systemd to 230-7
This commit is contained in:
Kevin Mihelich
parent
9e7e7017af
commit
983e94a5f5
3 changed files with 36 additions and 144 deletions
|
|
@ -8,7 +8,7 @@
|
|||
pkgbase=systemd
|
||||
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
|
||||
pkgver=230
|
||||
pkgrel=5
|
||||
pkgrel=7
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
|
||||
|
|
@ -26,7 +26,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
|
|||
'udev-hwdb.hook')
|
||||
md5sums=('SKIP'
|
||||
'90ea67a7bb237502094914622a39e281'
|
||||
'8a093826cbce909e34f15dccd73974c4'
|
||||
'bee7fd6ccda39582259708e3f262ea6d'
|
||||
'1b3aa3a0551b08af9305d33f85b5c2fc'
|
||||
'20ead378f5d6df4b2a3e670301510a7d'
|
||||
'ddaef54f68f6c86c6c07835fc668f62a'
|
||||
|
|
@ -51,6 +51,15 @@ _backports=(
|
|||
|
||||
# resolved: when restarting a transaction make sure to not touch it anymore (#3553)
|
||||
5278bbfe0c79c1f2b5bf8a215d8e7d63f1900ce9
|
||||
|
||||
# basic: pass flags to the fnmatch
|
||||
2027927b1002a74d24300704a655614f8ea48e45
|
||||
|
||||
# nspawn: fix uid patching logic
|
||||
0c6aeb4609f619328b9dcf8d8d815bd06e412ac5
|
||||
|
||||
# load-fragment: don't try to do a template instance replacement if we are not an instance (#3451)
|
||||
9d3e340639bc0b4610f7ece98a84157dbc1c2c8f
|
||||
)
|
||||
|
||||
prepare() {
|
||||
|
|
@ -85,6 +94,7 @@ build() {
|
|||
--with-sysvrcnd-path=
|
||||
--with-ntp-servers="${timeservers[*]}"
|
||||
--with-default-dnssec=no
|
||||
--with-dbuspolicydir=/usr/share/dbus-1/system.d
|
||||
--without-kill-user-processes
|
||||
)
|
||||
|
||||
|
|
@ -107,15 +117,7 @@ package_systemd() {
|
|||
'quota-tools: kernel-level quota management'
|
||||
'systemd-sysvcompat: symlink package to provide sysvinit binaries'
|
||||
'polkit: allow administration as unprivileged user')
|
||||
backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.hostname1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.login1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.locale1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.machine1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.timedate1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.import1.conf
|
||||
etc/dbus-1/system.d/org.freedesktop.network1.conf
|
||||
etc/pam.d/systemd-user
|
||||
backup=(etc/pam.d/systemd-user
|
||||
etc/systemd/coredump.conf
|
||||
etc/systemd/journald.conf
|
||||
etc/systemd/journal-remote.conf
|
||||
|
|
|
|||
|
|
@ -93,6 +93,13 @@ add_systemd_unit() {
|
|||
fi
|
||||
}
|
||||
|
||||
add_systemd_drop_in() {
|
||||
local unit=$1 dropin_name=$2
|
||||
|
||||
mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
|
||||
cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
|
||||
}
|
||||
|
||||
build() {
|
||||
local rules unit
|
||||
|
||||
|
|
@ -159,6 +166,12 @@ build() {
|
|||
echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
|
||||
echo "root:x:0:root" >"$BUILDROOT/etc/group"
|
||||
echo "root::::::::" >"$BUILDROOT/etc/shadow"
|
||||
|
||||
add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
|
||||
EOF
|
||||
}
|
||||
|
||||
help() {
|
||||
|
|
|
|||
|
|
@ -4,13 +4,6 @@ sd_booted() {
|
|||
[[ -d run/systemd/system && ! -L run/systemd/system ]]
|
||||
}
|
||||
|
||||
add_privs() {
|
||||
if ! setcap "$2" "$1" 2>/dev/null; then
|
||||
echo "==> Warning: setcap failed, falling back to setuid root on /$1"
|
||||
chmod u+s "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
add_journal_acls() {
|
||||
# ignore errors, since the filesystem might not support ACLs
|
||||
setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
|
||||
|
|
@ -18,129 +11,16 @@ add_journal_acls() {
|
|||
}
|
||||
|
||||
maybe_reexec() {
|
||||
# don't reexec on 209-1 upgrade due to large infrastructural changes.
|
||||
if [[ $(vercmp 209-1 "$2") -eq 1 ]]; then
|
||||
echo ':: systemd has not been reexecuted. It is recommended that you'
|
||||
echo ' reboot at your earliest convenience.'
|
||||
return
|
||||
fi
|
||||
|
||||
if sd_booted; then
|
||||
systemctl --system daemon-reexec
|
||||
fi
|
||||
}
|
||||
|
||||
_dir_empty() {
|
||||
set -- "$1"/*
|
||||
[[ ! -e $1 && ! -L $1 ]]
|
||||
}
|
||||
|
||||
post_common() {
|
||||
systemd-sysusers
|
||||
udevadm hwdb --update
|
||||
journalctl --update-catalog
|
||||
}
|
||||
|
||||
_204_1_changes() {
|
||||
printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
|
||||
printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
|
||||
}
|
||||
|
||||
_205_1_changes() {
|
||||
printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n'
|
||||
printf ' protocols. You should reboot at your earliest convenience.\n'
|
||||
}
|
||||
|
||||
_206_1_changes() {
|
||||
printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n'
|
||||
printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n'
|
||||
printf ' hook has been added which provides this functionality, and more.\n'
|
||||
}
|
||||
|
||||
_208_1_changes() {
|
||||
if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then
|
||||
mv -T var/lib/backlight var/lib/systemd/backlight
|
||||
fi
|
||||
|
||||
if [[ -e var/lib/random-seed && ! -e var/lib/systemd/random-seed ]]; then
|
||||
mv -T var/lib/random-seed var/lib/systemd/random-seed
|
||||
fi
|
||||
}
|
||||
|
||||
_208_8_changes() {
|
||||
add_journal_acls
|
||||
}
|
||||
|
||||
_209_1_changes() {
|
||||
# attempt to preserve existing behavior
|
||||
|
||||
local old_rule=etc/udev/rules.d/80-net-name-slot.rules
|
||||
local new_rule=etc/udev/rules.d/80-net-setup-link.rules
|
||||
|
||||
echo ":: Network device naming is now controlled by udev's net_setup_link"
|
||||
echo " builtin. Refer to the systemd.link manpage for a full description."
|
||||
|
||||
# not clear what action we can take here, so don't do anything
|
||||
[[ -e $new_rule ]] && return 0
|
||||
|
||||
# rename the old rule to the new one so that we preserve the user's
|
||||
# existing option.
|
||||
if [[ -e $old_rule ]]; then
|
||||
printf ':: Renaming %s to %s in order\n' "${old_rule##*/}" "${new_rule##*/}"
|
||||
printf ' to preserve existing network naming behavior.\n'
|
||||
mv -v "$old_rule" "$new_rule"
|
||||
else
|
||||
echo ':: No changes have been made to your network naming configuration.'
|
||||
echo ' Interfaces should continue to maintain the same names.'
|
||||
fi
|
||||
}
|
||||
|
||||
_210_1_changes() {
|
||||
if sd_booted; then
|
||||
# If /etc/systemd/network is non-empty, then this is a 209 user who used
|
||||
# networkd. Re-enable it for them.
|
||||
if ! _dir_empty etc/systemd/network; then
|
||||
systemctl enable systemd-networkd
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
_213_4_changes() {
|
||||
if sd_booted; then
|
||||
# if /etc/resolv.conf is a symlink, just assume that it was being managed
|
||||
# by systemd-networkd, and re-enable systemd-resolved.
|
||||
if [[ -L etc/resolv.conf ]]; then
|
||||
systemctl enable systemd-resolved
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
_214_2_changes() {
|
||||
# /run/systemd/network/resolv.conf -> /run/systemd/resolve/resolv.conf
|
||||
if [[ etc/resolv.conf -ef run/systemd/network/resolv.conf ]]; then
|
||||
ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
|
||||
|
||||
if sd_booted; then
|
||||
if [[ ! -d run/systemd/resolve ]]; then
|
||||
mkdir run/systemd/resolve
|
||||
fi
|
||||
|
||||
if [[ -f run/systemd/network/resolv.conf ]]; then
|
||||
mv run/systemd/{network,resolve}/resolv.conf
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ':: coredumps are no longer sent to the journal by default. To re-enable:'
|
||||
echo ' echo >/etc/sysctl.d/50-coredump.conf \'
|
||||
echo ' "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"'
|
||||
}
|
||||
|
||||
_215_2_changes() {
|
||||
# create at least the symlink from /etc/os-release to /usr/lib/os-release
|
||||
systemd-tmpfiles --create etc.conf
|
||||
}
|
||||
|
||||
_216_2_changes() {
|
||||
echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
|
||||
echo ' tuned in /etc/systemd/coredump.conf.'
|
||||
|
|
@ -158,6 +38,10 @@ _219_4_changes() {
|
|||
fi
|
||||
}
|
||||
|
||||
_230_1_changes() {
|
||||
echo ':: systemd-bootchart is no longer included with systemd'
|
||||
}
|
||||
|
||||
post_install() {
|
||||
systemd-machine-id-setup
|
||||
|
||||
|
|
@ -181,19 +65,12 @@ post_upgrade() {
|
|||
|
||||
maybe_reexec "$@"
|
||||
|
||||
local v upgrades=(204-1
|
||||
205-1
|
||||
206-1
|
||||
208-1
|
||||
208-8
|
||||
209-1
|
||||
210-1
|
||||
213-4
|
||||
214-2
|
||||
215-2
|
||||
216-2
|
||||
219-2
|
||||
219-4)
|
||||
local v upgrades=(
|
||||
216-2
|
||||
219-2
|
||||
219-4
|
||||
230-1
|
||||
)
|
||||
|
||||
for v in "${upgrades[@]}"; do
|
||||
if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue