From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Mg3Ks-0006ur-QM for mharc-grub-devel@gnu.org; Tue, 25 Aug 2009 17:13:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mg3Kr-0006tb-B8 for grub-devel@gnu.org; Tue, 25 Aug 2009 17:13:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mg3Km-0006ou-TC for grub-devel@gnu.org; Tue, 25 Aug 2009 17:13:44 -0400 Received: from [199.232.76.173] (port=39589 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mg3Km-0006or-KT for grub-devel@gnu.org; Tue, 25 Aug 2009 17:13:40 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:54355 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mg3Kk-0001sa-VA for grub-devel@gnu.org; Tue, 25 Aug 2009 17:13:40 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1Mg3KQ-0000FH-2C for grub-devel@gnu.org; Tue, 25 Aug 2009 23:13:18 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1Mg3KP-00066e-G7 for grub-devel@gnu.org; Tue, 25 Aug 2009 23:13:17 +0200 Date: Tue, 25 Aug 2009 23:13:17 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090825211317.GA23440@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Remove framework for external modules X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2009 21:13:45 -0000 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline My bad... When I proposed adding a framework for building GRUB modules externally, I was expecting it would end up being used. I had grub-extras in mind. But it became much simpler and straightforwarded to build grub-extras by overlaiing it into GRUB tree and doing a one-line change in GRUB Makefile.in. So I wonder if there's anyone reliing on this. I believe there isn't, and I noticed that it's a nuissance because it installs headers in /usr/include which may later be dragged in to a newer version of GRUB, causing breakage. So I admit having a bad idea and propose to undo it. Maintaining features is costly, we should only maintain features that are useful. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --UugvWAfsgieZRqgk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="remove_external_module_framework.diff" 2009-08-25 Robert Millan * Makefile.in (PKGLIB): Remove $(pkglib_BUILDDIR). (pkglib_BUILDDIR): Remove. (build_env.mk): Remove. (include_DATA): Remove. (install-local): Stop installing $(include_DATA) files in $(includedir). Index: Makefile.in =================================================================== --- Makefile.in (revision 2531) +++ Makefile.in (working copy) @@ -117,7 +117,7 @@ MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES)) PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \ - $(pkglib_DATA) $(pkglib_BUILDDIR) + $(pkglib_DATA) PKGDATA = $(pkgdata_DATA) PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES) SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \ @@ -186,26 +186,6 @@ endif endif -# Used for building modules externally -pkglib_BUILDDIR += build_env.mk -build_env.mk: Makefile - (\ - echo "TARGET_CC=$(TARGET_CC)" ; \ - echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \ - echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \ - echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \ - echo "STRIP=$(STRIP)" ; \ - echo "OBJCONV=$(OBJCONV)" ; \ - echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \ - echo "TARGET_APPLE_CC=$(TARGET_APPLE_CC)" ; \ - echo "COMMON_ASFLAGS=$(COMMON_ASFLAGS)" ; \ - echo "COMMON_CFLAGS=$(COMMON_CFLAGS)" ; \ - echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\ - ) > $@ -pkglib_BUILDDIR += config.h grub_script.tab.h -include_DATA += $(shell find $(srcdir)/include -name \*.h | sed -e "s,^$(srcdir)/,,g") \ - include/grub/cpu include/grub/machine - all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES) install: install-local @@ -219,20 +199,6 @@ dest="`echo $$file | sed 's,.*/,,'`"; \ $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \ done - $(SHELL) $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_DATA)'; \ - for file in $$list; do \ - if test -e "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ - dest="`echo $$file | sed 's,include/,,'`"; \ - destdir="`echo $$dest | sed 's,[^/]*$$,,g'`"; \ - $(SHELL) $(mkinstalldirs) $(DESTDIR)$(includedir)/$$destdir; \ - if test -f "$$dir$$file"; then \ - $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \ - elif test -L "$$dir$$file"; then \ - rm -rf $(DESTDIR)$(includedir)/$$dest && \ - cp -fR $$dir$$file $(DESTDIR)$(includedir)/$$dest; \ - fi; \ - done $(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(PKGDATA)'; \ for file in $$list; do \ @@ -313,11 +279,6 @@ dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ done - @list='$(include_DATA)'; \ - for file in $$list; do \ - dest="`echo $$file | sed 's,include/,,'`"; \ - rm -f $(DESTDIR)$(includedir)/$$dest; \ - done @list='$(lib_SCRIPTS)'; \ for file in $$list; do \ dest="`echo $$file | sed 's,.*/,,'`"; \ --UugvWAfsgieZRqgk--