Send plymouth mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.freedesktop.org/mailman/listinfo/plymouth
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of plymouth digest..."
Today's Topics:
1. [PATCH 1/2] populate-initrd: don't hardcode client and daemon
path (Brett Witherspoon)
2. Re: [PATCH 1/2] populate-initrd: don't hardcode client and
daemon path (Ray Strode)
----------------------------------------------------------------------
Message: 1
Date: Mon, 11 Oct 2010 22:05:24 -0500
From: Brett Witherspoon <[email protected]>
Subject: [PATCH 1/2] populate-initrd: don't hardcode client and daemon
path
To: [email protected]
Message-ID: <[email protected]>
When not installing in system root, the populate initrd script would not
install the client or daemon due to the paths being hardcoded.
Environmental variables are also now available to override the defaults.
---
configure.ac | 3 +++
scripts/plymouth-populate-initrd.in | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b5eddf5..091fe14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,9 @@ fi
AC_SUBST(plymouthclientdir)
AC_SUBST(plymouthdaemondir)
+AS_AC_EXPAND(PLYMOUTH_CLIENT_DIR, $plymouthclientdir)
+AS_AC_EXPAND(PLYMOUTH_DAEMON_DIR, $plymouthdaemondir)
+
AC_ARG_WITH(rhgb-compat-link,
AS_HELP_STRING([--with-rhgb-compat-link],[Install /usr/bin/rhgb-client
compatability
symlink]),with_rhgb_compat_link=${withval},with_rhgb_compat_link=yes)
AM_CONDITIONAL(WITH_RHGB_COMPAT_LINK, [test "$with_rhgb_compat_link" = yes])
diff --git a/scripts/plymouth-populate-initrd.in
b/scripts/plymouth-populate-initrd.in
index 7a2f0ca..52d43ae 100755
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -9,6 +9,8 @@
[ -z "$PLYMOUTH_THEME_NAME" ] &&
PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
+[ -z "$PLYMOUTH_DAEMON_PATH" ] &&
PLYMOUTH_DAEMON_PATH="@PLYMOUTH_DAEMON_DIR@/plymouthd"
+[ -z "$PLYMOUTH_CLIENT_PATH" ] &&
PLYMOUTH_CLIENT_PATH="@PLYMOUTH_CLIENT_DIR@/plymouth"
if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
@@ -72,8 +74,8 @@ set_verbose $verbose || :
[ -z "$INITRDDIR" ] && usage error
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
-inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
-inst /bin/plymouth $INITRDDIR
+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /bin/plymouthd
+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
--
1.7.2.3
>From 7f6c35ddc23b7da96bed884be1b22b955652a12d Mon Sep 17 00:00:00 2001
From: Brett Witherspoon <[email protected]>
Date: Mon, 11 Oct 2010 22:23:47 -0500
Subject: [PATCH 2/2] ply-image: replace deprecated libpng function
To: [email protected]
The png_set_gray_1_2_4_to_8 function is deprecated and has been removed
from libpng14. Now png_set_expand_gray_1_2_4_to_8 is used instead which
is compatible with libpng-1.2.9 and greater.
---
src/libply-splash-graphics/ply-image.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/libply-splash-graphics/ply-image.c
b/src/libply-splash-graphics/ply-image.c
index 9369242..4b16783 100644
--- a/src/libply-splash-graphics/ply-image.c
+++ b/src/libply-splash-graphics/ply-image.c
@@ -151,7 +151,7 @@ ply_image_load (ply_image_t *image)
png_set_palette_to_rgb (png);
if ((color_type == PNG_COLOR_TYPE_GRAY) && (bits_per_pixel < 8))
- png_set_gray_1_2_4_to_8 (png);
+ png_set_expand_gray_1_2_4_to_8 (png);
if (png_get_valid (png, info, PNG_INFO_tRNS))
png_set_tRNS_to_alpha (png);
--
1.7.2.3
------------------------------
Message: 2
Date: Wed, 13 Oct 2010 08:23:48 -0400
From: Ray Strode <[email protected]>
Subject: Re: [PATCH 1/2] populate-initrd: don't hardcode client and
daemon path
To: Brett Witherspoon <[email protected]>
Cc: [email protected]
Message-ID:
<[email protected]>
Content-Type: text/plain; charset=UTF-8
Hi,
On Mon, Oct 11, 2010 at 11:05 PM, Brett Witherspoon
<[email protected]> wrote:
> When not installing in system root, the populate initrd script would not
> install the client or daemon due to the paths being hardcoded.
> Environmental variables are also now available to override the defaults.
...
> The png_set_gray_1_2_4_to_8 function is deprecated and has been removed
> from libpng14. Now png_set_expand_gray_1_2_4_to_8 is used instead which
> is compatible with libpng-1.2.9 and greater.
Both pushed. Thanks.
--Ray
------------------------------
_______________________________________________
plymouth mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/plymouth
End of plymouth Digest, Vol 24, Issue 3
***************************************
