Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/plymouth/files: 0.8.8-initrd-binaries-paths.patch
Date: Sat, 01 Mar 2014 19:21:57
Message-Id: 20140301192150.72D8A2004C@flycatcher.gentoo.org
1 maksbotan 14/03/01 19:21:50
2
3 Added: 0.8.8-initrd-binaries-paths.patch
4 Log:
5 Add patch from upstream git to fix installation paths in populate-initrd, bug #499388. Thanks to Enrico Tagliavini.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
8
9 Revision Changes Path
10 1.1 sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch?rev=1.1&content-type=text/plain
14
15 Index: 0.8.8-initrd-binaries-paths.patch
16 ===================================================================
17 From 2d85c8d0a3ad81268718344e0e72ebeeea851422 Mon Sep 17 00:00:00 2001
18 From: Enrico Tagliavini <enrico.tagliavini@×××××.com>
19 Date: Wed, 29 Jan 2014 14:18:22 +0000
20 Subject: populate-initrd: install binaries to their configured location
21
22 If plymouth is configured --with-system-root-install=no then the
23 systemd unitd files will write the paths of plymouth and plymouthd
24 relative to /usr . The script currently hardcodes installing them
25 to the initrd's /
26
27 This commit makes sure they get placed on the same part of the of
28 the initrd filesystem as systemd expects to find them.
29
30 https://bugs.freedesktop.org/show_bug.cgi?id=74174
31 ---
32 diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
33 index d25ab07..43c7f22 100755
34 --- a/scripts/plymouth-populate-initrd.in
35 +++ b/scripts/plymouth-populate-initrd.in
36 @@ -373,8 +373,8 @@ done
37 [ -z "$INITRDDIR" ] && usage error
38
39 mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
40 -inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
41 -inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
42 +inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
43 +inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
44 inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
45 inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
46 inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
47 --
48 cgit v0.9.0.2-2-gbebe