Marco Gerards <[EMAIL PROTECTED]> writes: > Marco Gerards <[EMAIL PROTECTED]> writes: > >> Roger Leigh <[EMAIL PROTECTED]> writes: >> >>> If this requires copyright assignment, I'll be happy to assign >>> copyright for this and all future work to the FSF. >> >> No, I do not think so. I think this patch and your other patch are >> both small enough. But if you expect you will continue to make >> contributions, as part of your work for Debian, it might be wise to >> start the copyright assignment process already. >> >> I will wait a bit with committing this patch to give other developers >> a chance to reply. I know way too little about the build system to >> comment. > > BTW, can you supply ChangeLog entries for your patches?
I've attached a new copy of the patch with a full changelog entry. Regards, Roger -- Roger Leigh Printing on GNU/Linux? http://gutenprint.sourceforge.net/ Debian GNU/Linux http://www.debian.org/ GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
? build Index: ChangeLog =================================================================== RCS file: /sources/grub/grub2/ChangeLog,v retrieving revision 1.231 diff -u -r1.231 ChangeLog --- ChangeLog 2 Apr 2006 08:53:31 -0000 1.231 +++ ChangeLog 13 Apr 2006 09:41:45 -0000 @@ -1,3 +1,27 @@ +2006-04-13 Roger Leigh <[EMAIL PROTECTED]> + + * util/powerpc/ieee1275/grub-mkimage.c: Use GRUB_LIBDIR in place + of GRUB_DATADIR. + + * util/powerpc/ieee1275/grub-install.in: Define pkglibdir, and use + this location of .mod and .lst files in place of pkgdatadir. + + * util/i386/pc/grub-mkimage.c: Use GRUB_LIBDIR in place of + GRUB_DATADIR. + + * util/i386/pc/grub-install.in Define pkglibdir, and use this + location of .mod, .lst and .img files in place of pkgdatadir. + + * Makefile.in + (pkgdatadir): Define as $(datadir)/@PACKAGE_TARNAME@, to be used + for architecture-independent data. + (pkglibdir): Define as + $(libdir)/@PACKAGE_TARNAME@/$(host_cpu)-$(host_vendor), to be used + for architecture dependent data and modules. + (BUILD_CPPFLAGS): Define GRUB_LIBDIR rather than GRUB_DATADIR. + (install-local): Install modules into $(pkglibdir) rather than + $(pkgdatadir). + 2006-04-02 Yoshinori K. Okuji <[EMAIL PROTECTED]> * configure.ac: Add support for EFI. Fix the typo Index: Makefile.in =================================================================== RCS file: /sources/grub/grub2/Makefile.in,v retrieving revision 1.17 diff -u -r1.17 Makefile.in --- Makefile.in 3 Jan 2006 17:58:02 -0000 1.17 +++ Makefile.in 13 Apr 2006 09:41:45 -0000 @@ -34,8 +34,8 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ -pkgdatadir = $(datadir)/@PACKAGE_TARNAME@/$(host_cpu)-$(host_vendor) -pkglibdir = $(libdir)/@PACKAGE_TARNAME@ +pkgdatadir = $(datadir)/@PACKAGE_TARNAME@ +pkglibdir = $(libdir)/@PACKAGE_TARNAME@/$(host_cpu)-$(host_vendor) PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -60,7 +60,7 @@ BUILD_CC = @BUILD_CC@ BUILD_CFLAGS = -g -O2 BUILD_CPPFLAGS = -I. -Iinclude -I$(srcdir)/include -Wall -W \ - -DGRUB_DATADIR=\"$(pkgdatadir)\" + -DGRUB_LIBDIR=\"$(pkglibdir)\" OBJCOPY = @OBJCOPY@ STRIP = @STRIP@ NM = @NM@ @@ -119,12 +119,12 @@ install: install-local install-local: all - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) @list='$(DATA)'; \ for file in $$list; do \ if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \ dest="`echo $$file | sed 's,.*/,,'`"; \ - $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \ + $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \ done $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_UTILITIES)'; for file in $$list; do \ @@ -151,7 +151,7 @@ @list='$(DATA)'; \ for file in $$list; do \ dest="`echo $$file | sed 's,.*/,,'`"; \ - rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \ + rm -f $(DESTDIR)$(pkglibdir)/$$dest; \ done @list='$(bin_UTILITIES)'; for file in $$list; do \ dest="`echo $$file | sed 's,.*/,,'`"; \ Index: util/i386/pc/grub-install.in =================================================================== RCS file: /sources/grub/grub2/util/i386/pc/grub-install.in,v retrieving revision 1.5 diff -u -r1.5 grub-install.in --- util/i386/pc/grub-install.in 25 Jan 2006 00:11:36 -0000 1.5 +++ util/i386/pc/grub-install.in 13 Apr 2006 09:41:46 -0000 @@ -22,13 +22,15 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor} +pkgdatadir=${datadir}/${PACKAGE_TARNAME} +pkglibdir=${libdir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor} grub_setup=${sbindir}/grub-setup grub_mkimage=${sbindir}/grub-mkimage @@ -202,7 +204,7 @@ rm -f $file || exit 1 fi done -for file in ${pkgdatadir}/*.mod ${pkgdatadir}/*.lst ${pkgdatadir}/*.img; do +for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst ${pkglibdir}/*.img; do cp -f $file ${grubdir} || exit 1 done Index: util/i386/pc/grub-mkimage.c =================================================================== RCS file: /sources/grub/grub2/util/i386/pc/grub-mkimage.c,v retrieving revision 1.8 diff -u -r1.8 grub-mkimage.c --- util/i386/pc/grub-mkimage.c 8 Aug 2005 23:15:21 -0000 1.8 +++ util/i386/pc/grub-mkimage.c 13 Apr 2006 09:41:46 -0000 @@ -205,7 +205,7 @@ -v, --verbose print verbose messages\n\ \n\ Report bugs to <%s>.\n\ -", GRUB_DATADIR, PACKAGE_BUGREPORT); +", GRUB_LIBDIR, PACKAGE_BUGREPORT); exit (status); } @@ -267,7 +267,7 @@ grub_util_error ("cannot open %s", output); } - generate_image (dir ? : GRUB_DATADIR, fp, argv + optind); + generate_image (dir ? : GRUB_LIBDIR, fp, argv + optind); fclose (fp); Index: util/powerpc/ieee1275/grub-install.in =================================================================== RCS file: /sources/grub/grub2/util/powerpc/ieee1275/grub-install.in,v retrieving revision 1.3 diff -u -r1.3 grub-install.in --- util/powerpc/ieee1275/grub-install.in 23 Nov 2005 05:25:38 -0000 1.3 +++ util/powerpc/ieee1275/grub-install.in 13 Apr 2006 09:41:46 -0000 @@ -25,13 +25,15 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor} +pkgdatadir=${datadir}/${PACKAGE_TARNAME} +pkglibdir=${libdir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor} grub_mkimage=${sbindir}/grub-mkimage rootdir= @@ -138,14 +140,14 @@ rm -f $file || exit 1 fi done -for file in ${pkgdatadir}/*.mod ${pkgdatadir}/*.lst ; do +for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst ; do cp -f $file ${grubdir} || exit 1 done # Create the core image with all modules, unless user specified a subset. # XXX probe for partition map and filesystem? if test "x$modules" = x; then - modules="$pkgdatadir"/*.mod + modules="$pkglibdir"/*.mod fi # Now perform the installation. Index: util/powerpc/ieee1275/grub-mkimage.c =================================================================== RCS file: /sources/grub/grub2/util/powerpc/ieee1275/grub-mkimage.c,v retrieving revision 1.4 diff -u -r1.4 grub-mkimage.c --- util/powerpc/ieee1275/grub-mkimage.c 3 Nov 2005 05:05:05 -0000 1.4 +++ util/powerpc/ieee1275/grub-mkimage.c 13 Apr 2006 09:41:46 -0000 @@ -278,7 +278,7 @@ -v, --verbose print verbose messages\n\ \n\ Report bugs to <%s>.\n\ -", GRUB_DATADIR, PACKAGE_BUGREPORT); +", GRUB_LIBDIR, PACKAGE_BUGREPORT); exit (status); } @@ -336,7 +336,7 @@ if (! fp) grub_util_error ("cannot open %s", output); - add_segments (dir ? : GRUB_DATADIR, fp, chrp, argv + optind); + add_segments (dir ? : GRUB_LIBDIR, fp, chrp, argv + optind); fclose (fp);
pgppIPp07tV72.pgp
Description: PGP signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel