From 27c2b6f7b867984e5a77a620172061144132e9f8 Mon Sep 17 00:00:00 2001 From: Felix Zielcke Date: Fri, 25 Dec 2009 23:19:40 +0100 Subject: [PATCH] * New Bazaar snapshot. - Fix slowness when $prefix uses the (UUID=) hack. (Closes: #541145, LP: #420933) --- ChangeLog | 5 +++++ debian/changelog | 7 ++++++- genmk.rb | 2 +- util/grub-mkrescue.in | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56c660494..9ff97be39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-12-22 Felix Zielcke + + * util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@. + * genmk.rb (class SCRIPT): Modify the target file instead of source. + 2009-12-22 Felix Zielcke * genmk.rb (class SCRIPT): Prepend #{src} path with $(srcdir). diff --git a/debian/changelog b/debian/changelog index d7df0dbe7..8192d5d2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ grub2 (1.98~20091222-2) unstable; urgency=low + * New Bazaar snapshot. + - Fix slowness when $prefix uses the (UUID=) hack. + (Closes: #541145, LP: #420933) + + [ Robert Millan ] * grub-rescue-pc.postinst: Build USB rescue image. * rules: Invoke configure with relative path. This makes binaries smaller, since dprintf strings are constructed using this path. - -- Robert Millan Thu, 24 Dec 2009 14:56:04 +0100 + -- Felix Zielcke Fri, 25 Dec 2009 23:19:06 +0100 grub2 (1.98~20091222-1) unstable; urgency=low diff --git a/genmk.rb b/genmk.rb index 5381aebf5..b3dbe8678 100644 --- a/genmk.rb +++ b/genmk.rb @@ -363,8 +363,8 @@ class Script "CLEANFILES += #{@name} #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status - sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $(srcdir)/#{src} ./config.status --file=#{name}:#{src} + sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $@ chmod +x $@ " diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index c56525c10..6b3c9ecb8 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -28,7 +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" +pkglib_DATA="@pkglib_DATA@" coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc -- 2.39.5