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.