Generate PNG splash images from SVG files if available.

suites/ascii
Cyril Brulebois 13 years ago
parent 6762019668
commit 382ef43cd8
  1. 1
      build/Makefile
  2. 4
      build/config/hurd.cfg
  3. 4
      build/config/kfreebsd.cfg
  4. 4
      build/config/x86.cfg
  5. 4
      debian/changelog
  6. 2
      debian/control

@ -236,6 +236,7 @@ _list:
# Clean all targets.
.PHONY: reallyclean
reallyclean: all_clean
for png in $(shell awk -F= '/^SPLASH_PNG=/ {print $$2}' config/*.cfg); do if [ -f $${png%%.png}.svg ]; then rm -f $$png; fi; done
rm -rf $(APTDIR) $(APTDIR).udeb $(APTDIR).deb $(BASE_DEST) $(BASE_TMP) $(SOURCEDIR) $(DEBUGUDEBDIR)
rm -f sources.list sources.list.udeb $(LOCALUDEBDIR)/Packages.gz $(LOCALUDEBDIR)/Packages
rm -rf $(UDEBDIR) $(STAMPS)

@ -21,6 +21,7 @@ endef
# The image to use for a syslinux splash screen.
SPLASH_PNG=boot/hurd/pics/joy-hurd.png
SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The font to load in GRUB
GRUB_FONT=/usr/share/grub/ascii.pf2
@ -85,6 +86,9 @@ arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
cp $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
fi; \
cp $(SPLASH_PNG) $(TEMP_CD_TREE)/boot/grub/splash.png; \
fi

@ -3,6 +3,7 @@ INITRD_FS = ufs1
# The image to use for a syslinux splash screen.
SPLASH_PNG=boot/kfreebsd/pics/joy-kbsd.png
SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The font to load in GRUB
GRUB_FONT=/usr/share/grub/ascii.pf2
@ -36,6 +37,9 @@ arch_cd_info_dir:
cp $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/boot/grub/font.pf2; \
fi
if [ -n "$(SPLASH_PNG)" ]; then \
if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
fi; \
cp $(SPLASH_PNG) $(TEMP_CD_INFO_DIR)/boot/grub/splash.png; \
fi

@ -12,6 +12,7 @@ DOS_VOLUME_LABEL = "Debian Inst"
# The image to use for a syslinux splash screen.
SPLASH_PNG=boot/x86/pics/joy.png
SPLASH_SVG=$(patsubst %.png,%.svg,$(SPLASH_PNG))
# The directory boot screens for syslinux will go in.
BOOT_SCREEN_DIR =
@ -139,6 +140,9 @@ arch_boot_screens:
< $(SCREEN) > $(TEMP_BOOT_SCREENS)/`basename $(SCREEN)`\
;)
if [ -n "$(SPLASH_PNG)" ]; then \
if [ -n "$(SPLASH_SVG)" -a -f "$(SPLASH_SVG)" ]; then \
rsvg-convert $(SPLASH_SVG) > $(SPLASH_PNG); \
fi; \
cp $(SPLASH_PNG) $(TEMP_BOOT_SCREENS)/splash.png; \
fi

4
debian/changelog vendored

@ -12,6 +12,10 @@ debian-installer (20120829) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Apply patch from Paul Tagliamonte, updating the Joy pictures to use
the correct brand; the Debian logo is now DFSG free.
* When SPLASH_PNG is set, search for a matching SPLASH_SVG; if it's
found, call rsvg-convert to generate the PNG file. Clean those on
reallyclean. Add librsvg2-bin build-dep for rsvg-convert, restricted
to any-{amd64,i386} (splash is used on x86, kfreebsd, and hurd).
-- Samuel Thibault <sthibault@debian.org> Sat, 15 Sep 2012 00:47:54 +0200

2
debian/control vendored

@ -158,6 +158,8 @@ Build-Depends:
# Used by grub-pc to create the CD-ROM images
debian-ports-archive-keyring [sh4 sparc64],
# Used for architectures hosted on debian-ports.org
librsvg2-bin [any-amd64 any-i386],
# Used to convert splash SVG to splash PNG during build
Package: debian-installer
Architecture: any

Loading…
Cancel
Save