Changeset d70b4e7 in network-demos


Ignore:
Timestamp:
Sep 4, 2007, 4:26:58 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master, network-demos-4-10-branch, network-demos-4-8-branch, network-demos-4-9-branch
Children:
a027365
Parents:
0cbc6db
Message:

2007-09-04 Joel Sherrill <joel.sherrill@…>

  • Makefile: Use bin2c to more reliably turn the tarfile into a linkable object file. Ignore .cvsignore when making tarfile.
  • init.c: Clean up tarfile symbol definitions.
  • .cvsignore, rootfs/.cvsignore: New files.
Location:
http
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • http/ChangeLog

    r0cbc6db rd70b4e7  
     12007-09-04      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile: Use bin2c to more reliably turn the tarfile into a
     4        linkable object file. Ignore .cvsignore when making tarfile.
     5        * init.c: Clean up tarfile symbol definitions.
     6        * .cvsignore, rootfs/.cvsignore: New files.
     7
    182007-08-16      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • http/Makefile

    r0cbc6db rd70b4e7  
    99
    1010# C source names, if any, go here -- minus the .c
    11 C_PIECES=init
     11C_PIECES=init FilesystemImage
    1212C_FILES=$(C_PIECES:%=%.c)
    1313C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
     
    1919
    2020SRCS=$(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
    21 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) $(ARCH)/tarfile.o
     21OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    2222
    2323PRINT_SRCS=$(DOCS)
     
    4545
    4646USE_GOHEAD=no
    47 USE_SIMPLE=no
     47USE_SIMPLE=yes
    4848USE_FTPD=yes
    4949ifeq ($(USE_GOHEAD),yes)
     
    6464endif
    6565
     66LD_LIBS +=
     67
    6668#
    6769# Add your list of files to delete here.  The config files
     
    7173#
    7274
    73 CLEAN_ADDITIONS += tarfile obj_format stamp-index-html rootfs/index.html
     75CLEAN_ADDITIONS += FilesystemImage FilesystemImage.c FilesystemImage.h
     76CLEAN_ADDIRIONS += stamp-index-html rootfs/index.html
    7477CLOBBER_ADDITIONS +=
    7578
     
    8184all:    ${ARCH} $(SRCS) $(PGM)
    8285
    83 obj_format:
    84         $(OBJDUMP) -f $(ARCH)/init.o | grep .o: | \
    85             sed -e 's/^.*format //' >obj_format
    86 
    8786${PGM}: $(OBJS) $(LINK_FILES)
    8887        $(make-exe)
    8988
    90 $(ARCH)/tarfile.o: $(ARCH) stamp-index-html obj_format
    91         cd rootfs ; tar cf ../$(ARCH)/tarfile --exclude CVS .
    92         cp $(ARCH)/tarfile .
    93         $(OBJCOPY) -I binary -O `cat obj_format` \
    94             -B $(COPY_ARCH) tarfile $(ARCH)/tarfile.o
     89
     90$(ARCH)/init.c: init.c FilesystemImage.c
     91
     92FilesystemImage: $(ARCH) stamp-index-html
     93        cd rootfs ; \
     94            tar cf ../FilesystemImage --exclude CVS --exclude .cvsignore .
     95
     96FilesystemImage.c: $(ARCH) FilesystemImage
     97        $(PROJECT_ROOT)/bin/bin2c FilesystemImage FilesystemImage
    9598
    9699stamp-index-html: index.html.in
  • http/init.c

    r0cbc6db rd70b4e7  
    5454
    5555/*
    56  *  The tarfile is built automatically externally so we need to account
    57  *  for the leading symbol on the names.
     56 *  The tarfile image is built automatically externally.
    5857 */
    59 #if defined(__sh__)
    60   #define SYM(_x) _x
    61 #else
    62   #define SYM(_x) _ ## _x
    63 #endif
    64 
    65 extern int SYM(binary_tarfile_start);
    66 extern int SYM(binary_tarfile_size);
    67 #define TARFILE_START SYM(binary_tarfile_start)
    68 #define TARFILE_SIZE SYM(binary_tarfile_size)
     58#include "FilesystemImage.h"
     59#define TARFILE_START FilesystemImage
     60#define TARFILE_SIZE  FilesystemImage_size
    6961
    7062#if defined(USE_FTPD)
Note: See TracChangeset for help on using the changeset viewer.