[PATCH 1/2] Remove unused grub-0.93.

[PATCH 1/2] Remove unused grub-0.93.

[Michael Smith]

As far as I can tell, only the wrap board and gpe-phone-image are using
grub, and they use the default version, 0.97.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub-0.93/autohell.patch |  166 ---------------------------------
 recipes/grub/grub-0.93/memcpy.patch   |   13 ---
 recipes/grub/grub-0.93/reiserfs.patch |   11 --
 recipes/grub/grub_0.93.bb             |   15 ---
 4 files changed, 0 insertions(+), 205 deletions(-)
 delete mode 100644 recipes/grub/grub-0.93/autohell.patch
 delete mode 100644 recipes/grub/grub-0.93/memcpy.patch
 delete mode 100644 recipes/grub/grub-0.93/reiserfs.patch
 delete mode 100644 recipes/grub/grub_0.93.bb

diff --git a/recipes/grub/grub-0.93/autohell.patch b/recipes/grub/grub-0.93/autohell.patch
deleted file mode 100644
index ca1f2d1..0000000
--- a/recipes/grub/grub-0.93/autohell.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- grub-0.93/configure.in~	2002-11-29 20:12:08.000000000 +0000
-+++ grub-0.93/configure.in	2004-01-04 12:03:05.000000000 +0000
-@@ -54,7 +54,7 @@
- _AM_DEPENDENCIES(CC)
- 
- dnl Because recent automake complains about AS, set it here.
--AS="$CC"
-+AM_PROG_AS
- AC_SUBST(AS)
- 
- AC_ARG_WITH(binutils,
---- grub-0.93/stage1/Makefile.am~	2002-09-08 02:58:08.000000000 +0100
-+++ grub-0.93/stage1/Makefile.am	2004-01-04 12:31:38.000000000 +0000
-@@ -4,7 +4,7 @@
- CLEANFILES = $(nodist_pkgdata_DATA)
- 
- # We can't use builtins or standard includes.
--AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES)
- LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
- 
- noinst_PROGRAMS = stage1.exec
---- grub-0.93/stage2/Makefile.am~	2002-11-29 18:00:53.000000000 +0000
-+++ grub-0.93/stage2/Makefile.am	2004-01-04 12:30:29.000000000 +0000
-@@ -12,6 +12,7 @@
- 
- # For <stage1.h>.
- INCLUDES = -I$(top_srcdir)/stage1
-+AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES)
- 
- # The library for /sbin/grub.
- noinst_LIBRARIES = libgrub.a
-@@ -88,7 +89,7 @@
- 	fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
- 	smp-imps.c stage2.c terminfo.c tparm.c
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
--pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS)
- pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- 
- if NETBOOT_SUPPORT
-@@ -109,7 +110,7 @@
- 	echo "#define STAGE2_SIZE $$6" > stage2_size.h
- 
- start_exec_SOURCES = start.S
--start_exec_ASFLAGS = $(STAGE2_COMPILE)
-+start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- start_exec_LDFLAGS = $(START_LINK)
- 
- # XXX: automake doesn't provide a way to specify dependencies for object
-@@ -127,8 +128,8 @@
- 	stage1_5.c fsys_ext2fs.c bios.c
- e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
- 	-DNO_BLOCK_FILES=1
--e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
--	-DNO_BLOCK_FILES=1
-+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For fat_stage1_5 target.
-@@ -136,8 +137,8 @@
- 	stage1_5.c fsys_fat.c bios.c
- fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
- 	-DNO_BLOCK_FILES=1
--fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
--	-DNO_BLOCK_FILES=1
-+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For ffs_stage1_5 target.
-@@ -145,8 +146,8 @@
- 	stage1_5.c fsys_ffs.c bios.c
- ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
- 	-DNO_BLOCK_FILES=1
--ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
--	-DNO_BLOCK_FILES=1
-+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For minix_stage1_5 target.
-@@ -154,8 +155,8 @@
- 	stage1_5.c fsys_minix.c bios.c
- minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
- 	-DNO_BLOCK_FILES=1
--minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
--	-DNO_BLOCK_FILES=1
-+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For reiserfs_stage1_5 target.
-@@ -163,8 +164,8 @@
- 	disk_io.c stage1_5.c fsys_reiserfs.c bios.c
- reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
- 	-DNO_BLOCK_FILES=1
--reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
--	-DNO_BLOCK_FILES=1
-+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For vstafs_stage1_5 target.
-@@ -172,8 +173,8 @@
- 	disk_io.c stage1_5.c fsys_vstafs.c bios.c
- vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
- 	-DNO_BLOCK_FILES=1
--vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
--	-DNO_BLOCK_FILES=1
-+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For jfs_stage1_5 target.
-@@ -181,8 +182,8 @@
- 	disk_io.c stage1_5.c fsys_jfs.c bios.c
- jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
- 	-DNO_BLOCK_FILES=1
--jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
--	-DNO_BLOCK_FILES=1
-+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For xfs_stage1_5 target.
-@@ -190,16 +191,16 @@
- 	disk_io.c stage1_5.c fsys_xfs.c bios.c
- xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
- 	-DNO_BLOCK_FILES=1
--xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
--	-DNO_BLOCK_FILES=1
-+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For diskless target.
- diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
- diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
- 	-DSUPPORT_DISKLESS=1
--diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
--	-DSUPPORT_DISKLESS=1
-+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
-+	-DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS)
- diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- diskless_exec_LDADD = ../netboot/libdrivers.a
- 
-@@ -210,7 +211,7 @@
- 
- # For nbloader target.
- nbloader_exec_SOURCES = nbloader.S
--nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
-@@ -223,7 +224,7 @@
- 
- # For pxeloader target.
- pxeloader_exec_SOURCES = pxeloader.S
--pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
diff --git a/recipes/grub/grub-0.93/memcpy.patch b/recipes/grub/grub-0.93/memcpy.patch
deleted file mode 100644
index dd5da33..0000000
--- a/recipes/grub/grub-0.93/memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- grub-0.93/stage2/asm.S~	2002-12-02 23:18:56.000000000 +0000
-+++ grub-0.93/stage2/asm.S	2004-01-04 12:50:11.000000000 +0000
-@@ -62,6 +62,10 @@
- start:
- _start:
- #endif /* ! STAGE1_5 */
-+
-+#undef memcpy
-+ENTRY(memcpy)
-+	jmp EXT_C(grub_memmove)
- 	
- ENTRY(main)
- 	/*
diff --git a/recipes/grub/grub-0.93/reiserfs.patch b/recipes/grub/grub-0.93/reiserfs.patch
deleted file mode 100644
index 5b4fb5b..0000000
--- a/recipes/grub/grub-0.93/reiserfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-0.93/stage2/fsys_reiserfs.c~	2002-11-29 17:46:01.000000000 +0000
-+++ grub-0.93/stage2/fsys_reiserfs.c	2004-01-04 12:16:34.000000000 +0000
-@@ -112,7 +112,7 @@
-   /* offset in the log of where to start replay after a crash */
-   __u32 j_first_unflushed_offset;
-   /* mount id to detect very old transactions */
--  __u32 long j_mount_id;
-+  __u32 j_mount_id;
- };
- 
- /* magic string to find desc blocks in the journal */
diff --git a/recipes/grub/grub_0.93.bb b/recipes/grub/grub_0.93.bb
deleted file mode 100644
index 9fc0084..0000000
--- a/recipes/grub/grub_0.93.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "GRUB is the GRand Unified Bootloader"
-HOMEPAGE = "http://www.gnu.org/software/grub"
-SECTION = "bootloaders"
-PRIORITY = "optional"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
-	   file://autohell.patch;patch=1 \
-	   file://memcpy.patch;patch=1 \
-	   file://reiserfs.patch;patch=1"
-
-inherit autotools
-
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-FILES_${PN}-doc = "${datadir}"
-- 
1.5.6.5

[PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Michael Smith]

If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub. Instead,
RRECOMMEND the config package. This allows overlays to override menu.lst
in a separate package, rather than copying the whole grub package into
the overlay.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub_0.97.bb |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
index ef37af1..8b68868 100644
--- a/recipes/grub/grub_0.97.bb
+++ b/recipes/grub/grub_0.97.bb
@@ -6,8 +6,16 @@ RDEPENDS = "diffutils"
 PR = "r4"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
-           file://automake-1.10.patch;patch=1 \
-           file://menu.lst"
+           file://automake-1.10.patch;patch=1"
+
+# Set to the name of a package containing menu.lst to override the one
+# shipped with this package.
+GRUB_CONFIG_PACKAGE ?= ""
+
+SRC_URI += "${@base_conditional('GRUB_CONFIG_PACKAGE', '', \
+				'file://menu.lst', '', d)}"
+
+RRECOMMENDS += "${GRUB_CONFIG_PACKAGE}"
 
 inherit autotools
 
@@ -22,8 +30,11 @@ do_install_append() {
         install -d ${D}/boot/
 	ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
 
-	# TODO: better use grub-set-default script here?
-	install -m 0644  ${WORKDIR}/menu.lst ${D}/boot/grub
+	if [ -z "${GRUB_CONFIG_PACKAGE}" ]
+	then
+		# TODO: better use grub-set-default script here?
+		install -m 0644  ${WORKDIR}/menu.lst ${D}/boot/grub
+	fi
 }
 
 FILES_${PN}-doc = "${datadir}"
-- 
1.5.6.5

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Denys Dmytriyenko]

On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:
> If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub. Instead,
> RRECOMMEND the config package. This allows overlays to override menu.lst
> in a separate package, rather than copying the whole grub package into
> the overlay.

It was discussed many times here - no USE flags in OE. You'll end up with 2 
grub packages of the same name but with different contents - with menu.lst 
and without.
One of the recent discussions on this topic:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/22715/focus=22731

One way to solve it would be to always have menu.lst as a separate package and 
then replace it with your own from the overlay.

>  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> -           file://automake-1.10.patch;patch=1 \
> -           file://menu.lst"
> +           file://automake-1.10.patch;patch=1"
> +
> +# Set to the name of a package containing menu.lst to override the one
> +# shipped with this package.
> +GRUB_CONFIG_PACKAGE ?= ""
> +
> +SRC_URI += "${@base_conditional('GRUB_CONFIG_PACKAGE', '', \
> +				'file://menu.lst', '', d)}"
> +
> +RRECOMMENDS += "${GRUB_CONFIG_PACKAGE}"

-- 
Denys

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Tom Rini]

On Wed, May 06, 2009 at 06:38:38PM -0400, Denys Dmytriyenko wrote:
> On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:
> > If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub. Instead,
> > RRECOMMEND the config package. This allows overlays to override menu.lst
> > in a separate package, rather than copying the whole grub package into
> > the overlay.
> 
> It was discussed many times here - no USE flags in OE. You'll end up with 2 
> grub packages of the same name but with different contents - with menu.lst 
> and without.
> One of the recent discussions on this topic:
> http://thread.gmane.org/gmane.comp.handhelds.openembedded/22715/focus=22731

I need to find time to argue for USE flags sometime.  In short 'tho, you
only end up with 2 grub packages that differ if, well, you want them to.
Distros (Angstrom) that let people install stuff on the system from
feeds should do something like:
### DO NOT CHANGE ANY OF THE FOLLOWING IF YOU INTEND TO PUBLISH YOUR
### PACKAGES.  DOING SO WILL BREAK PEOPLE.
USE_FLAG_1 := ...
USE_FLAG_2 := ...

And distros that really want to USE (or not USE) something can set them
differently, and we don't end up with N permutations of recipes that
people have to mind when fixing things nor forking for their own use the
recipes and stripping things out.  It's really two sides of the same
coin.

> One way to solve it would be to always have menu.lst as a separate package and 
> then replace it with your own from the overlay.
> 
> >  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \

Unrelated, this should be ${GNU_MIRROR}/grub/grub-${PV}.tar.gz

-- 
Tom Rini

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Phil Blundell]

On Wed, 2009-05-06 at 18:38 -0400, Denys Dmytriyenko wrote:
> On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:
> > If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub. Instead,
> > RRECOMMEND the config package. This allows overlays to override menu.lst
> > in a separate package, rather than copying the whole grub package into
> > the overlay.
> 
> It was discussed many times here - no USE flags in OE. You'll end up with 2 
> grub packages of the same name but with different contents - with menu.lst 
> and without.

Although you're right that it comes up here frequently, I think this "no
USE flags" dogma is somewhat misguided.  It seems, frankly, absurd to
require people to effectively fork a recipe whenever they want to make
some or other configuration change.  Firstly, this is just tiresome to
do; secondly, it leads to source tree clutter and corresponding
maintenance headaches because you end up with large numbers of
possibly-defunct recipes lying around; and thirdly it leads to a worse
end-user experience because suddenly their binary packages end up with
crazy names that encode some aspect of the distro configuration. 

Also, it simply isn't reasonable to expect that you can encode
everything about a binary package into its filename: there are too many
unknown inputs for this to be feasible.  If you want to know whether two
packages are the same then you should compare the md5sums, and if it's
vital (for whatever reason) for you to have an unambiguous, unique
fingerprint for each binary package then you should probably consider
making the md5sum be part of the output filename.

I do understand the desire to have package builds be repeatable and
deterministic, and that's clearly a reasonable thing to want.  But USE
flags at the recipe level don't materially alter the situation here: if
you use a given distro configuration, unmodified, then you're going to
get the same values of the USE flags as everybody else who builds for
that distro.  If you start randomly flipping USE flags in your local
copy of the distro configuration or overriding them from local.conf then
sure, you will lose, but if your source tree contains arbitrary local
hacks then there already countless ways in which you could lose by, for
example, selecting a different compiler, C library or global build
options to everybody else.

And, indeed, we do already have a certain number of USE-type flags in OE
today: the most obvious one that comes to mind is
ENABLE_BINARY_LOCALE_GENERATION, which impacts the way that glibc is
packaged and yet doesn't seem to be causing any significant grief at the
moment.

p.

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Michael Smith]

Phil Blundell wrote:
> On Wed, 2009-05-06 at 18:38 -0400, Denys Dmytriyenko wrote:
>> On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:

>> It was discussed many times here - no USE flags in OE.
> 
> Although you're right that it comes up here frequently, I think this "no
> USE flags" dogma is somewhat misguided.  It seems, frankly, absurd to
> require people to effectively fork a recipe whenever they want to make
> some or other configuration change.

I agree. If OpenEmbedded is a toolset for building distributions, rather 
than just a single distribution, then it'd be great if there were an 
easy way for distribution builders to make different packaging choices 
than the ones that have been made for Angstrom, without maintaining a 
forked copy of everything.

There might be ways to do it without USE flags. I think some tweaks to 
the overlay mechanism would help here. First, if I could create a 
package in an overlay that references files from the upstream in 
SRC_URI, I wouldn't have to copy all the patches, initscripts, etc. over 
to the overlay. For example, if my tree looks like the one below:

top/
  |-- local (overlay)
  |   `-- recipes
  |       `-- grub
              |-- grub_0.97.bb (overlay)
  |           `-- files
  |               `-- menu.lst (overlay)
  `-- openembedded (upstream)
      `-- recipes
          `-- grub
              |-- grub_0.97.bb (upstream)
              `-- files
                  |-- menu.lst (upstream)
                  `-- some.patch (upstream)

My grub_0.97.bb could reference file://some.patch in its SRC_URI and 
bitbake could look in the next COLLECTION after failing to find it in 
the local one. In fact, I wouldn't even really need a bbfile in the 
overlay; just having files/menu.lst in the overlay could be enough to 
replace it. I guess this might just require some fudging to how 
FILESPATH is set up in base.bbclass.

Second, if a recipe could include a recipe of the same name and let 
bitbake search for it in the next COLLECTION, overlay packages could get 
a lot smaller. Say I need to add a private patch to grub -- my overlay 
grub_0.97.bb, if I had one, could just look like this:

require_next ${PN}/${PN}_${PV}.bb
SRC_URI += "file://some-private.patch;patch=1"

Something similar might be useful for INHERIT. Instead of creating an 
overlay bbfile for linux_${PN}.bb, I could just override kernel.bbclass 
and then pull in the original.

Is this something people would be interested in, or am I making it more 
complicated than it needs to be?

Mike

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Chris Larson]

On Thu, May 7, 2009 at 12:03 PM, Michael Smith <msmith@cbnco.com> wrote:
[snip]
> My grub_0.97.bb could reference file://some.patch in its SRC_URI and bitbake
> could look in the next COLLECTION after failing to find it in the local one.
> In fact, I wouldn't even really need a bbfile in the overlay; just having
> files/menu.lst in the overlay could be enough to replace it. I guess this
> might just require some fudging to how FILESPATH is set up in base.bbclass.

This piece is covered relatively easily by manipulating FILESPATHBASE.

> Second, if a recipe could include a recipe of the same name and let bitbake
> search for it in the next COLLECTION, overlay packages could get a lot
> smaller. Say I need to add a private patch to grub -- my overlay
> grub_0.97.bb, if I had one, could just look like this:

This piece I believe I have a solution for.  I just wrote a 15 line
.inc file that when loaded in a .conf, automatically searches any
recipe's FILESPATH for an amend.inc, and if it exists, parses that in
after the recipe itself is parsed, so you can amend the recipe with
tweaks and things at the end of the parse.  So this coupled with the
aforementioned FILESPATHBASE alterations and you should be able to
supply overlay specific changes to a recipe without having to copy the
recipe itself into the overlay.
-- 
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Denys Dmytriyenko]

On Fri, May 15, 2009 at 03:21:03PM -0700, Chris Larson wrote:
> On Thu, May 7, 2009 at 12:03 PM, Michael Smith <msmith@cbnco.com> wrote:
> [snip]
> > My grub_0.97.bb could reference file://some.patch in its SRC_URI and bitbake
> > could look in the next COLLECTION after failing to find it in the local one.
> > In fact, I wouldn't even really need a bbfile in the overlay; just having
> > files/menu.lst in the overlay could be enough to replace it. I guess this
> > might just require some fudging to how FILESPATH is set up in base.bbclass.
> 
> This piece is covered relatively easily by manipulating FILESPATHBASE.
> 
> > Second, if a recipe could include a recipe of the same name and let bitbake
> > search for it in the next COLLECTION, overlay packages could get a lot
> > smaller. Say I need to add a private patch to grub -- my overlay
> > grub_0.97.bb, if I had one, could just look like this:
> 
> This piece I believe I have a solution for.  I just wrote a 15 line
> .inc file that when loaded in a .conf, automatically searches any
> recipe's FILESPATH for an amend.inc, and if it exists, parses that in
> after the recipe itself is parsed, so you can amend the recipe with
> tweaks and things at the end of the parse.  So this coupled with the
> aforementioned FILESPATHBASE alterations and you should be able to
> supply overlay specific changes to a recipe without having to copy the
> recipe itself into the overlay.

Chris,

You are on the roll! This is another very welcomed feature for anyone who 
manages overlays. Thanks!

-- 
Denys

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Denys Dmytriyenko]

On Thu, May 07, 2009 at 07:45:21AM +0100, Phil Blundell wrote:
> On Wed, 2009-05-06 at 18:38 -0400, Denys Dmytriyenko wrote:
> > On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:
> > > If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub. Instead,
> > > RRECOMMEND the config package. This allows overlays to override menu.lst
> > > in a separate package, rather than copying the whole grub package into
> > > the overlay.
> > 
> > It was discussed many times here - no USE flags in OE. You'll end up with 2 
> > grub packages of the same name but with different contents - with menu.lst 
> > and without.
> 
> Although you're right that it comes up here frequently, I think this "no
> USE flags" dogma is somewhat misguided.  It seems, frankly, absurd to
> require people to effectively fork a recipe whenever they want to make
> some or other configuration change.  Firstly, this is just tiresome to
> do; secondly, it leads to source tree clutter and corresponding
> maintenance headaches because you end up with large numbers of
> possibly-defunct recipes lying around; and thirdly it leads to a worse
> end-user experience because suddenly their binary packages end up with
> crazy names that encode some aspect of the distro configuration. 

I didn't mean to start a new discussion on the topic of USE flags... And as a 
long-standing Gentoo fan, I am all for it, we just need a way to make it work.

> Also, it simply isn't reasonable to expect that you can encode
> everything about a binary package into its filename: there are too many
> unknown inputs for this to be feasible.  If you want to know whether two
> packages are the same then you should compare the md5sums, and if it's
> vital (for whatever reason) for you to have an unambiguous, unique
> fingerprint for each binary package then you should probably consider
> making the md5sum be part of the output filename.

Yeah, some time back we discussed the idea of including the hash of all the 
USE flags used to produce the package in its filename. Hashing the entire 
package may work, just need to ensure identical packages built by different 
people in different environments will have identical hashes...
But then again the package manager (opkg/ipkg/dpkg) needs to handle these 
things properly - the hash cannot seems to be part of the package name part of 
the filename, nor the package version-revision part.

> I do understand the desire to have package builds be repeatable and
> deterministic, and that's clearly a reasonable thing to want.  But USE
> flags at the recipe level don't materially alter the situation here: if
> you use a given distro configuration, unmodified, then you're going to
> get the same values of the USE flags as everybody else who builds for
> that distro.  If you start randomly flipping USE flags in your local
> copy of the distro configuration or overriding them from local.conf then
> sure, you will lose, but if your source tree contains arbitrary local
> hacks then there already countless ways in which you could lose by, for
> example, selecting a different compiler, C library or global build
> options to everybody else.
> 
> And, indeed, we do already have a certain number of USE-type flags in OE
> today: the most obvious one that comes to mind is
> ENABLE_BINARY_LOCALE_GENERATION, which impacts the way that glibc is
> packaged and yet doesn't seem to be causing any significant grief at the
> moment.

CURL_FEATURES is another good example.

-- 
Denys

Re: [PATCH 2/2] grub: allow menu.lst to be overridden using GRUB_CONFIG_PACKAGE.

[Michael Smith]

Denys Dmytriyenko wrote:
> On Wed, May 06, 2009 at 03:55:57PM -0400, Michael Smith wrote:
>> If GRUB_CONFIG_PACKAGE is set, don't ship menu.lst with grub.

> It was discussed many times here - no USE flags in OE.

> One way to solve it would be to always have menu.lst as a separate package and 
> then replace it with your own from the overlay.

Fair enough -- in this particular case it's quite easy to avoid the USE 
flag by adding a separate package for the config file. One less 
combinatorial to explode.

Since there are few users of the grub package, and menu.lst is a recent 
addition to the package anyway, I don't think anyone will mind.

Mike

[PATCH 1/3] Remove unused grub-0.93.

[Michael Smith]

As far as I can tell, only the wrap board and gpe-phone-image are using
grub, and they use the default version, 0.97.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub-0.93/autohell.patch |  166 ---------------------------------
 recipes/grub/grub-0.93/memcpy.patch   |   13 ---
 recipes/grub/grub-0.93/reiserfs.patch |   11 --
 recipes/grub/grub_0.93.bb             |   15 ---
 4 files changed, 0 insertions(+), 205 deletions(-)
 delete mode 100644 recipes/grub/grub-0.93/autohell.patch
 delete mode 100644 recipes/grub/grub-0.93/memcpy.patch
 delete mode 100644 recipes/grub/grub-0.93/reiserfs.patch
 delete mode 100644 recipes/grub/grub_0.93.bb

diff --git a/recipes/grub/grub-0.93/autohell.patch b/recipes/grub/grub-0.93/autohell.patch
deleted file mode 100644
index ca1f2d1..0000000
--- a/recipes/grub/grub-0.93/autohell.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- grub-0.93/configure.in~	2002-11-29 20:12:08.000000000 +0000
-+++ grub-0.93/configure.in	2004-01-04 12:03:05.000000000 +0000
-@@ -54,7 +54,7 @@
- _AM_DEPENDENCIES(CC)
- 
- dnl Because recent automake complains about AS, set it here.
--AS="$CC"
-+AM_PROG_AS
- AC_SUBST(AS)
- 
- AC_ARG_WITH(binutils,
---- grub-0.93/stage1/Makefile.am~	2002-09-08 02:58:08.000000000 +0100
-+++ grub-0.93/stage1/Makefile.am	2004-01-04 12:31:38.000000000 +0000
-@@ -4,7 +4,7 @@
- CLEANFILES = $(nodist_pkgdata_DATA)
- 
- # We can't use builtins or standard includes.
--AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES)
- LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
- 
- noinst_PROGRAMS = stage1.exec
---- grub-0.93/stage2/Makefile.am~	2002-11-29 18:00:53.000000000 +0000
-+++ grub-0.93/stage2/Makefile.am	2004-01-04 12:30:29.000000000 +0000
-@@ -12,6 +12,7 @@
- 
- # For <stage1.h>.
- INCLUDES = -I$(top_srcdir)/stage1
-+AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES)
- 
- # The library for /sbin/grub.
- noinst_LIBRARIES = libgrub.a
-@@ -88,7 +89,7 @@
- 	fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
- 	smp-imps.c stage2.c terminfo.c tparm.c
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
--pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS)
- pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- 
- if NETBOOT_SUPPORT
-@@ -109,7 +110,7 @@
- 	echo "#define STAGE2_SIZE $$6" > stage2_size.h
- 
- start_exec_SOURCES = start.S
--start_exec_ASFLAGS = $(STAGE2_COMPILE)
-+start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- start_exec_LDFLAGS = $(START_LINK)
- 
- # XXX: automake doesn't provide a way to specify dependencies for object
-@@ -127,8 +128,8 @@
- 	stage1_5.c fsys_ext2fs.c bios.c
- e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
- 	-DNO_BLOCK_FILES=1
--e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
--	-DNO_BLOCK_FILES=1
-+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For fat_stage1_5 target.
-@@ -136,8 +137,8 @@
- 	stage1_5.c fsys_fat.c bios.c
- fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
- 	-DNO_BLOCK_FILES=1
--fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
--	-DNO_BLOCK_FILES=1
-+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For ffs_stage1_5 target.
-@@ -145,8 +146,8 @@
- 	stage1_5.c fsys_ffs.c bios.c
- ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
- 	-DNO_BLOCK_FILES=1
--ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
--	-DNO_BLOCK_FILES=1
-+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For minix_stage1_5 target.
-@@ -154,8 +155,8 @@
- 	stage1_5.c fsys_minix.c bios.c
- minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
- 	-DNO_BLOCK_FILES=1
--minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
--	-DNO_BLOCK_FILES=1
-+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For reiserfs_stage1_5 target.
-@@ -163,8 +164,8 @@
- 	disk_io.c stage1_5.c fsys_reiserfs.c bios.c
- reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
- 	-DNO_BLOCK_FILES=1
--reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
--	-DNO_BLOCK_FILES=1
-+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For vstafs_stage1_5 target.
-@@ -172,8 +173,8 @@
- 	disk_io.c stage1_5.c fsys_vstafs.c bios.c
- vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
- 	-DNO_BLOCK_FILES=1
--vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
--	-DNO_BLOCK_FILES=1
-+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For jfs_stage1_5 target.
-@@ -181,8 +182,8 @@
- 	disk_io.c stage1_5.c fsys_jfs.c bios.c
- jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
- 	-DNO_BLOCK_FILES=1
--jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
--	-DNO_BLOCK_FILES=1
-+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For xfs_stage1_5 target.
-@@ -190,16 +191,16 @@
- 	disk_io.c stage1_5.c fsys_xfs.c bios.c
- xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
- 	-DNO_BLOCK_FILES=1
--xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
--	-DNO_BLOCK_FILES=1
-+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For diskless target.
- diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
- diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
- 	-DSUPPORT_DISKLESS=1
--diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
--	-DSUPPORT_DISKLESS=1
-+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
-+	-DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS)
- diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- diskless_exec_LDADD = ../netboot/libdrivers.a
- 
-@@ -210,7 +211,7 @@
- 
- # For nbloader target.
- nbloader_exec_SOURCES = nbloader.S
--nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
-@@ -223,7 +224,7 @@
- 
- # For pxeloader target.
- pxeloader_exec_SOURCES = pxeloader.S
--pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
diff --git a/recipes/grub/grub-0.93/memcpy.patch b/recipes/grub/grub-0.93/memcpy.patch
deleted file mode 100644
index dd5da33..0000000
--- a/recipes/grub/grub-0.93/memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- grub-0.93/stage2/asm.S~	2002-12-02 23:18:56.000000000 +0000
-+++ grub-0.93/stage2/asm.S	2004-01-04 12:50:11.000000000 +0000
-@@ -62,6 +62,10 @@
- start:
- _start:
- #endif /* ! STAGE1_5 */
-+
-+#undef memcpy
-+ENTRY(memcpy)
-+	jmp EXT_C(grub_memmove)
- 	
- ENTRY(main)
- 	/*
diff --git a/recipes/grub/grub-0.93/reiserfs.patch b/recipes/grub/grub-0.93/reiserfs.patch
deleted file mode 100644
index 5b4fb5b..0000000
--- a/recipes/grub/grub-0.93/reiserfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-0.93/stage2/fsys_reiserfs.c~	2002-11-29 17:46:01.000000000 +0000
-+++ grub-0.93/stage2/fsys_reiserfs.c	2004-01-04 12:16:34.000000000 +0000
-@@ -112,7 +112,7 @@
-   /* offset in the log of where to start replay after a crash */
-   __u32 j_first_unflushed_offset;
-   /* mount id to detect very old transactions */
--  __u32 long j_mount_id;
-+  __u32 j_mount_id;
- };
- 
- /* magic string to find desc blocks in the journal */
diff --git a/recipes/grub/grub_0.93.bb b/recipes/grub/grub_0.93.bb
deleted file mode 100644
index 9fc0084..0000000
--- a/recipes/grub/grub_0.93.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "GRUB is the GRand Unified Bootloader"
-HOMEPAGE = "http://www.gnu.org/software/grub"
-SECTION = "bootloaders"
-PRIORITY = "optional"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
-	   file://autohell.patch;patch=1 \
-	   file://memcpy.patch;patch=1 \
-	   file://reiserfs.patch;patch=1"
-
-inherit autotools
-
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-FILES_${PN}-doc = "${datadir}"
-- 
1.5.6.5

[PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Michael Smith]

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub_0.97.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
index ef37af1..e1162ef 100644
--- a/recipes/grub/grub_0.97.bb
+++ b/recipes/grub/grub_0.97.bb
@@ -20,11 +20,12 @@ python __anonymous () {
 
 do_install_append() {
         install -d ${D}/boot/
-	ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
+	ln -sf ..${libdir}/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
 
 	# TODO: better use grub-set-default script here?
-	install -m 0644  ${WORKDIR}/menu.lst ${D}/boot/grub
+	install -m 0644 ${WORKDIR}/menu.lst \
+		${D}${libdir}/grub/i386${TARGET_VENDOR}/
 }
 
 FILES_${PN}-doc = "${datadir}"
-FILES_${PN} = "/boot /usr"
+FILES_${PN} = "/boot ${prefix}"
-- 
1.5.6.5

[PATCH 3/3] grub: split menu.lst into a separate package, grub-config.

[Michael Smith]

This makes it easier for overlays to override the configuration.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/files/menu.lst     |    6 ++++++
 recipes/grub/grub-0.97/menu.lst |    6 ------
 recipes/grub/grub-config_1.0.bb |   13 +++++++++++++
 recipes/grub/grub_0.97.bb       |   12 +++++-------
 4 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 recipes/grub/files/menu.lst
 delete mode 100644 recipes/grub/grub-0.97/menu.lst
 create mode 100644 recipes/grub/grub-config_1.0.bb

diff --git a/recipes/grub/files/menu.lst b/recipes/grub/files/menu.lst
new file mode 100644
index 0000000..510e8f8
--- /dev/null
+++ b/recipes/grub/files/menu.lst
@@ -0,0 +1,6 @@
+# menu.lst
+default 0
+timeout 5
+title   OpenEmbedded Linux (hda1)
+root    (hd0,0)
+kernel  /boot/bzImage root=/dev/hda1 ro 
diff --git a/recipes/grub/grub-0.97/menu.lst b/recipes/grub/grub-0.97/menu.lst
deleted file mode 100644
index 510e8f8..0000000
--- a/recipes/grub/grub-0.97/menu.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-# menu.lst
-default 0
-timeout 5
-title   OpenEmbedded Linux (hda1)
-root    (hd0,0)
-kernel  /boot/bzImage root=/dev/hda1 ro 
diff --git a/recipes/grub/grub-config_1.0.bb b/recipes/grub/grub-config_1.0.bb
new file mode 100644
index 0000000..f6e82a7
--- /dev/null
+++ b/recipes/grub/grub-config_1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Configuration file for grub"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "file://menu.lst"
+
+do_install() {
+	install -D -m 0644 ${WORKDIR}/menu.lst \
+		${D}${libdir}/grub/i386${TARGET_VENDOR}/menu.lst
+}
+
+FILES_${PN} += "${libdir}"
diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
index e1162ef..8822b7e 100644
--- a/recipes/grub/grub_0.97.bb
+++ b/recipes/grub/grub_0.97.bb
@@ -3,11 +3,13 @@ HOMEPAGE = "http://www.gnu.org/software/grub"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 RDEPENDS = "diffutils"
-PR = "r4"
+PR = "r5"
+
+# menu.lst is shipped in a separate package that overlays can override.
+RRECOMMENDS = "grub-config"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
-           file://automake-1.10.patch;patch=1 \
-           file://menu.lst"
+           file://automake-1.10.patch;patch=1"
 
 inherit autotools
 
@@ -21,10 +23,6 @@ python __anonymous () {
 do_install_append() {
         install -d ${D}/boot/
 	ln -sf ..${libdir}/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
-
-	# TODO: better use grub-set-default script here?
-	install -m 0644 ${WORKDIR}/menu.lst \
-		${D}${libdir}/grub/i386${TARGET_VENDOR}/
 }
 
 FILES_${PN}-doc = "${datadir}"
-- 
1.5.6.5

Re: [PATCH 3/3] grub: split menu.lst into a separate package, grub-config.

[Chris Larson]

I'm not sure if you realize, but you can let your overlay override
file:// files by manipulating FILESPATH.  You don't need to split up
all the recipes.

FILESPATHBASE =.
"/path/to/my/overlay/recipes/${os.path.basename(os.path.dirname(d.getVar('FILE',
1)))}:"

Would ensure that /path/to/my/overlay/recipes + the name of the dir
the recipe resides in is searched before the default location (which
is the dir the recipe is in).  We can't sanely set a default FILESPATH
based on COLLECTIONS because we can't necesasrily globally assume all
collections have the same layout.  But you know your layouts, so you
can set it yourself and have it work just fine.

An alternative, if you're just providing a local change rather than a
overlay specific change would be to do something like:

FILESPATHBASE =. "${TOPDIR}/files"

and drop your menu.lst into ${TOPDIR}/files/grub/.

On Thu, May 7, 2009 at 11:27 AM, Michael Smith <msmith@cbnco.com> wrote:
> This makes it easier for overlays to override the configuration.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/grub/files/menu.lst     |    6 ++++++
>  recipes/grub/grub-0.97/menu.lst |    6 ------
>  recipes/grub/grub-config_1.0.bb |   13 +++++++++++++
>  recipes/grub/grub_0.97.bb       |   12 +++++-------
>  4 files changed, 24 insertions(+), 13 deletions(-)
>  create mode 100644 recipes/grub/files/menu.lst
>  delete mode 100644 recipes/grub/grub-0.97/menu.lst
>  create mode 100644 recipes/grub/grub-config_1.0.bb
>
> diff --git a/recipes/grub/files/menu.lst b/recipes/grub/files/menu.lst
> new file mode 100644
> index 0000000..510e8f8
> --- /dev/null
> +++ b/recipes/grub/files/menu.lst
> @@ -0,0 +1,6 @@
> +# menu.lst
> +default 0
> +timeout 5
> +title   OpenEmbedded Linux (hda1)
> +root    (hd0,0)
> +kernel  /boot/bzImage root=/dev/hda1 ro
> diff --git a/recipes/grub/grub-0.97/menu.lst b/recipes/grub/grub-0.97/menu.lst
> deleted file mode 100644
> index 510e8f8..0000000
> --- a/recipes/grub/grub-0.97/menu.lst
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# menu.lst
> -default 0
> -timeout 5
> -title   OpenEmbedded Linux (hda1)
> -root    (hd0,0)
> -kernel  /boot/bzImage root=/dev/hda1 ro
> diff --git a/recipes/grub/grub-config_1.0.bb b/recipes/grub/grub-config_1.0.bb
> new file mode 100644
> index 0000000..f6e82a7
> --- /dev/null
> +++ b/recipes/grub/grub-config_1.0.bb
> @@ -0,0 +1,13 @@
> +DESCRIPTION = "Configuration file for grub"
> +SECTION = "bootloaders"
> +PRIORITY = "optional"
> +PR = "r0"
> +
> +SRC_URI = "file://menu.lst"
> +
> +do_install() {
> +       install -D -m 0644 ${WORKDIR}/menu.lst \
> +               ${D}${libdir}/grub/i386${TARGET_VENDOR}/menu.lst
> +}
> +
> +FILES_${PN} += "${libdir}"
> diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
> index e1162ef..8822b7e 100644
> --- a/recipes/grub/grub_0.97.bb
> +++ b/recipes/grub/grub_0.97.bb
> @@ -3,11 +3,13 @@ HOMEPAGE = "http://www.gnu.org/software/grub"
>  SECTION = "bootloaders"
>  PRIORITY = "optional"
>  RDEPENDS = "diffutils"
> -PR = "r4"
> +PR = "r5"
> +
> +# menu.lst is shipped in a separate package that overlays can override.
> +RRECOMMENDS = "grub-config"
>
>  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> -           file://automake-1.10.patch;patch=1 \
> -           file://menu.lst"
> +           file://automake-1.10.patch;patch=1"
>
>  inherit autotools
>
> @@ -21,10 +23,6 @@ python __anonymous () {
>  do_install_append() {
>         install -d ${D}/boot/
>        ln -sf ..${libdir}/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
> -
> -       # TODO: better use grub-set-default script here?
> -       install -m 0644 ${WORKDIR}/menu.lst \
> -               ${D}${libdir}/grub/i386${TARGET_VENDOR}/
>  }
>
>  FILES_${PN}-doc = "${datadir}"
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.

Re: [PATCH 3/3] grub: split menu.lst into a separate package, grub-config.

[Michael Smith]

Chris Larson wrote:
> I'm not sure if you realize, but you can let your overlay override
> file:// files by manipulating FILESPATH.  You don't need to split up
> all the recipes.

Hi Chris,

That's awesome. I didn't know that. I've added this to my local.conf:

FILESPATHBASE =. "${@ \
     ':'.join([os.path.join(recipedir, \
                         os.path.basename(os.path.dirname( \
                                             d.getVar('FILE', 1)))) \ 

	for recipedir in d.getVar('COLLECTIONS', 1).split()])}:"

Problem solved. I have no need to split a separate grub-config package.

Mike

manual missing dependencies section?

[Rich Pixley]

The version of the bitbake manual currently on berlios, 
(http://bitbake.berlios.de), appears to be missing the section on 
dependencies.

http://openmoko.opendevice.org/build/bitbake/doc/manual/usermanual.xml 
(search for "recrdeptask") still has it.

Is this intentional?

--rich

Re: manual missing dependencies section?

[Cliff Brake]

Rich,

I've put a current copy of the bitbake documentation on the OE server
(http://docs.openembedded.org/bitbake/html/), and pointed the link on
the following page to it:
http://wiki.openembedded.net/index.php/Documentation

I'll include bitbake documentation in the OE documentation generation
script so it gets automatically updated from now on.

Thanks for pointing this out.

Cliff

-- 
=======================
Cliff Brake
http://bec-systems.com


On Thu, May 7, 2009 at 6:37 PM, Rich Pixley <rich.pixley@palm.com> wrote:
> The version of the bitbake manual currently on berlios,
> (http://bitbake.berlios.de), appears to be missing the section on
> dependencies.
>
> http://openmoko.opendevice.org/build/bitbake/doc/manual/usermanual.xml
> (search for "recrdeptask") still has it.
>
> Is this intentional?
>
> --rich
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH 3/3] grub: split menu.lst into a separate package, grub-config.

[Denys Dmytriyenko]

On Thu, May 07, 2009 at 02:27:15PM -0400, Michael Smith wrote:
> This makes it easier for overlays to override the configuration.
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/grub/files/menu.lst     |    6 ++++++
>  recipes/grub/grub-0.97/menu.lst |    6 ------
>  recipes/grub/grub-config_1.0.bb |   13 +++++++++++++

Oh, I meant a separate package, not recipe. But then again, grub directory is 
not crowded yet... :)

>  recipes/grub/grub_0.97.bb       |   12 +++++-------
>  4 files changed, 24 insertions(+), 13 deletions(-)
>  create mode 100644 recipes/grub/files/menu.lst
>  delete mode 100644 recipes/grub/grub-0.97/menu.lst
>  create mode 100644 recipes/grub/grub-config_1.0.bb

-- 
Denys

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Leon Woestenberg]

Hello,

On Thu, May 7, 2009 at 8:27 PM, Michael Smith <msmith@cbnco.com> wrote:
> Signed-off-by: Michael Smith <msmith@cbnco.com>
>
>  do_install_append() {
>         install -d ${D}/boot/
> -       ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
> +       ln -sf ..${libdir}/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
>

Why do we install menu.cfg in ${libdir} anyway?

All desktop distro's I have seen have the menu.lst in /boot/grub/ on the rootfs.

Is this a FHS thing?

Regards,
-- 
Leon

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Otavio Salvador]

On Thu, May 7, 2009 at 4:18 PM, Leon Woestenberg
<leon.woestenberg@gmail.com> wrote:
> Why do we install menu.cfg in ${libdir} anyway?
>
> All desktop distro's I have seen have the menu.lst in /boot/grub/ on the rootfs.

I second this change; it makes easier for people to find it.

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Phil Blundell]

On Thu, 2009-05-07 at 16:26 -0300, Otavio Salvador wrote:
> On Thu, May 7, 2009 at 4:18 PM, Leon Woestenberg
> <leon.woestenberg@gmail.com> wrote:
> > Why do we install menu.cfg in ${libdir} anyway?
> >
> > All desktop distro's I have seen have the menu.lst in /boot/grub/ on the rootfs.
> 
> I second this change; it makes easier for people to find it.

Yes, agreed.  Possibly even more important: having the file in /boot be
a symlink to something in /usr will lose if /boot and /usr are on
different filesystems since grub won't be able to find the file at run
time.  I guess this situation probably doesn't arise all that often on
embedded systems but it's certainly meant to work (per FHS) and it seems
a shame to break it for no good reason.

p.

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Michael Smith]

Otavio Salvador wrote:
> On Thu, May 7, 2009 at 4:18 PM, Leon Woestenberg
> <leon.woestenberg@gmail.com> wrote:
>> Why do we install menu.cfg in ${libdir} anyway?
>>
>> All desktop distro's I have seen have the menu.lst in /boot/grub/ on the rootfs.
> 
> I second this change; it makes easier for people to find it.

All of the stage1/stage1_5/stage2 files are installed by grub into 
/usr/lib/grub/i386-oe/. I believe they're then copied to /boot during 
the grub install process. I think what the original 0.97 packager was 
going for was to avoid having duplicate copies of the files, so 
/boot/grub became a symlink to /usr/lib/grub/i386-oe, and then menu.lst 
needed to go there, too.

I would prefer to install all the files to /boot/grub rather than 
/usr/lib, since that's where they're used. I'll have to check if the 
grub install script is OK with that.

Mike

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Otavio Salvador]

Hello Michael,

On Thu, May 7, 2009 at 4:58 PM, Michael Smith <msmith@cbnco.com> wrote:
> I would prefer to install all the files to /boot/grub rather than /usr/lib,
> since that's where they're used. I'll have to check if the grub install
> script is OK with that.

To be able to do that you'd need to add a link for /usr/lib otherwise
you'd need to mangle grub-install script.

Another thing, since we're revamping GRUB packaging, why not move to
grub2? It also has the benefit of providing multi-arch support and
being active.

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Leon Woestenberg]

Hello all,

On Thu, May 7, 2009 at 9:58 PM, Michael Smith <msmith@cbnco.com> wrote:
> Otavio Salvador wrote:
>>
>> On Thu, May 7, 2009 at 4:18 PM, Leon Woestenberg
>> <leon.woestenberg@gmail.com> wrote:
>>>
>>> Why do we install menu.cfg in ${libdir} anyway?
>>>
>>> All desktop distro's I have seen have the menu.lst in /boot/grub/ on the
>>> rootfs.
>>
>> I second this change; it makes easier for people to find it.
>
> All of the stage1/stage1_5/stage2 files are installed by grub into
> /usr/lib/grub/i386-oe/. I believe they're then copied to /boot during the
> grub install process.

I think we can agree that we do not install GRUB by and on the target itself.

Proposal: add a new package "grub-install" that contains
"grub-install" and the {libdir} stuff.

The usual embedded target would void this package.

> I think what the original 0.97 packager was going for
> was to avoid having duplicate copies of the files, so /boot/grub became a
> symlink to /usr/lib/grub/i386-oe, and then menu.lst needed to go there, too.
>
We can have both with the proposal. Thanks for the explanation, btw.

This might be desirable for more-PC like targets (think big iron Atom).

Regards.
-- 
Leon

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Michael Smith]

Leon Woestenberg wrote:

> Proposal: add a new package "grub-install" that contains
> "grub-install" and the {libdir} stuff.
> 
> The usual embedded target would void this package.

Sounds good to me. I'll send a patch later.

Otavio Salvador wrote:
 > Another thing, since we're revamping GRUB packaging, why not move to
 > grub2? It also has the benefit of providing multi-arch support and
 > being active.

Hi Otavio,

I'd prefer not to work with grub2 for now. From the website, it looks 
like it might still be a bit alpha. Grub 0.9x is also alpha, but at 
least I've already learned some of its secrets. :)

Mike

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Otavio Salvador]

Hello Michael,

On Thu, May 7, 2009 at 7:24 PM, Michael Smith <msmith@cbnco.com> wrote:
> I'd prefer not to work with grub2 for now. From the website, it looks like
> it might still be a bit alpha. Grub 0.9x is also alpha, but at least I've
> already learned some of its secrets. :)

Not really; it is the probably choice of Debian for next release and
it has few missing features[1] only. It adds much nice features and is
a more clear codebase.

1. http://wiki.debian.org/GrubTransition

Besides that all, I'd choose grub2 since no feature that we're going
to use at an embedded system is missing and upstream is open for
contributions for it. In grub (they call it grub-legacy) we need to
handle the patches by ourselfs and that is one of the main reasons
(besides other more technical) that Debian is going to move from GRUB
to GRUB2 ASAP.

I'd say that technically speaking grub2 is the right choose for OE
since it will demand less work to maintain and keep it up to date.

My 2c.
-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Leon Woestenberg]

Hello,

On Fri, May 8, 2009 at 3:35 AM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Thu, May 7, 2009 at 7:24 PM, Michael Smith <msmith@cbnco.com> wrote:
>
>> I'd prefer not to work with grub2 for now. From the website, it looks like
>> it might still be a bit alpha. Grub 0.9x is also alpha, but at least I've
>> already learned some of its secrets. :)
>
GRUB is a bootloader. Stability is extremely important and any 0.9x
has worked fine.

> Not really; it is the probably choice of Debian for next release and
> it has few missing features[1] only. It adds much nice features and is
> a more clear codebase.
>
> I'd say that technically speaking grub2 is the right choose for OE
> since it will demand less work to maintain and keep it up to date.
>
GRUB1 just works - no need to maintain (unless new filesystems appear
- I think btrfs etc.).

I think GRUB 1 or 2 *highly* depends on the application, and again, we
should be able to
handle both, by preference of the OE developer / user.

My 0.02EUR,

Regards
-- 
Leon

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Otavio Salvador]

Hello Leon,

On Fri, May 8, 2009 at 4:15 PM, Leon Woestenberg
<leon.woestenberg@gmail.com> wrote:
[...]
>> I'd say that technically speaking grub2 is the right choose for OE
>> since it will demand less work to maintain and keep it up to date.
>>
> GRUB1 just works - no need to maintain (unless new filesystems appear
> - I think btrfs etc.).
[...]

Oh really? So please, take a look in the following list of GRUB know bugs:

http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=grub

This is quite easy to notice that it does not "Just works". And I'm
one of GRUB maintainers in Debian so I know what I'm talking about.

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Michael Smith]

On Thu, 7 May 2009, Leon Woestenberg wrote:

> I think we can agree that we do not install GRUB by and on the target itself.
> 
> Proposal: add a new package "grub-install" that contains
> "grub-install" and the {libdir} stuff.

Coming right up...

Mike

[PATCH] Remove unused grub-0.93.

[Michael Smith]

As far as I can tell, only the wrap board and gpe-phone-image are using
grub, and they use the default version, 0.97.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub-0.93/autohell.patch |  166 ---------------------------------
 recipes/grub/grub-0.93/memcpy.patch   |   13 ---
 recipes/grub/grub-0.93/reiserfs.patch |   11 --
 recipes/grub/grub_0.93.bb             |   15 ---
 4 files changed, 0 insertions(+), 205 deletions(-)
 delete mode 100644 recipes/grub/grub-0.93/autohell.patch
 delete mode 100644 recipes/grub/grub-0.93/memcpy.patch
 delete mode 100644 recipes/grub/grub-0.93/reiserfs.patch
 delete mode 100644 recipes/grub/grub_0.93.bb

diff --git a/recipes/grub/grub-0.93/autohell.patch b/recipes/grub/grub-0.93/autohell.patch
deleted file mode 100644
index ca1f2d1..0000000
--- a/recipes/grub/grub-0.93/autohell.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- grub-0.93/configure.in~	2002-11-29 20:12:08.000000000 +0000
-+++ grub-0.93/configure.in	2004-01-04 12:03:05.000000000 +0000
-@@ -54,7 +54,7 @@
- _AM_DEPENDENCIES(CC)
- 
- dnl Because recent automake complains about AS, set it here.
--AS="$CC"
-+AM_PROG_AS
- AC_SUBST(AS)
- 
- AC_ARG_WITH(binutils,
---- grub-0.93/stage1/Makefile.am~	2002-09-08 02:58:08.000000000 +0100
-+++ grub-0.93/stage1/Makefile.am	2004-01-04 12:31:38.000000000 +0000
-@@ -4,7 +4,7 @@
- CLEANFILES = $(nodist_pkgdata_DATA)
- 
- # We can't use builtins or standard includes.
--AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES)
- LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
- 
- noinst_PROGRAMS = stage1.exec
---- grub-0.93/stage2/Makefile.am~	2002-11-29 18:00:53.000000000 +0000
-+++ grub-0.93/stage2/Makefile.am	2004-01-04 12:30:29.000000000 +0000
-@@ -12,6 +12,7 @@
- 
- # For <stage1.h>.
- INCLUDES = -I$(top_srcdir)/stage1
-+AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES)
- 
- # The library for /sbin/grub.
- noinst_LIBRARIES = libgrub.a
-@@ -88,7 +89,7 @@
- 	fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
- 	smp-imps.c stage2.c terminfo.c tparm.c
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
--pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS)
- pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- 
- if NETBOOT_SUPPORT
-@@ -109,7 +110,7 @@
- 	echo "#define STAGE2_SIZE $$6" > stage2_size.h
- 
- start_exec_SOURCES = start.S
--start_exec_ASFLAGS = $(STAGE2_COMPILE)
-+start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- start_exec_LDFLAGS = $(START_LINK)
- 
- # XXX: automake doesn't provide a way to specify dependencies for object
-@@ -127,8 +128,8 @@
- 	stage1_5.c fsys_ext2fs.c bios.c
- e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
- 	-DNO_BLOCK_FILES=1
--e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
--	-DNO_BLOCK_FILES=1
-+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For fat_stage1_5 target.
-@@ -136,8 +137,8 @@
- 	stage1_5.c fsys_fat.c bios.c
- fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
- 	-DNO_BLOCK_FILES=1
--fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
--	-DNO_BLOCK_FILES=1
-+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For ffs_stage1_5 target.
-@@ -145,8 +146,8 @@
- 	stage1_5.c fsys_ffs.c bios.c
- ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
- 	-DNO_BLOCK_FILES=1
--ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
--	-DNO_BLOCK_FILES=1
-+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For minix_stage1_5 target.
-@@ -154,8 +155,8 @@
- 	stage1_5.c fsys_minix.c bios.c
- minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
- 	-DNO_BLOCK_FILES=1
--minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
--	-DNO_BLOCK_FILES=1
-+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For reiserfs_stage1_5 target.
-@@ -163,8 +164,8 @@
- 	disk_io.c stage1_5.c fsys_reiserfs.c bios.c
- reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
- 	-DNO_BLOCK_FILES=1
--reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
--	-DNO_BLOCK_FILES=1
-+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For vstafs_stage1_5 target.
-@@ -172,8 +173,8 @@
- 	disk_io.c stage1_5.c fsys_vstafs.c bios.c
- vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
- 	-DNO_BLOCK_FILES=1
--vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
--	-DNO_BLOCK_FILES=1
-+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For jfs_stage1_5 target.
-@@ -181,8 +182,8 @@
- 	disk_io.c stage1_5.c fsys_jfs.c bios.c
- jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
- 	-DNO_BLOCK_FILES=1
--jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
--	-DNO_BLOCK_FILES=1
-+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For xfs_stage1_5 target.
-@@ -190,16 +191,16 @@
- 	disk_io.c stage1_5.c fsys_xfs.c bios.c
- xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
- 	-DNO_BLOCK_FILES=1
--xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
--	-DNO_BLOCK_FILES=1
-+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
-+	-DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
- xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
- 
- # For diskless target.
- diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
- diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
- 	-DSUPPORT_DISKLESS=1
--diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
--	-DSUPPORT_DISKLESS=1
-+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
-+	-DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS)
- diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
- diskless_exec_LDADD = ../netboot/libdrivers.a
- 
-@@ -210,7 +211,7 @@
- 
- # For nbloader target.
- nbloader_exec_SOURCES = nbloader.S
--nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
-@@ -223,7 +224,7 @@
- 
- # For pxeloader target.
- pxeloader_exec_SOURCES = pxeloader.S
--pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
-+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
- pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
- 
- # XXX: See the comment for start_exec-start.o.
diff --git a/recipes/grub/grub-0.93/memcpy.patch b/recipes/grub/grub-0.93/memcpy.patch
deleted file mode 100644
index dd5da33..0000000
--- a/recipes/grub/grub-0.93/memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- grub-0.93/stage2/asm.S~	2002-12-02 23:18:56.000000000 +0000
-+++ grub-0.93/stage2/asm.S	2004-01-04 12:50:11.000000000 +0000
-@@ -62,6 +62,10 @@
- start:
- _start:
- #endif /* ! STAGE1_5 */
-+
-+#undef memcpy
-+ENTRY(memcpy)
-+	jmp EXT_C(grub_memmove)
- 	
- ENTRY(main)
- 	/*
diff --git a/recipes/grub/grub-0.93/reiserfs.patch b/recipes/grub/grub-0.93/reiserfs.patch
deleted file mode 100644
index 5b4fb5b..0000000
--- a/recipes/grub/grub-0.93/reiserfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-0.93/stage2/fsys_reiserfs.c~	2002-11-29 17:46:01.000000000 +0000
-+++ grub-0.93/stage2/fsys_reiserfs.c	2004-01-04 12:16:34.000000000 +0000
-@@ -112,7 +112,7 @@
-   /* offset in the log of where to start replay after a crash */
-   __u32 j_first_unflushed_offset;
-   /* mount id to detect very old transactions */
--  __u32 long j_mount_id;
-+  __u32 j_mount_id;
- };
- 
- /* magic string to find desc blocks in the journal */
diff --git a/recipes/grub/grub_0.93.bb b/recipes/grub/grub_0.93.bb
deleted file mode 100644
index 9fc0084..0000000
--- a/recipes/grub/grub_0.93.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "GRUB is the GRand Unified Bootloader"
-HOMEPAGE = "http://www.gnu.org/software/grub"
-SECTION = "bootloaders"
-PRIORITY = "optional"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
-	   file://autohell.patch;patch=1 \
-	   file://memcpy.patch;patch=1 \
-	   file://reiserfs.patch;patch=1"
-
-inherit autotools
-
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-FILES_${PN}-doc = "${datadir}"
-- 
1.5.6.5

[PATCH] grub: Split the grub-install script and friends into a separate package.

[Michael Smith]

In the main grub package, menu.lst and stage1/2 files will now be
installed in /boot/grub.

stage2_eltorito is split into its own package for bootable ISOs.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/grub/grub_0.97.bb |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
index ef37af1..40adff9 100644
--- a/recipes/grub/grub_0.97.bb
+++ b/recipes/grub/grub_0.97.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "GRand Unified Bootloader"
 HOMEPAGE = "http://www.gnu.org/software/grub"
 SECTION = "bootloaders"
 PRIORITY = "optional"
-RDEPENDS = "diffutils"
-PR = "r4"
+RDEPENDS_${PN}-install = "diffutils"
+PR = "r5"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
            file://automake-1.10.patch;patch=1 \
@@ -11,20 +11,26 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
 
 inherit autotools
 
-python __anonymous () {
-    import re
-    host = bb.data.getVar('HOST_SYS', d, 1)
-    if not re.match('i.86.*-linux', host):
-        raise bb.parse.SkipPackage("incompatible with host %s" % host)
-}
-
 do_install_append() {
-        install -d ${D}/boot/
-	ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
+        install -m 0644 -D ${WORKDIR}/menu.lst ${D}/boot/grub/menu.lst
 
-	# TODO: better use grub-set-default script here?
-	install -m 0644  ${WORKDIR}/menu.lst ${D}/boot/grub
+        # Copy stage1/1_5/2 files to /boot/grub
+        GRUB_TARGET_ARCH=$(echo ${TARGET_ARCH} | sed -e 's/.86/386/')
+        install -m 0644 \
+                ${D}/${libdir}/grub/${GRUB_TARGET_ARCH}${TARGET_VENDOR}/* \
+                ${D}/boot/grub/
 }
 
-FILES_${PN}-doc = "${datadir}"
-FILES_${PN} = "/boot /usr"
+PACKAGES =+ "${PN}-install ${PN}-eltorito"
+
+FILES_${PN}-install = " \
+        ${sbindir}/grub-install \
+        ${sbindir}/grub-terminfo \
+        ${sbindir}/grub-md5-crypt \
+        ${bindir}/mbchk \
+        ${libdir}/grub \
+"
+FILES_${PN}-eltorito = "/boot/grub/stage2_eltorito"
+FILES_${PN} += "/boot"
+
+COMPATIBLE_HOST = "i.86.*-linux"
-- 
1.5.6.5

Re: [PATCH] grub: Split the grub-install script and friends into a separate package.

[Tom Rini]

On Mon, May 11, 2009 at 10:53:24PM -0400, Michael Smith wrote:

> In the main grub package, menu.lst and stage1/2 files will now be
> installed in /boot/grub.
> 
> stage2_eltorito is split into its own package for bootable ISOs.
[snip]
>  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \

Please switch to ${GNU_MIRROR}/grub/...

-- 
Tom Rini

Re: [PATCH] grub: Split the grub-install script and friends into a separate package.

[Michael Smith]

On Mon, 11 May 2009, Tom Rini wrote:

> >  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> 
> Please switch to ${GNU_MIRROR}/grub/...

grub is not on ${GNU_MIRROR}, only alpha.

I can only guess because it never had an official release.

Mike

Re: [PATCH] grub: Split the grub-install script and friends into a separate package.

[Tom Rini]

On Mon, May 11, 2009 at 11:18:29PM -0400, Michael Smith wrote:
> On Mon, 11 May 2009, Tom Rini wrote:
> 
> > >  SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> > 
> > Please switch to ${GNU_MIRROR}/grub/...
> 
> grub is not on ${GNU_MIRROR}, only alpha.
> 
> I can only guess because it never had an official release.

Oh right, my bad.

-- 
Tom Rini

Re: [PATCH 2/3] grub: use ${libdir}, not /usr/lib

[Graeme Gregory]

Leon Woestenberg wrote:
> Hello,
>
> On Thu, May 7, 2009 at 8:27 PM, Michael Smith <msmith@cbnco.com> wrote:
>   
>> Signed-off-by: Michael Smith <msmith@cbnco.com>
>>
>>  do_install_append() {
>>         install -d ${D}/boot/
>> -       ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
>> +       ln -sf ..${libdir}/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub
>>
>>     
>
> Why do we install menu.cfg in ${libdir} anyway?
>
> All desktop distro's I have seen have the menu.lst in /boot/grub/ on the rootfs.
>
> Is this a FHS thing?
>
>   
/boot is on most distros a seperate partition from /. This is to allow
encrypted/lvm based / partitions and the like.

Graeme

Re: [PATCH 1/3] Remove unused grub-0.93.

[Otavio Salvador]

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, May 7, 2009 at 3:27 PM, Michael Smith <msmith@cbnco.com> wrote:
> As far as I can tell, only the wrap board and gpe-phone-image are using
> grub, and they use the default version, 0.97.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/grub/grub-0.93/autohell.patch |  166 ---------------------------------
>  recipes/grub/grub-0.93/memcpy.patch   |   13 ---
>  recipes/grub/grub-0.93/reiserfs.patch |   11 --
>  recipes/grub/grub_0.93.bb             |   15 ---
>  4 files changed, 0 insertions(+), 205 deletions(-)
>  delete mode 100644 recipes/grub/grub-0.93/autohell.patch
>  delete mode 100644 recipes/grub/grub-0.93/memcpy.patch
>  delete mode 100644 recipes/grub/grub-0.93/reiserfs.patch
>  delete mode 100644 recipes/grub/grub_0.93.bb
>
> diff --git a/recipes/grub/grub-0.93/autohell.patch b/recipes/grub/grub-0.93/autohell.patch
> deleted file mode 100644
> index ca1f2d1..0000000
> --- a/recipes/grub/grub-0.93/autohell.patch
> +++ /dev/null
> @@ -1,166 +0,0 @@
> ---- grub-0.93/configure.in~    2002-11-29 20:12:08.000000000 +0000
> -+++ grub-0.93/configure.in     2004-01-04 12:03:05.000000000 +0000
> -@@ -54,7 +54,7 @@
> - _AM_DEPENDENCIES(CC)
> -
> - dnl Because recent automake complains about AS, set it here.
> --AS="$CC"
> -+AM_PROG_AS
> - AC_SUBST(AS)
> -
> - AC_ARG_WITH(binutils,
> ---- grub-0.93/stage1/Makefile.am~      2002-09-08 02:58:08.000000000 +0100
> -+++ grub-0.93/stage1/Makefile.am       2004-01-04 12:31:38.000000000 +0000
> -@@ -4,7 +4,7 @@
> - CLEANFILES = $(nodist_pkgdata_DATA)
> -
> - # We can't use builtins or standard includes.
> --AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
> -+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES)
> - LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
> -
> - noinst_PROGRAMS = stage1.exec
> ---- grub-0.93/stage2/Makefile.am~      2002-11-29 18:00:53.000000000 +0000
> -+++ grub-0.93/stage2/Makefile.am       2004-01-04 12:30:29.000000000 +0000
> -@@ -12,6 +12,7 @@
> -
> - # For <stage1.h>.
> - INCLUDES = -I$(top_srcdir)/stage1
> -+AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES)
> -
> - # The library for /sbin/grub.
> - noinst_LIBRARIES = libgrub.a
> -@@ -88,7 +89,7 @@
> -       fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
> -       smp-imps.c stage2.c terminfo.c tparm.c
> - pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
> --pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
> -+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS)
> - pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
> -
> - if NETBOOT_SUPPORT
> -@@ -109,7 +110,7 @@
> -       echo "#define STAGE2_SIZE $$6" > stage2_size.h
> -
> - start_exec_SOURCES = start.S
> --start_exec_ASFLAGS = $(STAGE2_COMPILE)
> -+start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
> - start_exec_LDFLAGS = $(START_LINK)
> -
> - # XXX: automake doesn't provide a way to specify dependencies for object
> -@@ -127,8 +128,8 @@
> -       stage1_5.c fsys_ext2fs.c bios.c
> - e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
> -       -DNO_BLOCK_FILES=1
> --e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
> --      -DNO_BLOCK_FILES=1
> -+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For fat_stage1_5 target.
> -@@ -136,8 +137,8 @@
> -       stage1_5.c fsys_fat.c bios.c
> - fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
> -       -DNO_BLOCK_FILES=1
> --fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
> --      -DNO_BLOCK_FILES=1
> -+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For ffs_stage1_5 target.
> -@@ -145,8 +146,8 @@
> -       stage1_5.c fsys_ffs.c bios.c
> - ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
> -       -DNO_BLOCK_FILES=1
> --ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
> --      -DNO_BLOCK_FILES=1
> -+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For minix_stage1_5 target.
> -@@ -154,8 +155,8 @@
> -       stage1_5.c fsys_minix.c bios.c
> - minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
> -       -DNO_BLOCK_FILES=1
> --minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
> --      -DNO_BLOCK_FILES=1
> -+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For reiserfs_stage1_5 target.
> -@@ -163,8 +164,8 @@
> -       disk_io.c stage1_5.c fsys_reiserfs.c bios.c
> - reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
> -       -DNO_BLOCK_FILES=1
> --reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
> --      -DNO_BLOCK_FILES=1
> -+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For vstafs_stage1_5 target.
> -@@ -172,8 +173,8 @@
> -       disk_io.c stage1_5.c fsys_vstafs.c bios.c
> - vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
> -       -DNO_BLOCK_FILES=1
> --vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
> --      -DNO_BLOCK_FILES=1
> -+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For jfs_stage1_5 target.
> -@@ -181,8 +182,8 @@
> -       disk_io.c stage1_5.c fsys_jfs.c bios.c
> - jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
> -       -DNO_BLOCK_FILES=1
> --jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
> --      -DNO_BLOCK_FILES=1
> -+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For xfs_stage1_5 target.
> -@@ -190,16 +191,16 @@
> -       disk_io.c stage1_5.c fsys_xfs.c bios.c
> - xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
> -       -DNO_BLOCK_FILES=1
> --xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
> --      -DNO_BLOCK_FILES=1
> -+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
> -+      -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
> - xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
> -
> - # For diskless target.
> - diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
> - diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
> -       -DSUPPORT_DISKLESS=1
> --diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
> --      -DSUPPORT_DISKLESS=1
> -+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
> -+      -DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS)
> - diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
> - diskless_exec_LDADD = ../netboot/libdrivers.a
> -
> -@@ -210,7 +211,7 @@
> -
> - # For nbloader target.
> - nbloader_exec_SOURCES = nbloader.S
> --nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
> -+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
> - nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
> -
> - # XXX: See the comment for start_exec-start.o.
> -@@ -223,7 +224,7 @@
> -
> - # For pxeloader target.
> - pxeloader_exec_SOURCES = pxeloader.S
> --pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
> -+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
> - pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
> -
> - # XXX: See the comment for start_exec-start.o.
> diff --git a/recipes/grub/grub-0.93/memcpy.patch b/recipes/grub/grub-0.93/memcpy.patch
> deleted file mode 100644
> index dd5da33..0000000
> --- a/recipes/grub/grub-0.93/memcpy.patch
> +++ /dev/null
> @@ -1,13 +0,0 @@
> ---- grub-0.93/stage2/asm.S~    2002-12-02 23:18:56.000000000 +0000
> -+++ grub-0.93/stage2/asm.S     2004-01-04 12:50:11.000000000 +0000
> -@@ -62,6 +62,10 @@
> - start:
> - _start:
> - #endif /* ! STAGE1_5 */
> -+
> -+#undef memcpy
> -+ENTRY(memcpy)
> -+      jmp EXT_C(grub_memmove)
> -
> - ENTRY(main)
> -       /*
> diff --git a/recipes/grub/grub-0.93/reiserfs.patch b/recipes/grub/grub-0.93/reiserfs.patch
> deleted file mode 100644
> index 5b4fb5b..0000000
> --- a/recipes/grub/grub-0.93/reiserfs.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- grub-0.93/stage2/fsys_reiserfs.c~  2002-11-29 17:46:01.000000000 +0000
> -+++ grub-0.93/stage2/fsys_reiserfs.c   2004-01-04 12:16:34.000000000 +0000
> -@@ -112,7 +112,7 @@
> -   /* offset in the log of where to start replay after a crash */
> -   __u32 j_first_unflushed_offset;
> -   /* mount id to detect very old transactions */
> --  __u32 long j_mount_id;
> -+  __u32 j_mount_id;
> - };
> -
> - /* magic string to find desc blocks in the journal */
> diff --git a/recipes/grub/grub_0.93.bb b/recipes/grub/grub_0.93.bb
> deleted file mode 100644
> index 9fc0084..0000000
> --- a/recipes/grub/grub_0.93.bb
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -DESCRIPTION = "GRUB is the GRand Unified Bootloader"
> -HOMEPAGE = "http://www.gnu.org/software/grub"
> -SECTION = "bootloaders"
> -PRIORITY = "optional"
> -
> -SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
> -          file://autohell.patch;patch=1 \
> -          file://memcpy.patch;patch=1 \
> -          file://reiserfs.patch;patch=1"
> -
> -inherit autotools
> -
> -COMPATIBLE_HOST = 'i.86.*-linux'
> -
> -FILES_${PN}-doc = "${datadir}"
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br