* Whoops!!
@ 2004-02-29 16:53 Tommy McCabe
2004-03-02 11:46 ` Whoops!! Paul Nasrat
0 siblings, 1 reply; 4+ messages in thread
From: Tommy McCabe @ 2004-02-29 16:53 UTC (permalink / raw)
To: linux-8086
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
I forgot to attach the files before pressing the
'Send' button! Sorry.
__________________________________
Do you Yahoo!?
Get better spam protection with Yahoo! Mail.
http://antispam.yahoo.com/tools
[-- Attachment #2: patch2.diff --]
[-- Type: application/octet-stream, Size: 3744 bytes --]
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
[-- Attachment #3: MAKEDEV --]
[-- Type: application/octet-stream, Size: 8628 bytes --]
#!/bin/sh
# Devices are generated by this script in the same order that they are listed
# in the Documentation/devices.txt file in the Linux 2.4.18 and5.21 kernel
# sources. This includes devices that are not currently relevant to ELKS, to
# encourage the use of common node numbers when these devices are eventually
# implemented.
#
# Where different node numbers are currently used by ELKS, the current ELKS
# node numbers are generated by lines labelled "Currently" and the relevant
# Linux node numbers are generated by lines labelled "Ought to be".
#
# Refer to the MAKESET command, also in this directory, for usage details.
LINK=/bin/ln
MKDEV=/bin/mknod
MKSET=./MAKESET
##############################################################################
# Ensure required auxilliary script is present.
if ! test -f "$MKSET"
then
echo ERROR: \"$MKSET\" script missing, unable to continue.
exit 1
fi
##############################################################################
# Create memory devices.
$MKDEV mem c 1 1
$MKDEV kmem c 1 2
$MKDEV null c 1 3
# $MKDEV port c 1 4
$MKDEV zero c 1 5
# $MKDEV core c 1 6
$MKDEV full c 1 7
# $MKDEV random c 1 8
# $MKDEV urandom c 1 9
# $MKDEV aio c 1 10
##############################################################################
# RAM disks.
$MKSET 0 7 $MKDEV ram b 1
$LINK ram1 ramdisk
##############################################################################
# Pseudo-TTY master devices. These are not yet supported by the ELKS kernel.
# $MKSET 0 15 $MKDEV ptyp x 2
# $MKSET 16 15 $MKDEV ptyq x 2
# $MKSET 32 15 $MKDEV ptyr x 2
# $MKSET 48 15 $MKDEV ptys x 2
# $MKSET 64 15 $MKDEV ptyt x 2
# $MKSET 80 15 $MKDEV ptyu x 2
# $MKSET 96 15 $MKDEV ptyv x 2
# $MKSET 112 15 $MKDEV ptyw x 2
# $MKSET 128 15 $MKDEV ptyx x 2
# $MKSET 144 15 $MKDEV ptyy x 2
# $MKSET 160 15 $MKDEV ptyz x 2
# $MKSET 176 15 $MKDEV ptya x 2
# $MKSET 192 15 $MKDEV ptyb x 2
# $MKSET 208 15 $MKDEV ptyc x 2
# $MKSET 224 15 $MKDEV ptyd x 2
# $MKSET 240 15 $MKDEV ptye x 2
##############################################################################
# Floppy diskettes. Only the auto-detect nodes are listed.
$MKDEV fd0 b 3 128 # Currently.
$MKDEV fd1 b 3 192 # Currently.
# $MKSET 0 3 $MKDEV fd b 2 # Ought to be.
##############################################################################
# Pseudo-TTY master devices. These are not yet supported by the ELKS kernel.
# $MKSET 0 15 $MKDEV ttyp x 3
# $MKSET 16 15 $MKDEV ttyq x 3
# $MKSET 32 15 $MKDEV ttyr x 3
# $MKSET 48 15 $MKDEV ttys x 3
# $MKSET 64 15 $MKDEV ttyt x 3
# $MKSET 80 15 $MKDEV ttyu x 3
# $MKSET 96 15 $MKDEV ttyv x 3
# $MKSET 112 15 $MKDEV ttyw x 3
# $MKSET 128 15 $MKDEV ttyx x 3
# $MKSET 144 15 $MKDEV ttyy x 3
# $MKSET 160 15 $MKDEV ttyz x 3
# $MKSET 176 15 $MKDEV ttya x 3
# $MKSET 192 15 $MKDEV ttyb x 3
# $MKSET 208 15 $MKDEV ttyc x 3
# $MKSET 224 15 $MKDEV ttyd x 3
# $MKSET 240 15 $MKDEV ttye x 3
##############################################################################
# Direct IDE disks, Primary channel.
$MKSET 0 15 $MKDEV hda b 5 # Currently.
$MKSET 16 15 $MKDEV hdb b 5 # Currently.
# $MKSET 0 63 $MKDEV hda b 3 # Ought to be.
# $MKSET 64 63 $MKDEV hdb b 3 # Ought to be.
##############################################################################
# Virtual consoles. Note that tty4 through tty7 can't be enabled at this
# time because of the possible conflict with ttyS0 through ttyS3 which
# used to use the node numbers these now use. However, it is expected that
# this restriction can be removed in the near future.
$MKSET 0 3 $MKDEV tty c 4 # Currently
# $MKSET 0 15 $MKDEV tty c 4 # Soon to be
# Serial ports, as detected by the ROM BIOS.
$MKSET 64 3 $MKDEV ttyS c 4
##############################################################################
# Alternate TTY devices. These are not yet supported.
# $MKDEV tty c 5 0
# $MKDEV console c 5 1
# $MKDEV ptmx c 5 2
##############################################################################
# Parallel devices, as detected by the ROM BIOS.
$MKSET 0 3 $MKDEV lp c 6
##############################################################################
# Loopback devices. These are not yet supported.
# $MKSET 0 15 $MKDEV loop c 7
##############################################################################
# SCSI disks. These are not yet supported.
# $MKSET 0 15 $MKDEV sda b 8
# $MKSET 16 15 $MKDEV sdb b 8
# $MKSET 32 15 $MKDEV sdc b 8
# $MKSET 48 15 $MKDEV sdd b 8
# $MKSET 64 15 $MKDEV sde b 8
# $MKSET 80 15 $MKDEV sdf b 8
# $MKSET 96 15 $MKDEV sdg b 8
# $MKSET 112 15 $MKDEV sdh b 8
# $MKSET 128 15 $MKDEV sdi b 8
# $MKSET 144 15 $MKDEV sdj b 8
# $MKSET 160 15 $MKDEV sdk b 8
# $MKSET 176 15 $MKDEV sdl b 8
# $MKSET 192 15 $MKDEV sdm b 8
# $MKSET 208 15 $MKDEV sdn b 8
# $MKSET 224 15 $MKDEV sdo b 8
# $MKSET 240 15 $MKDEV sdp b 8
##############################################################################
# SCSI tapes. These are not yet supported.
# $MKSET 0 31 $MKDEV st c 9
# $MKSET 32 31 $MKDEV st c 9 l
# $MKSET 64 31 $MKDEV st c 9 m
# $MKSET 96 31 $MKDEV st c 9 a
# $MKSET 128 31 $MKDEV nst c 9
# $MKSET 160 31 $MKDEV nst c 9 l
# $MKSET 192 31 $MKDEV nst c 9 m
# $MKSET 224 31 $MKDEV nst c 9 a
##############################################################################
# Metadisk (RAID) devices. These are not yet supported.
# $MKSET 0 15 $MKDEV md b 9
##############################################################################
# SCSI CD-ROM devices. These are not yet supported.
# $MKSET 0 15 $MKDEV scd b 11
##############################################################################
# MSCDEX CD-ROM devices. These are not yet supported.
# $MKSET 0 15 $MKDEV doscd b 12
##############################################################################
# 8-bit MFM/RLL controllers. These are not yet supported.
# $MKSET 0 63 $MKDEV xda b 13
# $MKSET 64 63 $MKDEV xdb b 13
##############################################################################
# BIOS hard disks.
$MKSET 0 15 $MKDEV bda b 3 # Currently
$MKSET 16 15 $MKDEV bdb b 3 # Currently
$MKSET 32 15 $MKDEV bdc b 3 # Currently
$MKSET 48 15 $MKDEV bdd b 3 # Currently
# $MKSET 0 63 $MKDEV bda b 14 # Ought to be
# $MKSET 64 63 $MKDEV bdb b 14 # Ought to be
# $MKSET 128 63 $MKDEV bdc b 14 # Ought to be
# $MKSET 192 63 $MKDEV bdd b 14 # Ought to be
##############################################################################
# Joysticks. These are not yet supported.
# $MKSET 0 15 $MKDEV js c 15
# $MKSET 128 15 $MKDEV djs c 15
##############################################################################
# Generic SCSI devics. These are not yet supported.
# $MKSET 0 15 $MKDEV sg c 21
##############################################################################
# Direct IDE disks, Secondary channel. These are not yet supported.
# $MKSET 0 63 $MKDEV hdc b 22
# $MKSET 64 63 $MKDEV hdd b 22
##############################################################################
# Direct IDE disks, Tertiary channel. These are not yet supported.
# $MKSET 0 63 $MKDEV hde b 33
# $MKSET 64 63 $MKDEV hdf b 33
##############################################################################
# Z80-SIO devices. These are not yet supported.
# $MKSET 0 7 $MKDEV scc c 34
##############################################################################
# Direct IDE disks, Quaternary channel. These are not yet supported.
# $MKSET 0 63 $MKDEV hde b 34
# $MKSET 64 63 $MKDEV hdf b 34
##############################################################################
# Direct IDE disks, Quinternary channel. These are not yet supported.
# $MKSET 0 63 $MKDEV hdg b 56
# $MKSET 64 63 $MKDEV hdh b 56
##############################################################################
# Direct IDE disks, Quaternary channel. These are not yet supported.
# $MKSET 0 63 $MKDEV hdi b 57
# $MKSET 64 63 $MKDEV hdj b 57
##############################################################################
# SCSI Media Changer. These are not yet supported.
# $MKSET 0 15 $MKDEV sch c 86
##############################################################################
# I2C bus drivers. These are not yet supported.
# $MKSET 0 7 $MKDEV i2c c 89
##############################################################################
# Conrad Electronic Parallel Port Radio Clocks. These are not yet supported.
# $MKSET 0 1 $MKDEV pcfclock c 181
##############################################################################
# EOF.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Whoops!!
2004-02-29 16:53 Whoops!! Tommy McCabe
@ 2004-03-02 11:46 ` Paul Nasrat
0 siblings, 0 replies; 4+ messages in thread
From: Paul Nasrat @ 2004-03-02 11:46 UTC (permalink / raw)
To: linux-8086
On Sun, Feb 29, 2004 at 08:53:39AM -0800, Tommy McCabe wrote:
> I forgot to attach the files before pressing the
> 'Send' button! Sorry.
Thanks for these. I'll try and spend some time this week to look at them.
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* Whoops!
@ 2004-07-13 13:18 Tommy McCabe
2004-07-27 13:54 ` Whoops! Miguel Bolanos
0 siblings, 1 reply; 4+ messages in thread
From: Tommy McCabe @ 2004-07-13 13:18 UTC (permalink / raw)
To: linux-8086
The previous patch has two bugs that I overlooked...
1. I forgot to put a / when stating the location of
FD_BSECT and KHELPER.
2. When I removed the sudos from elkscmd/Makefile, I
removed the mount command as well.
__________________________________
Do you Yahoo!?
Yahoo! Mail Address AutoComplete - You start. We finish.
http://promotions.yahoo.com/new_mail
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Whoops!
2004-07-13 13:18 Whoops! Tommy McCabe
@ 2004-07-27 13:54 ` Miguel Bolanos
0 siblings, 0 replies; 4+ messages in thread
From: Miguel Bolanos @ 2004-07-27 13:54 UTC (permalink / raw)
To: Tommy McCabe; +Cc: linux-8086
Greetings,
I always like to encourage people to submit bug reports and fix
patches... but even much more important than this, is the fact that i
expect that whatever patches are sent to the list are actually tested
(no just that apply), that they won't brake the code.
Tommy please test your patches before submitting, thank you.
best wishes
Mike
On Tue, 2004-07-13 at 07:18, Tommy McCabe wrote:
> The previous patch has two bugs that I overlooked...
>
> 1. I forgot to put a / when stating the location of
> FD_BSECT and KHELPER.
>
> 2. When I removed the sudos from elkscmd/Makefile, I
> removed the mount command as well.
>
>
>
> __________________________________
> Do you Yahoo!?
> Yahoo! Mail Address AutoComplete - You start. We finish.
> http://promotions.yahoo.com/new_mail
> -
> To unsubscribe from this list: send the line "unsubscribe linux-8086" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-07-27 13:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-13 13:18 Whoops! Tommy McCabe
2004-07-27 13:54 ` Whoops! Miguel Bolanos
-- strict thread matches above, loose matches on Subject: below --
2004-02-29 16:53 Whoops!! Tommy McCabe
2004-03-02 11:46 ` Whoops!! Paul Nasrat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox