From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1SRep8-00049i-La for mharc-grub-devel@gnu.org; Tue, 08 May 2012 03:27:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRTFY-0007q3-Sg for grub-devel@gnu.org; Mon, 07 May 2012 15:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRTFW-00066K-Uq for grub-devel@gnu.org; Mon, 07 May 2012 15:05:36 -0400 Received: from mga11.intel.com ([192.55.52.93]:48755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRTFW-000663-Oj for grub-devel@gnu.org; Mon, 07 May 2012 15:05:34 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 07 May 2012 12:05:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="163057484" Received: from nbuild0.sc.intel.com ([172.25.110.36]) by fmsmga002.fm.intel.com with ESMTP; 07 May 2012 12:05:29 -0700 Date: Mon, 7 May 2012 12:05:29 -0700 From: Nitin A Kamble To: grub-devel@gnu.org Subject: fix build of grub with automake 1.12 Message-ID: <20120507190529.GA22264@nbuild0.sc.intel.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="OXfL5xGRrasGEqWY" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 X-Mailman-Approved-At: Tue, 08 May 2012 03:27:04 -0400 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 19:05:38 -0000 --OXfL5xGRrasGEqWY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached patch fixes build of grub with automake 1.12 -- Nitin A Kamble www.yoctoproject.org --OXfL5xGRrasGEqWY Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="grub-1.99_fix_for_automake_1.11.2.patch" Upstream-Status: Pending Fixes these errors observed with automake 1.11.2 The useof pkglibhas become more strict compared to the earlier release of automake resulting in these failures. Fixed the files related to automake to avoid the issue. | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' | grub-core/Makefile.am:5: `conf/Makefile.common' included from here | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' | Makefile.am:6: `conf/Makefile.common' included from here | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed. | conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' | grub-core/Makefile.am:5: `conf/Makefile.common' included from here | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' | grub-core/Makefile.am:5: `conf/Makefile.common' included from here | conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' | Makefile.am:6: `conf/Makefile.common' included from here | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' | Makefile.am:6: `conf/Makefile.common' included from here | autoreconf: automake failed with exit status: 1 Signed-Off-By: Nitin A Kamble 2012/01/12 Index: grub-1.99/conf/Makefile.common =================================================================== --- grub-1.99.orig/conf/Makefile.common +++ grub-1.99/conf/Makefile.common @@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = man_MANS = noinst_DATA = -pkglib_DATA = +pkgdata_DATA = bin_SCRIPTS = sbin_SCRIPTS = bin_PROGRAMS = @@ -147,7 +147,7 @@ check_SCRIPTS = grubconf_DATA = check_PROGRAMS = noinst_SCRIPTS = -pkglib_SCRIPTS = +pkglibexec_SCRIPTS = noinst_PROGRAMS = grubconf_SCRIPTS = noinst_LIBRARIES = Index: grub-1.99/Makefile.am =================================================================== --- grub-1.99.orig/Makefile.am +++ grub-1.99/Makefile.am @@ -101,8 +101,8 @@ CLEANFILES += widthspec.h # Install config.h into platformdir platform_HEADERS = config.h -pkglib_DATA += grub-mkconfig_lib -pkglib_DATA += update-grub_lib +pkgdata_DATA += grub-mkconfig_lib +pkgdata_DATA += update-grub_lib if COND_i386_coreboot Index: grub-1.99/gentpl.py =================================================================== --- grub-1.99.orig/gentpl.py +++ grub-1.99/gentpl.py @@ -440,7 +440,7 @@ def script(platform): r += "[+ ENDIF +]" r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ -$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ +$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ chmod a+x [+ name +] """) --OXfL5xGRrasGEqWY--