[pkg-fso-commits] [SCM] Debian packaging for uboot-envtools branch, master, updated. debian/20081215-2-17-g263a613

[Per Andersson]

The following commit has been merged in the master branch:
commit ecab32e564d4be747c6cf4d252969357b373b25a
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Aug 6 12:17:00 2009 +0200

    Reset fuckup with committing patched files.

diff --git a/Makefile b/Makefile
index 1b9d7c3..9629ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,12 @@
 # MA 02111-1307 USA
 #
 
+include $(TOPDIR)/config.mk
+
 SRCS	:= $(obj)crc32.c  fw_env.c  fw_env_main.c
 HEADERS	:= fw_env.h
 
-CPPFLAGS := -Wall -DUSE_HOSTCC -I/usr/include
+CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include
 
 ifeq ($(MTD_VERSION),old)
 CPPFLAGS += -DMTD_OLD
@@ -37,3 +39,14 @@ $(obj)fw_printenv:	$(SRCS) $(HEADERS)
 
 clean:
 	rm -f $(obj)fw_printenv $(obj)crc32.c
+
+$(obj)crc32.c:
+	ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+
+#########################################################################
+
+include $(TOPDIR)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/crc32.c b/crc32.c
index 4913e6a..83d1d1d 100644
--- a/crc32.c
+++ b/crc32.c
@@ -154,7 +154,7 @@ const uint32_t * ZEXPORT get_crc_table()
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */
-uLong ZEXPORT crc32 (uLong crc, const Bytef *buf, uInt len)
+uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)

-- 
Debian packaging for uboot-envtools