Commit 69de9f5e authored by abveritas's avatar abveritas

move the 197 PKGBUILD files for systemd, added message for network-naming switch

parent 6a21e52f
......@@ -4,8 +4,8 @@
# maintainer: abveritas@chakra-project.org
pkgname=systemd
pkgver=196
pkgrel=2
pkgver=197
pkgrel=1
arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
......@@ -38,7 +38,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'99-default.preset'
'98-chakra.rules'
'is_bundle')
md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
md5sums=('56a860dceadfafe59f40141eb5223743'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
......@@ -53,6 +53,8 @@ build() {
patch -p1 -i "$srcdir/use-split-usr-path.patch"
./configure \
PYTHON=python2 \
PYTHON_CONFIG=python2-config \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
......@@ -60,7 +62,6 @@ build() {
--disable-gtk-doc \
--disable-audit \
--disable-ima \
--with-distro=other \
--with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
make
......@@ -85,9 +86,6 @@ package() {
# Remove rpm dir
rm -r "$pkgdir/etc/rpm"
# https://pokersource.info/show_bug.cgi?id=50989
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
install -dm755 "$pkgdir/sbin"
for tool in runlevel reboot shutdown poweroff halt telinit; do
ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
......@@ -123,8 +121,6 @@ package() {
# Make journalctl persistent
install -dm755 "$pkgdir/var/log/journal"
sed -i -e 's/#SystemMaxUse=/SystemMaxUse=25M/' ${pkgdir}/etc/systemd/journald.conf
# Moving previous .install enabled file, remove with #197
mv "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1new.service"
}
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer: abveritas@chakra-project.org
pkgname=systemd
pkgver=197
pkgrel=1
arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd' 'kmod' 'libcap' 'libxslt'
'linux-api-headers' 'pam' 'xz' 'libgcrypt' 'dbus-core')
makedepends=('docbook-xsl' 'gobject-introspection' 'gperf' 'intltool')
optdepends=('python2-gobject3: systemd-analyze'
'dbus-python: systemd-analyze')
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.timedate1.conf
etc/systemd/system.conf
etc/systemd/user.conf
etc/systemd/logind.conf
etc/systemd/journald.conf
etc/udev/udev.conf)
provides=("udev=$pkgver")
conflicts=('udev' 'sysvinit' 'initscripts' 'initscripts-systemd')
replaces=('udev')
groups=('base')
install="systemd.install"
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
'use-split-usr-path.patch'
'99-default.preset'
'98-chakra.rules'
'is_bundle')
md5sums=('56a860dceadfafe59f40141eb5223743'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
'21572b99173a7cdeaff965e0a5e9182b'
'a1bf25da736d3719e9720b2e4caea341'
'40f1d228553f939430e6d8d781f06daf'
'05d26a1936bf5b075bedd76952ab1b53')
build() {
cd "$pkgname-$pkgver"
patch -p1 -i "$srcdir/use-split-usr-path.patch"
./configure \
PYTHON=python2 \
PYTHON_CONFIG=python2-config \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
--enable-introspection \
--disable-gtk-doc \
--disable-audit \
--disable-ima \
--with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
make
}
package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
install -dm755 "$pkgdir/bin"
ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
# move bash-completion and symlink for loginctl
install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
"$pkgdir/usr/share/bash-completion/completions/systemctl"
for ctl in {login,journal,timedate,locale,hostname}ctl; do
ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
done
rm -rf "$pkgdir/etc/bash_completion.d"
# Remove rpm dir
rm -r "$pkgdir/etc/rpm"
install -dm755 "$pkgdir/sbin"
for tool in runlevel reboot shutdown poweroff halt telinit; do
ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
done
ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
# the path to udevadm is hardcoded in some places
install -d "$pkgdir/sbin"
ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
# udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
# add back tmpfiles.d/legacy.conf
install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
# Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
s#GROUP="tape"#GROUP="storage"#g;
s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
# add mkinitcpio hooks
install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
# Chakra specific .preset
install -Dm644 "$srcdir/99-default.preset" "$pkgdir/usr/lib/systemd/system-preset/99-default.preset"
#hide bundles in Doplhin places
install -m644 "$srcdir/98-chakra.rules" "$pkgdir/usr/lib/udev/rules.d/98-chakra.rules"
install -m755 "$srcdir/is_bundle" "$pkgdir/usr/lib/udev/is_bundle"
# Make journalctl persistent
install -dm755 "$pkgdir/var/log/journal"
sed -i -e 's/#SystemMaxUse=/SystemMaxUse=25M/' ${pkgdir}/etc/systemd/journald.conf
# Moving previous .install enabled file, remove with #197
#mv "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1new.service"
}
......@@ -6,8 +6,6 @@ sd_booted() {
post_install() {
udevadm hwdb --update
mv /etc/systemd/system/getty.target.wants/getty@tty1new.service /etc/systemd/system/getty.target.wants/getty@tty1.service
if sd_booted; then
systemctl --system daemon-reexec
......@@ -20,9 +18,14 @@ post_upgrade() {
journalctl --update-catalog
mv /etc/systemd/system/getty.target.wants/getty@tty1.service /etc/systemd/system/getty.target.wants/getty@tty1.service.pacsave
mv /etc/systemd/system/getty.target.wants/getty@tty1new.service /etc/systemd/system/getty.target.wants/getty@tty1.service
rm /etc/systemd/system/getty.target.wants/getty@tty1.service.pacsave
echo -e '\e[31;46m WARNING'
echo -e '\e[31;46m Systemd 197 has moved to persistent network naming, for most users this will have'
echo -e '\e[31;46m no effect. To check what the new name for your network device will be, run:'
echo -e '\e[31;46m hwinfo --network, and look for: Device File: xxxxx, were xxxx is your device.'
echo -e '\e[31;46m This will be used in /usr/lib/udev/rules.d/80-net-name-slot.rules '
echo -e '\e[31;46m If you use dhcpcd instead of networkmanager to connect, re-enable the service before rebooting'
echo -e '\e[31;46m Configuration files like conky.conf will need the new naming scheme too'
echo -e '\e[31;46m http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames \e[0m'
if sd_booted; then
systemctl --system daemon-reexec
......
#!/bin/sh
sd_booted() {
[ -e sys/fs/cgroup/systemd ]
}
post_install() {
udevadm hwdb --update
mv /etc/systemd/system/getty.target.wants/getty@tty1new.service /etc/systemd/system/getty.target.wants/getty@tty1.service
if sd_booted; then
systemctl --system daemon-reexec
fi
}
post_upgrade() {
udevadm hwdb --update
journalctl --update-catalog
#mv /etc/systemd/system/getty.target.wants/getty@tty1.service /etc/systemd/system/getty.target.wants/getty@tty1.service.pacsave
#mv /etc/systemd/system/getty.target.wants/getty@tty1new.service /etc/systemd/system/getty.target.wants/getty@tty1.service
#rm /etc/systemd/system/getty.target.wants/getty@tty1.service.pacsave
if sd_booted; then
systemctl --system daemon-reexec
systemctl restart systemd-logind.service
fi
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment