From a118209987c97f5f1675df9a565188980c7c2dfb Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Tue, 10 Jul 2018 21:27:21 -0400 Subject: pcr/plymouth{,-nosystemd}: Merge, fixup --- pcr/plymouth/PKGBUILD | 177 +++++++++++++++++++--------------- pcr/plymouth/plymouth.encrypt_install | 3 + 2 files changed, 102 insertions(+), 78 deletions(-) (limited to 'pcr/plymouth') diff --git a/pcr/plymouth/PKGBUILD b/pcr/plymouth/PKGBUILD index 3b193df0d..2e685256f 100644 --- a/pcr/plymouth/PKGBUILD +++ b/pcr/plymouth/PKGBUILD @@ -1,33 +1,33 @@ -# -# Maintainer (AUR): Sebastian Lau -# Contributor (AUR) Damian01w -# Contributor (AUR): Padfoot -# # Maintainer: David P. - -# parabola changes and rationale: -# - removed arch logo FIXME: add parabola logo instead - -pkgname=plymouth +# Contributor: Luke Shumaker +# Maintainer (AUR:plymouth-nosystemd): Chris Cromer +# Maintainer (AUR:plymouth): Sebastian Lau +# Contributor (AUR:plymouth): Damian01w +# Contributor (AUR:plymouth): Padfoot + +pkgbase=plymouth +pkgname=(plymouth plymouth-nosystemd) pkgver=0.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical boot splash screen with kernel mode-setting support" url="http://www.freedesktop.org/wiki/Software/Plymouth/" arch=('i686' 'x86_64' 'armv7h') license=('GPL') -depends=('libdrm' 'pango' 'systemd') +depends=('libdrm' 'pango' 'libudev') makedepends=('docbook-xsl') optdepends=('ttf-dejavu') -provides=('plymouth') -conflicts=('plymouth-git' 'plymouth-legacy' 'plymouth-nosystemd') backup=('etc/plymouth/plymouthd.conf') options=('!libtool' '!emptydirs') -source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.xz" +source=("http://www.freedesktop.org/software/${pkgbase}/releases/${pkgbase}-${pkgver}.tar.xz" 'plymouth.encrypt_hook' 'plymouth.encrypt_install' + 'plymouth.initcpio_hook' + 'plymouth.initcpio_install' + 'sd-plymouth.initcpio_install' + 'gdm-plymouth.service' 'lxdm-plymouth.service' 'lightdm-plymouth.service' @@ -36,82 +36,103 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk 'plymouth-deactivate.service' 'plymouth-start.service' 'plymouth-start.path' - 'plymouth.initcpio_hook' - 'plymouth.initcpio_install' - 'sd-plymouth.initcpio_install' - 'plymouth-quit.service.in.patch' + + 'plymouth-quit.service.in.patch' 'plymouth-set-default-theme.in.patch' 'plymouth-update-initrd.patch') - -md5sums=('b261c720888a5431cdfce8494805eab3' - 'd67132b297ccfb1a877a2efd78076963' - '65eb269910f1b81e3f0970af456394ca' - 'ae6e97bb1104bb12cbca6738e3fb872d' - '1430ae2ec501d600f8f6771454dc9bbe' - '870ea3e63c6989e2badf79d1fbafa914' - 'a3cfc30df846b2d7057a29e7fbe8733a' - 'f803c315739f46128b99232d64c268ca' - '006847d16b852c7a50ee2f241fd9647e' - '606cd558141551a1ce0d80150a045d83' - '672ad913e2383483bcb4599a0a6bee48' - '32f04fdbd1eb94ade30d1e63fdcdd9b5' - 'c17e915b19a469198a37dd7376a846c7' - 'df764c8c3fec069a6f1eb03d3c4f8dc3' - '165a39dbedcc6e123c8ca05d5b4b2e25' - 'f79edbbb30c71b0dbcd102c7dd31660b' - '0357775c16b5f90f1af485e6a4c80a9e') +sha1sums=('1a07c8bc7d3625e93c5c15b1b0943c0e3a054808' + '7e27ca6140424efb82fd1c962a301dc07ffa2133' + '798f7916cfaff2a3501f3da1f54c2ae4714d6d26' + 'c492081c0ce4418db48c943639e24c2ca10ad735' + '29e70486ee1091c711939a3de56c52083cd53464' + 'a2027479b75bdeaab46b1f15530e02a0144d807c' + '78b854fb3939fd9f54e59bbda08b046f1b3649c4' + '59ad64c616eec35c87ac34c68e79ca0df0276f7c' + '9d15546767d0128c863258b8d06f12258e3d1e18' + '55b5b54c7a972fb974eb759cfbd2d3a55225f189' + '4e18b05e35f70a3c76b66ac7b4706936b64ffb93' + '7e01cb2811de735b358290b71c3db028f4bfcf1f' + '621121aef7ece1027ff349d66209f34cf30d4695' + 'a6a32472e05c564a0d701e0cf9a12004bf6293c1' + '9cb560bf8c27bae22e58c5d593af93147eea74d1' + '4d3c992fea8b1173897f951cd573ea1f6ed15a87' + '5d0eb611bcbe318bed38e0f434299c01adbd88dd') prepare() { - cd "$srcdir"/${pkgname}-${pkgver} - patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch - patch -p1 -i $srcdir/plymouth-update-initrd.patch - patch -p1 -i $srcdir/plymouth-quit.service.in.patch + cd "$srcdir/${pkgbase}-${pkgver}" + patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch + patch -p1 -i $srcdir/plymouth-update-initrd.patch + patch -p1 -i $srcdir/plymouth-quit.service.in.patch } -build() { - cd "$srcdir"/${pkgname}-${pkgver} - - LDFLAGS="$LDFLAGS -ludev" ./configure \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --sbindir=/usr/bin \ - --enable-systemd-integration \ - --enable-drm \ - --enable-tracing \ - --enable-pango \ - --enable-gtk=no \ - --with-release-file=/etc/os-release \ - --with-background-color=0x000000 \ - --with-background-start-color-stop=0x000000 \ - --with-background-end-color-stop=0x4D4D4D \ - --without-rhgb-compat-link \ - --without-system-root-install - - make +_build() { + mkdir -p "$srcdir/$1" + cd "$srcdir/$1" + shift + + ../"${pkgbase}-${pkgver}"/configure \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ + --enable-drm \ + --enable-tracing \ + --enable-pango \ + --enable-gtk=no \ + --with-release-file=/etc/os-release \ + --with-background-color=0x000000 \ + --with-background-start-color-stop=0x000000 \ + --with-background-end-color-stop=0x4D4D4D \ + --without-rhgb-compat-link \ + --without-system-root-install \ + "$@" + + make } -package() { - cd "$srcdir"/${pkgname}-${pkgver} - +_package() { + cd "$srcdir/$1" make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt" - install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt" - install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth" + install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt" + install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt" + install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth" install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth" + + install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" +} + +build() { + _build build-systemd --enable-systemd-integration + _build build-nosystemd --disable-systemd-integration +} + +package_plymouth() { + depends+=('systemd-sysvcompat') + + _package build-systemd + install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth" - for i in {gdm,sddm,lxdm,slim,lightdm}-plymouth.service; do - install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i" - done + # TODO: Some of these override units installed by `make install`. + # What's wrong with the upstream unit files? We should patch them, + # rather than overriding them completely. + install -Dm644 -t "$pkgdir/usr/lib/systemd/system" -- \ + "$srcdir/plymouth-deactivate.service" \ + "$srcdir/plymouth-start.service" \ + "$srcdir/plymouth-start.path" \ + "$srcdir"/{gdm,sddm,lxdm,slim,lightdm}-plymouth.service - install -Dm644 "$srcdir/plymouth-deactivate.service" "$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service" - install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service" - install -Dm644 "$srcdir/plymouth-start.path" "$pkgdir/usr/lib/systemd/system/plymouth-start.path" install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" } + +package_plymouth-nosystemd() { + pkgdesc+=' (for non-systemd systems)' + conflicts+=("$pkgbase" 'systemd-sysvcompat') + provides+=("$pkgbase=$pkgver") + + _package build-nosystemd +} diff --git a/pcr/plymouth/plymouth.encrypt_install b/pcr/plymouth/plymouth.encrypt_install index 5258a0b2d..b2d7cbc1a 100644 --- a/pcr/plymouth/plymouth.encrypt_install +++ b/pcr/plymouth/plymouth.encrypt_install @@ -23,6 +23,9 @@ build() { add_file "/usr/share/fonts/TTF/DejaVuSans.ttf" add_file "/etc/fonts/fonts.conf" add_file "/etc/fonts/conf.d/60-latin.conf" + + # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 + add_binary "/usr/lib/libgcc_s.so.1" add_runscript } -- cgit v1.2.2