diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 15:35:00 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 17:41:03 +0200 |
commit | 759d67dfff6c863d117c114597dae95e6f91d970 (patch) | |
tree | bf04c1d2ec7a95f5cbf81b1a4d0246a26b7708bf /patches | |
parent | 98f7ec95ab8da7945cc9759b897b8cb8e6ba2ee5 (diff) | |
download | ptxdist-759d67dfff6c863d117c114597dae95e6f91d970.tar.gz ptxdist-759d67dfff6c863d117c114597dae95e6f91d970.tar.xz |
splashutils: remove after more than one year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
l--------- | patches/splashutils-1.5.4.3/autogen.sh | 1 | ||||
-rw-r--r-- | patches/splashutils-1.5.4.3/cache-in-tmpfs.diff | 41 | ||||
-rw-r--r-- | patches/splashutils-1.5.4.3/change-defaults.diff | 45 | ||||
-rw-r--r-- | patches/splashutils-1.5.4.3/fallback-fb.diff | 26 | ||||
-rw-r--r-- | patches/splashutils-1.5.4.3/fix-build.diff | 23 | ||||
-rw-r--r-- | patches/splashutils-1.5.4.3/series | 4 |
6 files changed, 0 insertions, 140 deletions
diff --git a/patches/splashutils-1.5.4.3/autogen.sh b/patches/splashutils-1.5.4.3/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/splashutils-1.5.4.3/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/splashutils-1.5.4.3/cache-in-tmpfs.diff b/patches/splashutils-1.5.4.3/cache-in-tmpfs.diff deleted file mode 100644 index 53b4b7896..000000000 --- a/patches/splashutils-1.5.4.3/cache-in-tmpfs.diff +++ /dev/null @@ -1,41 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: move cachedir to /var/run/splash/ - -fbsplash needs a writeable cachedir. This patch moves it -to a location that is on tmpfs in ptxdist. -Not for upstream. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - scripts/splash-functions.sh.in | 4 ++-- - src/fbsplash.h.in | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Index: b/scripts/splash-functions.sh.in -=================================================================== ---- a/scripts/splash-functions.sh.in -+++ b/scripts/splash-functions.sh.in -@@ -22,8 +22,8 @@ - # default value. - export spl_cachesize="4096" - export spl_cachetype="tmpfs" --export spl_cachedir="@libdir@/splash/cache" --export spl_tmpdir="@libdir@/splash/tmp" -+export spl_cachedir="/var/run/splash/cache" -+export spl_tmpdir="/var/run/splash/tmp" - export spl_fifo="${spl_cachedir}/.splash" - export spl_pidfile="${spl_cachedir}/daemon.pid" - export spl_util="@bindir@/splash_util.static" -Index: b/src/fbsplash.h.in -=================================================================== ---- a/src/fbsplash.h.in -+++ b/src/fbsplash.h.in -@@ -7,7 +7,7 @@ - #include <linux/input.h> - - #define FBSPLASH_DIR "@libdir@/splash" --#define FBSPLASH_CACHEDIR FBSPLASH_DIR"/cache" -+#define FBSPLASH_CACHEDIR "/var/run/splash/cache" - #define FBSPLASH_PIDFILE FBSPLASH_CACHEDIR"/daemon.pid" - #define FBSPLASH_PROFILE FBSPLASH_CACHEDIR"/profile" - #define FBSPLASH_DAEMON "@sbindir@/fbsplashd.static" diff --git a/patches/splashutils-1.5.4.3/change-defaults.diff b/patches/splashutils-1.5.4.3/change-defaults.diff deleted file mode 100644 index b49013135..000000000 --- a/patches/splashutils-1.5.4.3/change-defaults.diff +++ /dev/null @@ -1,45 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: change defaults - -* Enable by default. -* Theme and message from ptxconfig -Not for upstream. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - scripts/splash-functions.sh.in | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -Index: b/scripts/splash-functions.sh.in -=================================================================== ---- a/scripts/splash-functions.sh.in -+++ b/scripts/splash-functions.sh.in -@@ -137,15 +137,15 @@ splash_setup() { - fi - - export SPLASH_EFFECTS="" -- export SPLASH_SANITY="" -+ export SPLASH_SANITY="insane" - export SPLASH_TEXTBOX="no" -- export SPLASH_MODE_REQ="off" -+ export SPLASH_MODE_REQ="silent" - export SPLASH_PROFILE="off" -- export SPLASH_THEME="default" -+ export SPLASH_THEME="@PTXCONF_SPLASHUTILS_THEME@" - export SPLASH_TTY="16" - export SPLASH_KDMODE="TEXT" - export SPLASH_AUTOVERBOSE="0" -- export SPLASH_BOOT_MESSAGE="Booting the system (\$progress%)... Press F2 for verbose mode." -+ export SPLASH_BOOT_MESSAGE="@PTXCONF_SPLASHUTILS_BOOTMSG@" - export SPLASH_SHUTDOWN_MESSAGE="Shutting down the system (\$progress%)... Press F2 for verbose mode." - export SPLASH_REBOOT_MESSAGE="Rebooting the system (\$progress%)... Press F2 for verbose mode." - export SPLASH_XSERVICE="xdm" -@@ -261,8 +261,6 @@ splash_start() { - - splash_comm_send "set autoverbose ${SPLASH_AUTOVERBOSE}" - -- splash_set_event_dev -- - return 0 - } - diff --git a/patches/splashutils-1.5.4.3/fallback-fb.diff b/patches/splashutils-1.5.4.3/fallback-fb.diff deleted file mode 100644 index 7a2632fd5..000000000 --- a/patches/splashutils-1.5.4.3/fallback-fb.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: use /dev/fb0 if no framebuffer is associated with the tty - -Usually in ptxdist the only used tty is the serial console. -Detecting the correct framebuffer from tty0 does not work. -This patch adds a fallback to fb0. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/libfbsplashrender.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: b/src/libfbsplashrender.c -=================================================================== ---- a/src/libfbsplashrender.c -+++ b/src/libfbsplashrender.c -@@ -89,6 +89,9 @@ static int fb_init(int tty, bool create) - - ioctl(fd_fb0, FBIOGET_CON2FBMAP, &con2fb); - -+ if (con2fb.framebuffer == -1) -+ con2fb.framebuffer = 0; -+ - if (con2fb.framebuffer == fb) - return 0; - diff --git a/patches/splashutils-1.5.4.3/fix-build.diff b/patches/splashutils-1.5.4.3/fix-build.diff deleted file mode 100644 index d06bddf91..000000000 --- a/patches/splashutils-1.5.4.3/fix-build.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: don't try to build not included libs - -splashutils wants to build its own libpng, libjpeg, etc. -This patch drops the subdir. As a result splashutils will -link against the libs provided by ptxdist. -Not for upstream. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = libs src docs misc scripts -+SUBDIRS = src docs misc scripts - ACLOCAL_AMFLAGS = -I m4 - - include common.mk diff --git a/patches/splashutils-1.5.4.3/series b/patches/splashutils-1.5.4.3/series deleted file mode 100644 index 072240c3c..000000000 --- a/patches/splashutils-1.5.4.3/series +++ /dev/null @@ -1,4 +0,0 @@ -fallback-fb.diff -cache-in-tmpfs.diff -change-defaults.diff -fix-build.diff |