Ticket #159: http_patch

File http_patch, 2.3 KB (added by ianc, on 12/03/06 at 13:31:12)

http_patch

Line 
1diff -N -P -c netdemos-4.5.0/http/Makefile netdemos-4.5.0.new/http/Makefile
2*** netdemos-4.5.0/http/Makefile        Thu Jul 13 00:44:57 2000
3--- netdemos-4.5.0.new/http/Makefile    Wed Mar 20 11:17:04 2002
4***************
5*** 55,63 ****
6  all:  ${ARCH} $(SRCS) $(PGM)
7
8  ${PGM}: $(OBJS) $(LINK_FILES)
9!       cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
10        cp $(ARCH)/tarfile .
11!       $(OBJCOPY) -I binary -O elf32-powerpc tarfile $(ARCH)/tarfile.o
12        $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
13        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
14        $(RM) $(ARCH)/temp.o
15--- 55,63 ----
16  all:  ${ARCH} $(SRCS) $(PGM)
17
18  ${PGM}: $(OBJS) $(LINK_FILES)
19!       cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
20        cp $(ARCH)/tarfile .
21!       $(OBJCOPY) -I binary -O elf32-m68k tarfile $(ARCH)/tarfile.o
22        $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
23        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
24        $(RM) $(ARCH)/temp.o
25diff -N -P -c netdemos-4.5.0/http/init.c netdemos-4.5.0.new/http/init.c
26*** netdemos-4.5.0/http/init.c  Thu Jul 13 00:44:57 2000
27--- netdemos-4.5.0.new/http/init.c      Wed Mar 20 17:12:32 2002
28***************
29*** 63,72 ****
30  #define TARFILE_START _binary_o_debug_tarfile_start
31  #define TARFILE_SIZE _binary_o_debug_tarfile_size
32  #else
33! extern int _binary_o_optimize_tarfile_start;
34! extern int _binary_o_optimize_tarfile_size;
35! #define TARFILE_START _binary_o_optimize_tarfile_start
36! #define TARFILE_SIZE _binary_o_optimize_tarfile_size
37  #endif
38
39  struct rtems_ftpd_configuration rtems_ftpd_configuration = {
40--- 63,72 ----
41  #define TARFILE_START _binary_o_debug_tarfile_start
42  #define TARFILE_SIZE _binary_o_debug_tarfile_size
43  #else
44! extern int _binary_tarfile_start;
45! extern int _binary_tarfile_size;
46! #define TARFILE_START _binary_tarfile_start
47! #define TARFILE_SIZE _binary_tarfile_size
48  #endif
49
50  struct rtems_ftpd_configuration rtems_ftpd_configuration = {
51***************
52*** 89,95 ****
53    rtems_initialize_ftpd();
54
55    status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
56!
57    rtems_initialize_webserver();
58
59    status = rtems_task_delete( RTEMS_SELF );
60--- 89,97 ----
61    rtems_initialize_ftpd();
62
63    status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
64!
65!    sethostname("rtems", 5);
66!
67    rtems_initialize_webserver();
68
69    status = rtems_task_delete( RTEMS_SELF );