From: Felix Zielcke <fzielcke@z-51.de>
Date: Tue, 22 Dec 2009 11:12:51 +0000 (+0100)
Subject: 2009-12-22 Felix Zielcke <fzielcke@z-51.de>
X-Git-Tag: 1.98~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10a8879783af11894dda453e4843317e43788e2a;p=thirdparty%2Fgrub.git

2009-12-22 Felix Zielcke <fzielcke@z-51.de>

	* genmk.rb (class SCRIPT): Use sed to substitute @pkglib_DATA@
	with the actual contents of the correspondending make variable.
	* util/grub-mkrescue.in (pkglib_DATA): New variable.
	(process_input_dir): Copy all $pkglib_DATA files instead of explicitly
	specifying `*.lst' and `efiemu??.o'
---

diff --git a/ChangeLog b/ChangeLog
index e0464e965..11414095d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-22 Felix Zielcke <fzielcke@z-51.de>
+
+	* genmk.rb (class SCRIPT): Use sed to substitute @pkglib_DATA@
+	with the actual contents of the correspondending make variable.
+	* util/grub-mkrescue.in (pkglib_DATA): New variable.
+	(process_input_dir): Copy all $pkglib_DATA files instead of explicitly
+	specifying `*.lst' and `efiemu??.o'
+
 2009-12-22 Felix Zielcke <fzielcke@z-51.de>
 
 	* util/grub.d/30_os-prober.in (osx_entry): Add round brackets
diff --git a/genmk.rb b/genmk.rb
index 127b8096b..91a20b7e4 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -363,6 +363,7 @@ class Script
     "CLEANFILES += #{@name}
 
 #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
+	sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' #{src}
 	./config.status --file=#{name}:#{src}
 	chmod +x $@
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index fd3a86c95..c56525c10 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -28,6 +28,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 native_platform=@platform@
+pkglib_DATA="efiemu32.o efiemu64.o moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst"
 
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
@@ -93,12 +94,16 @@ process_input_dir ()
     input_dir="$1"
     platform="$2"
     mkdir -p ${iso9660_dir}/boot/grub/${target_cpu}-${platform}
-    for file in ${input_dir}/*.mod ${input_dir}/efiemu??.o \
-        ${input_dir}/*.lst; do
+    for file in ${input_dir}/*.mod; do
         if test -f "$file"; then
             cp -f "$file" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
         fi
     done
+    for file in ${pkglib_DATA}; do
+	if test -f "${input_dir}/${file}"; then
+            cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
+	fi
+    done
 
     mkdir -p ${iso9660_dir}/boot/grub/locale
     for file in ${input_dir}/po/*.mo; do