Index: elkscmd/Makefile =================================================================== RCS file: /cvsroot/elks/elkscmd/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- elkscmd/Makefile 29 May 2002 18:23:03 -0000 1.19 +++ elkscmd/Makefile 29 Feb 2004 16:24:21 -0000 @@ -126,6 +126,15 @@ ############################################################################### # +# Insert include files into proper directory + +$(INSERT_INCLUDE): + cp -r ../elks/include/arch /usr/bcc/include + cp -r ../elks/include/limuxmt /usr/bcc/include + + +############################################################################### +# # Old commands, left as is for now. $(COMB_TARGET_FS): @@ -174,7 +183,7 @@ (cd $(TARGET_MNT)/dev ; ./MAKEDEV) mount_rootfs: $(ROOT_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue - $(MKFS) $(MKFS_OPTS) $(ROOT_TARGET_FS) $(ROOT_TARGET_BLKS) + $(MKFS) $(MKFS_OPTS) -i224 $(ROOT_TARGET_FS) $(ROOT_TARGET_BLKS) mount $(ROOT_TARGET_FS) $(TARGET_MNT) $(LOOP) (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \ (cd $(TARGET_MNT) ; tar xpvf -) @@ -209,32 +218,32 @@ cp $(ELKS_DIR)/arch/i86/boot/Image boot -comb: mount_combfs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) +comb: mount_combfs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) $(INSERT_INCLUDE) @for i in $(DIRS); do make -C $$i min_rfs ; done cp $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux cp $(KHELPER) $(TARGET_MNT)/boot/boot umount $(COMB_TARGET_FS) dd if=$(FD_BSECT) of=$(COMB_TARGET_FS) bs=512 count=2 conv=notrunc -full3: mount_full3fs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) +full3: mount_full3fs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) $(INSERT_INCLUDE) @for i in $(DIRS); do make -C $$i rfs ; done cp $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux cp $(KHELPER) $(TARGET_MNT)/boot/boot umount $(FULL3_TARGET_FS) dd if=$(FD_BSECT) of=$(FULL3_TARGET_FS) bs=512 count=2 conv=notrunc -full5: mount_full3fs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) +full5: mount_full3fs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) $(INSERT_INCLUDE) @for i in $(DIRS); do make -C $$i rfs ; done cp $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux cp $(KHELPER) $(TARGET_MNT)/boot/boot umount $(FULL3_TARGET_FS) dd if=$(FD_BSECT) of=$(FULL3_TARGET_FS) bs=512 count=2 conv=notrunc -root: mount_rootfs +root: mount_rootfs $(INSERT_INCLUDE) @for i in $(DIRS); do make -C $$i min_rfs ; done umount $(ROOT_TARGET_FS) -comb_net: mount_rootnetfs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) +comb_net: mount_rootnetfs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER) $(INSERT_INCLUDE) cd $(ELKSNET_DIR)/ktcp ; \ make ; \ cp -p -f ktcp $(TARGET_MNT)/bin @@ -244,7 +253,7 @@ umount $(ROOT_NET_TARGET_FS) dd if=$(FD_BSECT) of=$(ROOT_NET_TARGET_FS) bs=512 count=2 conv=notrunc -sibo: mount_sibofs +sibo: mount_sibofs $(INSERT_INCLUDE) @for i in $(DIRS); do make -C $$i smin_rfs ; done umount $(SIBO_TARGET_FS) Index: elkscmd/file_utils/Makefile =================================================================== RCS file: /cvsroot/elks/elkscmd/file_utils/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- elkscmd/file_utils/Makefile 29 May 2002 18:23:11 -0000 1.11 +++ elkscmd/file_utils/Makefile 29 Feb 2004 16:24:22 -0000 @@ -39,7 +39,7 @@ PRGS=cat chgrp chmod chown cmp cp dd grep ln ls mkdir mkfifo mknod \ more mv rm rmdir sync touch -MIN_PRGS=cat chgrp chmod chown cmp cp l ls mknod mkdir mv rm rmdir \ +MIN_PRGS=cat chgrp chmod chown cmp cp ln ls mknod mkdir mv rm rmdir \ sync touch SMIN_PRGS=cat cp ls mkdir sync