* Another patch
@ 2001-02-25 15:58 Gioele Barabucci
0 siblings, 0 replies; 7+ messages in thread
From: Gioele Barabucci @ 2001-02-25 15:58 UTC (permalink / raw)
To: linux-hotplug
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
This patch is just a code cleanup but adds also the possibility to use
comments in *map files (but only if the line starts exactly with "# ")
Please test it deeply because I have not tested it a lot (I'm having probs
with my linux box)
--
Gioele Barabucci (Gb])
) mailto:gioele@gioelebarabucci.com
) http://www.gioelebarabucci.com
) ) I've been and now I've gone
) ) /Magic Pie^Oasis
[-- Attachment #2: a patch --]
[-- Type: text/plain, Size: 7326 bytes --]
Index: etc/hotplug/hotplug.functions
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/hotplug.functions,v
retrieving revision 1.2
diff -u -3 -p -r1.2 hotplug.functions
--- etc/hotplug/hotplug.functions 2001/02/04 20:16:19 1.2
+++ etc/hotplug/hotplug.functions 2001/02/25 15:54:17
@@ -58,8 +58,13 @@ MODPROBE="/sbin/modprobe"
#
load_drivers ()
{
- DRIVERS=
+ DRIVERS=""
+ # make this routine more readable
+ TYPE=$1
+ FILENAME=$2
+ DESCRIPTION=$3
+
# NOTE: usbmodules isn't currently in the trusted path; also,
# something later than "usbutils-0.7" is needed ("--mapfile"
# and modutils 2.4.2 support are both needed ... patch avail
@@ -69,16 +74,16 @@ load_drivers ()
# choose which way they use to generate module listings.
# can we use usbmodules, pcimodules?
- LISTER=`type -p $1modules`
- if [ x$LISTER != x ]; then
- case $1 in
+ LISTER=`type -p ${TYPE}modules`
+ if [ "$LISTER" != "" ]; then
+ case $TYPE in
usb)
# only works if we have usbdevfs
# ... reads more descriptors than are passed in env
- if [ x$DEVICE = x ]; then
+ if [ "$DEVICE" = "" ]; then
LISTER=
else
- DRIVERS=`$LISTER --mapfile $2 --device $DEVICE`
+ DRIVERS=`$LISTER --mapfile $FILENAME --device $DEVICE`
fi ;;
pci)
@@ -88,14 +93,14 @@ load_drivers ()
DRIVERS=`$LISTER`
;;
- *) mesg "how to invoke $1modules ??"
+ *) mesg "how to invoke ${TYPE}modules ??"
LISTER=
esac
fi
# do it with just shell scripts
- if [ x$LISTER = x ]; then
- $1_map_modules < $2
+ if [ "$LISTER" = "" ]; then
+ ${TYPE}_map_modules < $FILENAME
fi
if [ "$DRIVERS" = "" ]; then
@@ -103,7 +108,7 @@ load_drivers ()
fi
if [ "$DEBUG" != "" ]; then
- mesg Modprobe and setup $DRIVERS for $3
+ mesg Modprobe and setup $DRIVERS for $DESCRIPTION
fi
# maybe driver modules need loading and configuring
@@ -114,11 +119,11 @@ load_drivers ()
if ! $MODPROBE $MODULE >/dev/null 2>&1
then
mesg "... can't load module $MODULE"
- elif [ -x /etc/hotplug/$1/$MODULE ]; then
+ elif [ -x /etc/hotplug/$TYPE/$MODULE ]; then
if [ "$DEBUG" != "" ]; then
- mesg Module setup $MODULE for $3
+ mesg Module setup $MODULE for $DESCRIPTION
fi
- /etc/hotplug/$1/$MODULE
+ /etc/hotplug/$TYPE/$MODULE
fi
fi
done
Index: etc/hotplug/net.agent
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/net.agent,v
retrieving revision 1.4
diff -u -3 -p -r1.4 net.agent
--- etc/hotplug/net.agent 2001/02/16 23:12:30 1.4
+++ etc/hotplug/net.agent 2001/02/25 15:54:17
@@ -18,7 +18,7 @@
. hotplug.functions
# DEBUG=yes export DEBUG
-if [ x$INTERFACE = x ]; then
+if [ "$INTERFACE" = "" ]; then
mesg Bad NET invocation
exit 1
fi
Index: etc/hotplug/pci.agent
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/pci.agent,v
retrieving revision 1.7
diff -u -3 -p -r1.7 pci.agent
--- etc/hotplug/pci.agent 2001/02/17 14:56:50 1.7
+++ etc/hotplug/pci.agent 2001/02/25 15:54:17
@@ -38,7 +38,7 @@ MAP_CURRENT=$MODULE_DIR/modules.pcimap
# accumulates list of modules we may care about
DRIVERS=
-if [ x$PCI_CLASS = x -o x$PCI_CLASS = x ]; then
+if [ "$PCI_CLASS" = "" -o "$PCI_CLASS" = "" ]; then
mesg Bad PCI agent invocation
exit 1
fi
@@ -102,6 +102,9 @@ pci_map_modules ()
while read module vendor device subvendor subdevice class class_mask ignored
do
: checkmatch $module
+ if [ "$module" = "#" ]; then
+ continue
+ fi
: vendor $vendor $pci_id_vendor
if [ $vendor -ne $PCI_ANY -a $vendor -ne $pci_id_vendor ]; then
Index: etc/hotplug/usb.agent
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/usb.agent,v
retrieving revision 1.7
diff -u -3 -p -r1.7 usb.agent
--- etc/hotplug/usb.agent 2001/02/16 22:46:10 1.7
+++ etc/hotplug/usb.agent 2001/02/25 15:54:18
@@ -44,7 +44,7 @@
if [ -f /etc/sysconfig/usb ]; then
. /etc/sysconfig/usb
- if [ x$USBD_ENABLE = xfalse ]; then
+ if [ "$USBD_ENABLE" = "false" ]; then
exit 0
fi
fi
@@ -80,7 +80,7 @@ MAP_USERMAP=$HOTPLUG_DIR/usb.usermap
# accumulates list of modules we may care about
DRIVERS=
-if [ x$PRODUCT = x -o x$ACTION = x ]; then
+if [ "$PRODUCT" = "" -o "$ACTION" = "" ]; then
mesg Bad USB agent invocation
exit 1
fi
@@ -111,7 +111,7 @@ usb_convert_vars ()
usb_idProduct=$2
usb_idDevice=$3
- if [ x$TYPE != x ]; then
+ if [ "$TYPE" != "" ]; then
IFS=/
set $TYPE ''
usb_bDeviceClass=$1
@@ -125,7 +125,7 @@ usb_convert_vars ()
usb_bDeviceProtocol=1000
fi
- if [ x$INTERFACE != x ]; then
+ if [ "$INTERFACE" != "" ]; then
IFS=/
set $INTERFACE ''
usb_bInterfaceClass=$1
@@ -160,6 +160,7 @@ usb_map_modules ()
# expected to work on any line!
# comment line lists (current) usb_device_id field names
+ # is this still needed?
read ignored
# look at each usb_device_id entry
@@ -169,6 +170,11 @@ usb_map_modules ()
do
: checkmatch $module
+ # ok, now it read comment, but only if the line starts with "# "
+ if [ "$module" = "#" ]; then
+ continue
+ fi
+
# FIXME: tests against USB_ANY should be replaced
# by tests against bits in match_flags
# ... if it's there, and nonzero
@@ -273,7 +279,7 @@ add)
fi
fi
- if [ $FOUND = false ]; then
+ if [ "$FOUND" = "false" ]; then
mesg "... no drivers for $LABEL"
exit 2
fi
Index: etc/hotplug/usb.rc
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/usb.rc,v
retrieving revision 1.5
diff -u -3 -p -r1.5 usb.rc
--- etc/hotplug/usb.rc 2001/02/23 22:05:59 1.5
+++ etc/hotplug/usb.rc 2001/02/25 15:54:18
@@ -53,7 +53,7 @@ usb_boot_events ()
# synthesize hotplug events if we can
# we need (non-bash) programs to parse descriptors.
LISTER=`type -p usbmodules`
- if [ x$LISTER = x -o ! -f /proc/bus/usb/devices ]; then
+ if [ "$LISTER" = "" -o ! -f /proc/bus/usb/devices ]; then
echo $"** can't synthesize root hub events"
return
fi
@@ -98,6 +98,7 @@ maybe_start_usb ()
then
mount /proc/bus/usb
else
+ # why do not use usbdevfs instead of none?
mount -t usbdevfs none /proc/bus/usb
fi
fi
Index: sbin/hotplug
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/sbin/hotplug,v
retrieving revision 1.3
diff -u -3 -p -r1.3 hotplug
--- sbin/hotplug 2001/02/14 18:21:27 1.3
+++ sbin/hotplug 2001/02/25 15:54:18
@@ -32,14 +32,14 @@ fi
# Examples: usb, pci, isapnp, net, ieee1394, printer, disk,
# parport, ...
#
-if [ $# -lt 1 -o "$1" = help -o "$1" = '--help' ]; then
+if [ $# -lt 1 -o "$1" = "help" -o "$1" = "--help" ]; then
if [ -t ]; then
echo "Usage: $0 AgentName ..."
AGENTS=""
for AGENT in /etc/hotplug/*.agent ; do
TYPE=`basename $AGENT | sed s/.agent//`
- if [ -x $AGENT ] ; then
+ if [ -x $AGENT ]; then
AGENTS="$AGENTS $TYPE"
else
AGENTS="$AGENTS ($TYPE)"
^ permalink raw reply [flat|nested] 7+ messages in thread* Another patch
@ 2004-07-12 21:41 Tommy McCabe
2004-07-27 13:54 ` Miguel Bolanos
0 siblings, 1 reply; 7+ messages in thread
From: Tommy McCabe @ 2004-07-12 21:41 UTC (permalink / raw)
To: linux-8086
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
This patch:
1. Has eight partitions per hard disk instead of 64,
to save indoes and not flood the disk images. This
time I didn't change the commented-out stuff like the
secondary IDE channel.
2. Remove the Conrad Parallel Port Radio Clock (which
I think is some sort of easter egg) from MAKEDEV.
3. Fixed the "make clean" process.
4. Got rid of the sudos in the Makefile.
5. Got rid of the ridiculous business with a ROOTDIR
that didn't exist and commands that weren't referenced
anywhere in the Makefile.
__________________________________
Do you Yahoo!?
Read only the mail you want - Yahoo! Mail SpamGuard.
http://promotions.yahoo.com/new_mail
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patches.diff --]
[-- Type: text/x-diff; name="patches.diff", Size: 5397 bytes --]
diff -ruN ./elkscomp/elkscmd/Make.rules ./elkscurr/elkscmd/Make.rules
--- ./elkscomp/elkscmd/Make.rules 2002-05-29 14:23:03.000000000 -0400
+++ ./elkscurr/elkscmd/Make.rules 2004-07-12 17:22:55.000000000 -0400
@@ -68,8 +68,6 @@
#
# Directory to create the target tree in.
-ROOTDIR=$(BASEDIR)/RootFS
-
###############################################################################
#
# Command to copy the tree across.
diff -ruN ./elkscomp/elkscmd/Makefile ./elkscurr/elkscmd/Makefile
--- ./elkscomp/elkscmd/Makefile 2004-06-09 12:25:40.000000000 -0400
+++ ./elkscurr/elkscmd/Makefile 2004-07-12 17:27:44.000000000 -0400
@@ -46,12 +46,7 @@
$(FULL3_TARGET_FS) $(FULL5_TARGET_FS) || true
rm -f $(COMB_TARGET_FS) $(ROOT_TARGET_FS) $(ROOT_NET_TARGET_FS) \
$(FULL3_TARGET_FS) $(FULL5_TARGET_FS) boot images.zip core
- rm -rf rootfs_template $(ROOTDIR)
@for i in $(DIRS); do make -C $$i clean ; done
- -echo FIXME: make clean is temporarily broken, because there is no
- -echo rootfs_template.tar anymore
- tar xf rootfs_template.tar
-
###############################################################################
#
# Include standard packaging commands.
@@ -84,30 +79,6 @@
###############################################################################
#
-# Create standard packages.
-
-basepkg:
- rm -fr $(ROOTDIR)
- mkdir $(ROOTDIR)
- make mkbase
-
-netpkg:
- rm -fr $(ROOTDIR)
- mkdir $(ROOTDIR)
- make mknet
-
-stdpkg:
- rm -fr $(ROOTDIR)
- mkdir $(ROOTDIR)
- make mkstd
-
-maxpkg:
- rm -fr $(ROOTDIR)
- mkdir $(ROOTDIR)
- make mkmax
-
-###############################################################################
-#
# Create relevant parts of ELKS package.
$(ELKS_DIR)/.config:
@@ -154,42 +125,36 @@
mount_combfs: $(COMB_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
$(MKFS) $(MKFS_OPTS) $(COMB_TARGET_FS) $(COMB_TARGET_BLKS)
- sudo -u root mount $(COMB_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
mount_full3fs: $(FULL3_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
$(MKFS) $(MKFS_OPTS) $(FULL3_TARGET_FS) $(FULL3_TARGET_BLKS)
- sudo -u root mount $(FULL3_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
mount_full5fs: $(FULL5_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
$(MKFS) $(MKFS_OPTS) $(FULL5_TARGET_FS) $(FULL5_TARGET_BLKS)
- sudo -u root mount $(FULL5_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(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)
- sudo -u root mount $(ROOT_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
mount_rootnetfs: $(ROOT_NET_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
$(MKFS) $(MKFS_OPTS) $(ROOT_NET_TARGET_FS) $(ROOT_NET_TARGET_BLKS)
- sudo -u root mount $(ROOT_NET_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
mount_sibofs: $(SIBO_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
$(MKFS) $(MKFS_OPTS) $(SIBO_TARGET_FS) $(SIBO_TARGET_BLKS)
- sudo -u root mount $(SIBO_TARGET_FS) $(TARGET_MNT) $(LOOP)
(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
(cd $(TARGET_MNT) ; tar xpvf -)
(cd $(TARGET_MNT) ; rm -rf home boot root var)
diff -ruN ./elkscomp/elkscmd/rootfs_template/dev/MAKEDEV ./elkscurr/elkscmd/rootfs_template/dev/MAKEDEV
--- ./elkscomp/elkscmd/rootfs_template/dev/MAKEDEV 2004-06-03 23:07:55.000000000 -0400
+++ ./elkscurr/elkscmd/rootfs_template/dev/MAKEDEV 2004-07-12 17:33:09.000000000 -0400
@@ -97,8 +97,8 @@
##############################################################################
# Direct IDE disks, Primary channel.
- $MKSET 0 63 $MKDEV hda b 5 # Currently.
- $MKSET 64 63 $MKDEV hdb b 5 # Currently.
+ $MKSET 0 7 $MKDEV hda b 5 # Currently.
+ $MKSET 8 7 $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.
@@ -189,10 +189,10 @@
##############################################################################
# BIOS hard disks.
- $MKSET 0 63 $MKDEV bda b 3 # Currently
- $MKSET 64 63 $MKDEV bdb b 3 # Currently
- $MKSET 128 63 $MKDEV bdc b 3 # Currently
- $MKSET 192 63 $MKDEV bdd b 3 # Currently
+ $MKSET 0 7 $MKDEV bda b 3 # Currently
+ $MKSET 8 7 $MKDEV bdb b 3 # Currently
+ $MKSET 16 7 $MKDEV bdc b 3 # Currently
+ $MKSET 24 7 $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
@@ -256,9 +256,4 @@
# $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] 7+ messages in thread
* Re: Another patch
2004-07-12 21:41 Tommy McCabe
@ 2004-07-27 13:54 ` Miguel Bolanos
2004-07-27 15:15 ` Eduardo Pereira Habkost
0 siblings, 1 reply; 7+ messages in thread
From: Miguel Bolanos @ 2004-07-27 13:54 UTC (permalink / raw)
To: Tommy McCabe; +Cc: linux-8086
Greetings,
On Mon, 2004-07-12 at 15:41, Tommy McCabe wrote:
> This patch:
>
> 1. Has eight partitions per hard disk instead of 64,
> to save indoes and not flood the disk images. This
> time I didn't change the commented-out stuff like the
> secondary IDE channel.
I would like to hear out some votes about this before actually applying
it.. in my personal opinion it should go, but perhaps anyone have a
different opinion? (Allan? Harry? Claudio? ... ?)
>
> 2. Remove the Conrad Parallel Port Radio Clock (which
> I think is some sort of easter egg) from MAKEDEV.
>
sort of an easter egg... interesting definition.
Honestly i can't just a feature with that justification.
> 3. Fixed the "make clean" process.
>
Applied the rootfs_template.tar fix.
> 4. Got rid of the sudos in the Makefile.
>
Definitly applied, BUT.. keeping the mount commands.
> 5. Got rid of the ridiculous business with a ROOTDIR
> that didn't exist and commands that weren't referenced
> anywhere in the Makefile.
>
NOT applied.
best wishes
Mike
>
>
> __________________________________
> Do you Yahoo!?
> Read only the mail you want - Yahoo! Mail SpamGuard.
> http://promotions.yahoo.com/new_mail
>
> ______________________________________________________________________
> diff -ruN ./elkscomp/elkscmd/Make.rules ./elkscurr/elkscmd/Make.rules
> --- ./elkscomp/elkscmd/Make.rules 2002-05-29 14:23:03.000000000 -0400
> +++ ./elkscurr/elkscmd/Make.rules 2004-07-12 17:22:55.000000000 -0400
> @@ -68,8 +68,6 @@
> #
> # Directory to create the target tree in.
>
> -ROOTDIR=$(BASEDIR)/RootFS
> -
> ###############################################################################
> #
> # Command to copy the tree across.
> diff -ruN ./elkscomp/elkscmd/Makefile ./elkscurr/elkscmd/Makefile
> --- ./elkscomp/elkscmd/Makefile 2004-06-09 12:25:40.000000000 -0400
> +++ ./elkscurr/elkscmd/Makefile 2004-07-12 17:27:44.000000000 -0400
> @@ -46,12 +46,7 @@
> $(FULL3_TARGET_FS) $(FULL5_TARGET_FS) || true
> rm -f $(COMB_TARGET_FS) $(ROOT_TARGET_FS) $(ROOT_NET_TARGET_FS) \
> $(FULL3_TARGET_FS) $(FULL5_TARGET_FS) boot images.zip core
> - rm -rf rootfs_template $(ROOTDIR)
> @for i in $(DIRS); do make -C $$i clean ; done
> - -echo FIXME: make clean is temporarily broken, because there is no
> - -echo rootfs_template.tar anymore
> - tar xf rootfs_template.tar
> -
> ###############################################################################
> #
> # Include standard packaging commands.
> @@ -84,30 +79,6 @@
>
> ###############################################################################
> #
> -# Create standard packages.
> -
> -basepkg:
> - rm -fr $(ROOTDIR)
> - mkdir $(ROOTDIR)
> - make mkbase
> -
> -netpkg:
> - rm -fr $(ROOTDIR)
> - mkdir $(ROOTDIR)
> - make mknet
> -
> -stdpkg:
> - rm -fr $(ROOTDIR)
> - mkdir $(ROOTDIR)
> - make mkstd
> -
> -maxpkg:
> - rm -fr $(ROOTDIR)
> - mkdir $(ROOTDIR)
> - make mkmax
> -
> -###############################################################################
> -#
> # Create relevant parts of ELKS package.
>
> $(ELKS_DIR)/.config:
> @@ -154,42 +125,36 @@
>
> mount_combfs: $(COMB_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
> $(MKFS) $(MKFS_OPTS) $(COMB_TARGET_FS) $(COMB_TARGET_BLKS)
> - sudo -u root mount $(COMB_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (cd $(TARGET_MNT)/dev ; ./MAKEDEV)
>
> mount_full3fs: $(FULL3_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
> $(MKFS) $(MKFS_OPTS) $(FULL3_TARGET_FS) $(FULL3_TARGET_BLKS)
> - sudo -u root mount $(FULL3_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (cd $(TARGET_MNT)/dev ; ./MAKEDEV)
>
> mount_full5fs: $(FULL5_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
> $(MKFS) $(MKFS_OPTS) $(FULL5_TARGET_FS) $(FULL5_TARGET_BLKS)
> - sudo -u root mount $(FULL5_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (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)
> - sudo -u root mount $(ROOT_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (cd $(TARGET_MNT)/dev ; ./MAKEDEV)
>
> mount_rootnetfs: $(ROOT_NET_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
> $(MKFS) $(MKFS_OPTS) $(ROOT_NET_TARGET_FS) $(ROOT_NET_TARGET_BLKS)
> - sudo -u root mount $(ROOT_NET_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (cd $(TARGET_MNT)/dev ; ./MAKEDEV)
>
> mount_sibofs: $(SIBO_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
> $(MKFS) $(MKFS_OPTS) $(SIBO_TARGET_FS) $(SIBO_TARGET_BLKS)
> - sudo -u root mount $(SIBO_TARGET_FS) $(TARGET_MNT) $(LOOP)
> (cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
> (cd $(TARGET_MNT) ; tar xpvf -)
> (cd $(TARGET_MNT) ; rm -rf home boot root var)
> diff -ruN ./elkscomp/elkscmd/rootfs_template/dev/MAKEDEV ./elkscurr/elkscmd/rootfs_template/dev/MAKEDEV
> --- ./elkscomp/elkscmd/rootfs_template/dev/MAKEDEV 2004-06-03 23:07:55.000000000 -0400
> +++ ./elkscurr/elkscmd/rootfs_template/dev/MAKEDEV 2004-07-12 17:33:09.000000000 -0400
> @@ -97,8 +97,8 @@
> ##############################################################################
> # Direct IDE disks, Primary channel.
>
> - $MKSET 0 63 $MKDEV hda b 5 # Currently.
> - $MKSET 64 63 $MKDEV hdb b 5 # Currently.
> + $MKSET 0 7 $MKDEV hda b 5 # Currently.
> + $MKSET 8 7 $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.
> @@ -189,10 +189,10 @@
> ##############################################################################
> # BIOS hard disks.
>
> - $MKSET 0 63 $MKDEV bda b 3 # Currently
> - $MKSET 64 63 $MKDEV bdb b 3 # Currently
> - $MKSET 128 63 $MKDEV bdc b 3 # Currently
> - $MKSET 192 63 $MKDEV bdd b 3 # Currently
> + $MKSET 0 7 $MKDEV bda b 3 # Currently
> + $MKSET 8 7 $MKDEV bdb b 3 # Currently
> + $MKSET 16 7 $MKDEV bdc b 3 # Currently
> + $MKSET 24 7 $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
> @@ -256,9 +256,4 @@
> # $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] 7+ messages in thread
* Re: Another patch
2004-07-27 13:54 ` Miguel Bolanos
@ 2004-07-27 15:15 ` Eduardo Pereira Habkost
2004-07-27 16:09 ` Tommy McCabe
0 siblings, 1 reply; 7+ messages in thread
From: Eduardo Pereira Habkost @ 2004-07-27 15:15 UTC (permalink / raw)
To: linux-8086
[-- Attachment #1: Type: text/plain, Size: 2024 bytes --]
On Tue, Jul 27, 2004 at 07:54:25AM -0600, Miguel Bolanos wrote:
> Greetings,
>
> On Mon, 2004-07-12 at 15:41, Tommy McCabe wrote:
> > This patch:
> >
> > 1. Has eight partitions per hard disk instead of 64,
> > to save indoes and not flood the disk images. This
> > time I didn't change the commented-out stuff like the
> > secondary IDE channel.
>
> I would like to hear out some votes about this before actually applying
> it.. in my personal opinion it should go, but perhaps anyone have a
> different opinion? (Allan? Harry? Claudio? ... ?)
The patch breaks the major/minor numbers on MAKEDEV.
>
> >
> > 2. Remove the Conrad Parallel Port Radio Clock (which
> > I think is some sort of easter egg) from MAKEDEV.
> >
>
> sort of an easter egg... interesting definition.
> Honestly i can't just a feature with that justification.
I agree. We can comment it, as the device is not used. Our problem is
that MAKEDEV makes too many devices by default and waste inodes on
the root disk. Comment out devices that are not obviously used, can
help. Maybe we can have a "--few-inodes" option or something like that,
for building the root disks.
>
> > 3. Fixed the "make clean" process.
> >
>
> Applied the rootfs_template.tar fix.
Did you removed the warnings? The warning is there to tell the user that
make clean is a little broken (it doesn't restore the previous state of
rootfs_template), so we need to fix that, not remove the warning.
>
> > 4. Got rid of the sudos in the Makefile.
> >
>
> Definitly applied, BUT.. keeping the mount commands.
Of course.
>
> > 5. Got rid of the ridiculous business with a ROOTDIR
> > that didn't exist and commands that weren't referenced
> > anywhere in the Makefile.
> >
Huh? I didn't get your point, Tommy. Please detail your changes, and
explain the real reason, not just because you think it looks better,
or it is "ridiculous".
>
> NOT applied.
>
> best wishes
>
> Mike
>
--
Eduardo
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Another patch
2004-07-27 15:15 ` Eduardo Pereira Habkost
@ 2004-07-27 16:09 ` Tommy McCabe
0 siblings, 0 replies; 7+ messages in thread
From: Tommy McCabe @ 2004-07-27 16:09 UTC (permalink / raw)
To: linux-8086
--- Eduardo Pereira Habkost
<ehabkost@conectiva.com.br> wrote:
> On Tue, Jul 27, 2004 at 07:54:25AM -0600, Miguel
> Bolanos wrote:
> > Greetings,
> >
> > On Mon, 2004-07-12 at 15:41, Tommy McCabe wrote:
> > > This patch:
> > >
> > > 1. Has eight partitions per hard disk instead of
> 64,
> > > to save indoes and not flood the disk images.
> This
> > > time I didn't change the commented-out stuff
> like the
> > > secondary IDE channel.
> >
> > I would like to hear out some votes about this
> before actually applying
> > it.. in my personal opinion it should go, but
> perhaps anyone have a
> > different opinion? (Allan? Harry? Claudio? ... ?)
>
> The patch breaks the major/minor numbers on MAKEDEV.
I don't know what a major-minor number is, but the
number I changed were arguments to MAKESET that said
how many devices to make. Besides, I tested it myself
and the hard disk drivers don't even notice.
> >
> > >
> > > 2. Remove the Conrad Parallel Port Radio Clock
> (which
> > > I think is some sort of easter egg) from
> MAKEDEV.
> > >
> >
> > sort of an easter egg... interesting definition.
> > Honestly i can't just a feature with that
> justification.
>
> I agree. We can comment it, as the device is not
> used. Our problem is
> that MAKEDEV makes too many devices by default and
> waste inodes on
> the root disk. Comment out devices that are not
> obviously used, can
> help. Maybe we can have a "--few-inodes" option or
> something like that,
> for building the root disks.
>
> >
> > > 3. Fixed the "make clean" process.
> > >
> >
> > Applied the rootfs_template.tar fix.
>
> Did you removed the warnings? The warning is there
> to tell the user that
> make clean is a little broken (it doesn't restore
> the previous state of
> rootfs_template), so we need to fix that, not remove
> the warning.
The patched Makefile doesn't alter rootfs_template at
all during make clean; but unless someone deliberately
modified what was in there it wouldn't be altered in
the first place.
> >
> > > 4. Got rid of the sudos in the Makefile.
> > >
> >
> > Definitly applied, BUT.. keeping the mount
> commands.
>
> Of course.
>
> >
> > > 5. Got rid of the ridiculous business with a
> ROOTDIR
> > > that didn't exist and commands that weren't
> referenced
> > > anywhere in the Makefile.
> > >
>
> Huh? I didn't get your point, Tommy. Please detail
> your changes, and
> explain the real reason, not just because you think
> it looks better,
> or it is "ridiculous".
The lines between 90-107 of the Makefile reference
commands that are not used anywhere else, and thus are
useless. They do, however, reference the variable
ROOTDIR, which is defined in Make.rules as a directory
that doesn't exist. So, I got rid of ROOTDIR and the
commands which aren't used.
> >
> > NOT applied.
> >
> > best wishes
> >
> > Mike
> >
>
> --
> Eduardo
>
> ATTACHMENT part 2 application/pgp-signature
__________________________________
Do you Yahoo!?
Yahoo! Mail is new and improved - Check it out!
http://promotions.yahoo.com/new_mail
^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <40F3C561.2080704@xs4all.nl>]
* Re: Another patch
[not found] <40F3C561.2080704@xs4all.nl>
@ 2004-07-13 12:06 ` Tommy McCabe
2004-07-27 13:54 ` Miguel Bolanos
0 siblings, 1 reply; 7+ messages in thread
From: Tommy McCabe @ 2004-07-13 12:06 UTC (permalink / raw)
To: linux-8086
--- Stefan de Konink <skinkie@xs4all.nl> wrote:
> Tommy McCabe wrote:
> > 2. Remove the Conrad Parallel Port Radio Clock
> (which
> > I think is some sort of easter egg) from MAKEDEV.
>
> This is a real device, why do you think its an
> easter egg :)
>
> Stefan
>
Because A), why would a radio clock need to hook up to
a parallel port anyway, and B), name one distro that
supports such a thing.
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Another patch
2004-07-13 12:06 ` Tommy McCabe
@ 2004-07-27 13:54 ` Miguel Bolanos
0 siblings, 0 replies; 7+ messages in thread
From: Miguel Bolanos @ 2004-07-27 13:54 UTC (permalink / raw)
To: Tommy McCabe; +Cc: linux-8086
Greetings,
On Tue, 2004-07-13 at 06:06, Tommy McCabe wrote:
> --- Stefan de Konink <skinkie@xs4all.nl> wrote:
> > Tommy McCabe wrote:
> > > 2. Remove the Conrad Parallel Port Radio Clock
> > (which
> > > I think is some sort of easter egg) from MAKEDEV.
> >
> > This is a real device, why do you think its an
> > easter egg :)
> >
> > Stefan
> >
>
> Because A), why would a radio clock need to hook up to
> a parallel port anyway, and
> B), name one distro that
> supports such a thing.
>
ELKS?
Mike.
> __________________________________________________
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around
> http://mail.yahoo.com
> -
> 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] 7+ messages in thread
end of thread, other threads:[~2004-07-27 16:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-02-25 15:58 Another patch Gioele Barabucci
-- strict thread matches above, loose matches on Subject: below --
2004-07-12 21:41 Tommy McCabe
2004-07-27 13:54 ` Miguel Bolanos
2004-07-27 15:15 ` Eduardo Pereira Habkost
2004-07-27 16:09 ` Tommy McCabe
[not found] <40F3C561.2080704@xs4all.nl>
2004-07-13 12:06 ` Tommy McCabe
2004-07-27 13:54 ` Miguel Bolanos
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.