[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Patch against current CVS (MIPS R3k support, MSDOS partitions tables for mipsel)



Hallo everybody,

attached is a small patch for the current boot-floppies cvs.

Changelog:
- add support for DECstations 5000/120, /125 and /133 (KN02)
- re-add MSDOS partition table support to libfdisk for mipsel
  (required for DECstations)

Can somebody with cvs write access check this in, please?

Greetings,
Karsten
-- 
#include <standard_disclaimer>
Nach Paragraph 28 Abs. 3 Bundesdatenschutzgesetz widerspreche ich der Nutzung
oder Uebermittlung meiner Daten fuer Werbezwecke oder fuer die Markt- oder
Meinungsforschung.
diff -Nur boot-floppies-cvs20011103/Makefile boot-floppies-cvs20011103.patched/Makefile
--- boot-floppies-cvs20011103/Makefile	Thu Nov  1 15:32:02 2001
+++ boot-floppies-cvs20011103.patched/Makefile	Sun Nov  4 22:45:37 2001
@@ -184,6 +184,10 @@
 ifeq ($(architecture), mipsel)
 	$(MAKE) rootr4k-kn04.bin rootr4k-kn04.tar.gz
 	$(MAKE) driversr4k-kn04.tgz resc1440r4k-kn04.bin resc2880r4k-kn04.bin
+	$(MAKE) rootr3k-kn02.bin rootr3k-kn02.tar.gz
+	$(MAKE) driversr3k-kn02.tgz resc1440r3k-kn02.bin resc2880r3k-kn02.bin
+	# $(MAKE) -C mips-specials addinitrd
+	# addinitrd does not work with most DECstation firmware revisions
 else
 ifeq ($(architecture), hppa)
 	$(MAKE) resc288032.bin drivers32.tgz
diff -Nur boot-floppies-cvs20011103/release.sh boot-floppies-cvs20011103.patched/release.sh
--- boot-floppies-cvs20011103/release.sh	Sat Oct 27 11:45:30 2001
+++ boot-floppies-cvs20011103.patched/release.sh	Sun Nov  4 22:45:37 2001
@@ -1138,15 +1138,11 @@
 
   mkdir -p $release
   
-  # We use KN04-R4k as generic rootimge for now - currently KN04-R4k (DECstation 5000/150) is the 
-  # only "officially" supported target for mipsel. KN05 (i.e. DECstation 5000/260) should work
-  # "out of the box" with the KN04-kernel and -rootfs.
-
-  cp -a rootr4k-kn04.tar.gz $release/root.tar.gz
-  cp -a rootr4k-kn04.bin $release/root.bin
+  mv rootr4k-kn04.tar.gz $release/root.tar.gz
+  mv rootr4k-kn04.bin $release/root.bin
   
   # overkill but keeps things simple for new subarches
-  for subarch in r4k-kn04; do
+  for subarch in r4k-kn04 r3k-kn02; do
     # Per subarch images
     info "setting up subarchitecture '$subarch'"
     mkdir -p $release/${subarch}/
@@ -1166,7 +1162,7 @@
         grep -v '\(md5sum.txt\|/doc/\|bf-\)'` > md5sum.txt)
 
   # make tarballs for subarches, etc.
-  for dir in r4k-kn04 ; do
+  for dir in r4k-kn04 r3k-kn02; do
     (cd $release && tar cz --remove-files -f bf-${dir}${suffix}.tar.gz $dir)
     echo "tar -xzf bf-${dir}${suffix}.tar.gz ; rm -f bf-${dir}${suffix}.tar.gz" >> \
         $release/$bfinstall
diff -Nur boot-floppies-cvs20011103/utilities/libfdisk/config.h boot-floppies-cvs20011103.patched/utilities/libfdisk/config.h
--- boot-floppies-cvs20011103/utilities/libfdisk/config.h	Wed Oct 24 22:10:00 2001
+++ boot-floppies-cvs20011103.patched/utilities/libfdisk/config.h	Sun Nov  4 22:45:38 2001
@@ -3,7 +3,8 @@
 
 /* this defines which partition formats to include */
 /* (BSD_DISKLABEL and SOLARIS_X86 are suboptions of MSDOS_PARTITION) */
-#if !#cpu(mips) && !#cpu(mipsel)
+#if !#cpu(mips)
+/* mipsel uses MSDOS partiton tables on DECstations */
 #define HAVE_MSDOS_PARTITION	1
 #define HAVE_BSD_DISKLABEL	1
 #define HAVE_SOLARIS_X86_PARTITION	1

Reply to: