[patch] The modified patch needed for splashutils-1.5.4.3-r4.ebuild that fixes the copying of initrd.splash where necessary

splashutils-1.5.4.3-splash_geninitramfs.patch (text/plain), 1.44 KB, created by PhobosK on 2011-02-08 21:06:31 UTC

--- a/core/scripts/splash_geninitramfs.in	2008-11-13 21:54:19.000000000 +0200
+++ b/core/scripts/splash_geninitramfs.in	2011-02-08 21:16:10.752981002 +0200
@@ -64,6 +64,7 @@
 declare -a themes
 mode="h"
 splash_hlp="@sbindir@/fbcondecor_helper"
+splash_initrd="@PACKAGE_DATA_DIR@/initrd.splash"
 res=""
 overlay=""
 verbose=0
@@ -149,7 +150,7 @@
 fi
 
 printv "o Creating directory structure.."
-mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,lib/splash/proc,root,sbin,lib/splash/sys}
+mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys}
 
 if [ $EUID == 0 ]; then
 	[[ ! -e "${imgdir}/dev/null" ]] 	&& mknod "${imgdir}/dev/null" c 1 3
@@ -169,6 +170,11 @@
 cp "${splash_hlp}" "${imgdir}@sbindir@"
 ln -sf "${splash_hlp}" "${imgdir}@sbindir@/splash_helper"
 
+if [ ! -e "${imgdir}@sysconfdir@/initrd.splash" ] && [ -e ${splash_initrd} ]; then
+	printv "o Copying ${splash_initrd}.."
+	cp "${splash_initrd}" "${imgdir}@sysconfdir@"
+fi
+
 res=${res//,/ }
 
 printv "o Copying themes.."
--- a/core/scripts/Makefile.am    2008-11-13 21:54:19.000000000 +0200
+++ b/core/scripts/Makefile.am 2011-02-08 21:46:03.682684914 +0200
@@ -13,6 +13,7 @@
 	$(Q)rm -f $@
 	$(Q)cat $< | $(SED) \
 		-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
+		-e 's|@PACKAGE_DATA_DIR[@]|$(pkgdatadir)|g' \
 		-e 's|@bindir[@]|$(eexecbindir)|g' \
 		-e 's|@sbindir[@]|$(eexecsbindir)|g' \
 		-e 's|@sysconfdir[@]|$(sysconfdir)|g' \