[U-Boot-Users] [PATCH] Fix host tool build breakage, take two

Kumar Gala
2008-04-02T14:55:58Z

On Tue, 1 Apr 2008, Wolfgang Denk wrote:

> In message <5D708345-1CF3-46FA-B9D2-689C52625177@kernel.crashing.org> you wrote:
> >
> > > I don't know RHEL - maybe you can update the RPM?
> >
> > Not that I'm aware of. Its a box run by our IT department so I have
> > no ability to upgrade or modify things. It looks like RHEL4 has the
> > same issue.
> >
> > ld2047$ rpm -qf /usr/include/md5.h
> > cyrus-sasl-devel-2.1.19-5.EL4
>
> I see. I have to go back pretty far in time to find such a
> configuration:
>
> $ ls -l /usr/include/md5.h
> -rw-r--r-- 1 root root 1572 Apr 24 2006 /usr/include/md5.h
> $ rpm -qf /usr/include/md5.h
> cyrus-sasl-devel-2.1.20-6
> $ cat /etc/issue
> Fedora Core release 4 (Stentz)
>
> All more recent distros seem to have this fixed (and yes,
> cyrus-sasl-devel is installed in all of them):
>
> $ ls -l /usr/include/md5.h
> ls: /usr/include/md5.h: No such file or directory
> $ cat /etc/issue
> Fedora Core release 5 (Bordeaux)
>
> $ ls -l /usr/include/md5.h
> ls: /usr/include/md5.h: No such file or directory
> $ cat /etc/issue
> Fedora Core release 6 (Zod)
>
> $ ls -l /usr/include/md5.h
> ls: cannot access /usr/include/md5.h: No such file or directory
> $ cat /etc/issue
> Fedora release 7 (Moonshine)
>
> $ ls -l /usr/include/md5.h
> ls: cannot access /usr/include/md5.h: No such file or directory
> $ cat /etc/issue
> Fedora release 8 (Werewolf)
>
> > Any ideas on how to work around this? Do we really intend to pick up
> > the system md5.h or should we be getting the one from u-boot/include/
> > md5.h?
>
> We need the system md5.h, I think. We'll investigate.

If I force things to use the md5.h in u-boot/include things seem to build.
Here's the patch for the forcing:

diff --git a/common/image.c b/common/image.c
index f04826a..cf3c9f3 100644
--- a/common/image.c
+++ b/common/image.c
@@ -53,7 +53,7 @@
#endif

#if defined(CONFIG_FIT)
-#include <md5.h>
+#include "../md5.h"
#include <sha1.h>

static int fit_check_ramdisk (const void *fit, int os_noffset,
@@ -70,7 +70,7 @@ static image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch,
int verify);
#else
#include "mkimage.h"
-#include <md5.h>
+#include "../include/md5.h"
#include <time.h>
#include <image.h>
#endif /* !USE_HOSTCC*/
diff --git a/lib_generic/md5.c b/lib_generic/md5.c
index a51da45..b99ccc4 100644
--- a/lib_generic/md5.c
+++ b/lib_generic/md5.c
@@ -27,7 +27,7 @@

#include <linux/types.h>
#include <linux/string.h>
-#include <md5.h>
+#include "../include/md5.h"

static void
MD5Transform(__u32 buf[4], __u32 const in[16]);