6.1 release branch

[Jeremy Huntwork]

Ken Moffat wrote:

>  Confirmed that 1.36 ran check ok, diffed it and realised this is a new
> test.  Google found one thread for e2fsprogs tst_ostype - the fix is at
> 
> http://www.diy-linux.org/pipermail/diy-linux-dev/2005-March/000490.html
> 
>  Thanks, Greg.  Did I miss the LFS editorial decision not to test
> package upgrades ?

FWIW, Ryan asked me last night in IRC to forward a message to lfs-dev 
that contains a patch which solves this same issue, I believe.  Sorry 
that I was a little slow on the ball.

It's sitting in his home directory on belgarath,
http://linuxfromscratch.org/~ryan/e2fsprogs-1.37-fix_tst_ostype-1.patch

I'll include the actual content here, too.

Ryan's message below:
========================================================================

Matthew Burgess wrote:

 > b) It fixes a problem reported against the 6.1 branch either on the
 > mailing lists or bugzilla

Well, heres a quick one

e2fsprogs 1.37 tests are breaking cos of a braindead error where include
paths are not being supplied to the build of tst_ostype

quick patch attached

Regards
[R]

diff -uNr e2fsprogs-1.37-orig/lib/e2p/Makefile.in 
e2fsprogs-1.37/lib/e2p/Makefile.in
--- e2fsprogs-1.37-orig/lib/e2p/Makefile.in     2005-03-20 
07:59:38.000000000 +1100
+++ e2fsprogs-1.37/lib/e2p/Makefile.in  2005-03-28 13:39:31.000000000 +1000
@@ -66,7 +66,7 @@

  tst_ostype: $(srcdir)/ostype.c
         @echo " LD $@"
-       @$(CC) -DTEST_PROGRAM -o tst_ostype $(srcdir)/ostype.c
+       @$(CC) $(ALL_CFLAGS) -DTEST_PROGRAM -o tst_ostype $(srcdir)/ostype.c

  check::        tst_ostype
         ./tst_ostype

==========================================================================

--
Jeremy H.