[debian-edu-commits] debian-edu/ 188/437: Add rules to build grub splash image. This do not work properly because of bug #477791 in update-grub.

Mike Gabriel sunweaver at debian.org
Sun Mar 2 23:49:35 UTC 2014 

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit d2e2a85020d9aa6b6c4065d9d0d6d11c9985b7fa
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat May 17 08:36:36 2008 +0000

    Add rules to build grub splash image.  This do not work properly
    because of bug #477791 in update-grub.
---
 art/splash/Makefile.am | 34 +++++++++++++----------
 art/splash/Makefile.in | 73 ++++++++++++++++++++++++++++++++++----------------
 art/splash/README      | 10 +++++++
 debian/changelog       |  8 ++++++
 4 files changed, 88 insertions(+), 37 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 4f21e41..e8487fd 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -1,31 +1,37 @@
 SPLASH = debian-edu-splash.png debian-edu-splash-live.png
 
-XPMS = $(SPLASH:.png=.xpm)
-XPMGZS = $(SPLASH:.png=.xpm.gz)
-
 RLES = $(SPLASH:.png=.rle)
 
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
 
+XPMS = splash-debian-edu.xpm
+XPMGZS = $(XPMS:.xpm=.xpm.gz)
+
 grubdir       = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
+grubsplash_DATA = $(XPMGZS)
 
 #BUILT_SOURCES = $(XPMGZS) $(RLES)
 
-install-data-local: $(XPMGZS)
-	$(mkinstalldirs) $(DESTDIR)$(splashdir)
-
-# Make it available as a grub splash image, detected and used by update-grub
-# This do not quite work yes.
-#	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
-#	for file in $(XPMGZS) ; do \
-#	  $(INSTALL_DATA) $$file $(DESTDIR)$(grubsplashdir)/$$file ; \
-#	done
-#	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
-
 SUFFIXES = .png .rle .xpm .xpm.gz
 
+install-data-local: $(XPMGZS)
+	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
+
+# Make it available as a grub splash image, detected and used by update-grub.
+# Not sure how to enable this properly, to avoid conflicts with other grub image packages.
+# This do not work properly because of #477791.
+	ln -s splashimages/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
+
+# Generate grub image from usplash image for now.  Need to be XPM, 14 colors,
+# 640x480 pixels.  Compression is optional but speed up the boot with modern machines.
+splash-debian-edu.xpm:
+	$(MAKE) -C ../usplash background_640x480.png
+	convert -colors 14 ../usplash/background_640x480.png splash-debian-edu.xpm
+splash-debian-edu.xpm.gz: splash-debian-edu.xpm
+	gzip -9 < $^ > $@
+
 .png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
 .png.xpm:
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 941bfba..81f5836 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -46,9 +46,11 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(splashdir)"
+am__installdirs = "$(DESTDIR)$(grubsplashdir)" \
+	"$(DESTDIR)$(splashdir)"
+grubsplashDATA_INSTALL = $(INSTALL_DATA)
 splashDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(splash_DATA)
+DATA = $(grubsplash_DATA) $(splash_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -136,21 +138,16 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SPLASH = debian-edu-splash.png debian-edu-splash-live.png
-XPMS = $(SPLASH:.png=.xpm)
-XPMGZS = $(SPLASH:.png=.xpm.gz)
 RLES = $(SPLASH:.png=.rle)
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
+XPMS = splash-debian-edu.xpm
+XPMGZS = $(XPMS:.xpm=.xpm.gz)
 grubdir = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
+grubsplash_DATA = $(XPMGZS)
 
-# Make it available as a grub splash image, detected and used by update-grub
-# This do not quite work yes.
-#	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
-#	for file in $(XPMGZS) ; do \
-#	  $(INSTALL_DATA) $$file $(DESTDIR)$(grubsplashdir)/$$file ; \
-#	done
-#	ln -s $(grubsplashdir)/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
+#BUILT_SOURCES = $(XPMGZS) $(RLES)
 SUFFIXES = .png .rle .xpm .xpm.gz
 EXTRA_DIST = $(splash_DATA)
 CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
@@ -187,6 +184,23 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-grubsplashDATA: $(grubsplash_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(grubsplashdir)" || $(MKDIR_P) "$(DESTDIR)$(grubsplashdir)"
+	@list='$(grubsplash_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(grubsplashDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(grubsplashdir)/$$f'"; \
+	  $(grubsplashDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(grubsplashdir)/$$f"; \
+	done
+
+uninstall-grubsplashDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(grubsplash_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(grubsplashdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(grubsplashdir)/$$f"; \
+	done
 install-splashDATA: $(splash_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(splashdir)" || $(MKDIR_P) "$(DESTDIR)$(splashdir)"
@@ -241,7 +255,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(splashdir)"; do \
+	for dir in "$(DESTDIR)$(grubsplashdir)" "$(DESTDIR)$(splashdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -287,7 +301,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-splashDATA
+install-data-am: install-data-local install-grubsplashDATA \
+	install-splashDATA
 
 install-dvi: install-dvi-am
 
@@ -321,7 +336,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-splashDATA
+uninstall-am: uninstall-grubsplashDATA uninstall-splashDATA
 
 .MAKE: install-am install-strip
 
@@ -329,18 +344,30 @@ uninstall-am: uninstall-splashDATA
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
 	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-splashDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-splashDATA
+	install-exec-am install-grubsplashDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-splashDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-grubsplashDATA uninstall-splashDATA
 
 
-#BUILT_SOURCES = $(XPMGZS) $(RLES)
-
 install-data-local: $(XPMGZS)
-	$(mkinstalldirs) $(DESTDIR)$(splashdir)
+	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
+
+# Make it available as a grub splash image, detected and used by update-grub.
+# Not sure how to enable this properly, to avoid conflicts with other grub image packages.
+# This do not work properly because of #477791.
+	ln -s splashimages/splash.xpm.gz  $(DESTDIR)$(grubdir)/splash.xpm.gz ;
+
+# Generate grub image from usplash image for now.  Need to be XPM, 14 colors,
+# 640x480 pixels.  Compression is optional but speed up the boot with modern machines.
+splash-debian-edu.xpm:
+	$(MAKE) -C ../usplash background_640x480.png
+	convert -colors 14 ../usplash/background_640x480.png splash-debian-edu.xpm
+splash-debian-edu.xpm.gz: splash-debian-edu.xpm
+	gzip -9 < $^ > $@
 
 .png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
diff --git a/art/splash/README b/art/splash/README
index 0fb1a3a..62623eb 100644
--- a/art/splash/README
+++ b/art/splash/README
@@ -26,3 +26,13 @@ The PNG passed to debian-cd is processed like this:
 
   pngtopnm < splash.png | ppmquant 16 | \
     ppmtolss16 "#ffffff=7" "#000000=0" > splash.rle
+
+grub splash image
+=================
+
+This image is used when the system boots, to have a backdrop behind the grub menu.
+
+The image need to be XPM, 640x480 with 14 colors and is made available as
+/boot/grub/splash.xpm.gz for update-grub to find.
+
+See <URL: http://ruslug.rutgers.edu/~mcgrof/grub-images/ > for an howto.
diff --git a/debian/changelog b/debian/changelog
index 0c1e100..2214287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-artwork (0.0.28) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Add rules to build grub splash image.  This do not work properly
+    because of bug #477791 in update-grub.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 17 May 2008 10:20:15 +0200
+
 debian-edu-artwork (0.0.27) unstable; urgency=low
 
   [ Holger Levsen ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git

More information about the debian-edu-commits mailing list