some non-controversial bits of sparc. also pulls in updated loader/stubs.c

which should fix non-diet minilibc build

6 files changed, 23 insertions, 16 deletions

diff --git a/anaconda b/anaconda
index ffc33f53d..fe0564a42 100755
--- a/anaconda
+++ b/anaconda
@@ -98,7 +98,7 @@ try:
           [ 'text', 'xmode', 'test', 'debug', 'nofallback',
             'method=', 'rootpath=', 'pcic=', "overhead=",
 	    'testpath=', 'mountfs', 'traceonly', 'kickstart=',
-            'lang=', 'keymap=', 'module=', 'class=',
+            'lang=', 'keymap=', 'kbdtype=', 'module=', 'class=',
 	    'expert', 'serial', 'lowres', 'nofb', 'rescue', 'nomount',
             'autostep', 'resolution=', 'skipddc'])
 except TypeError, msg:
@@ -152,7 +152,7 @@ mousehw = None
 lang = None
 method = None
 keymap = None
-kbdtpye = None
+kbdtype = None
 progmode = None
 customClass = None
 kbd = None
@@ -231,6 +231,8 @@ for n in args:
 	display_mode = 't'
     elif (str == '-x' or str == '--xmode'):
 	xmode = 1
+    elif (str == '--kbdtype'):
+        kbdtype = arg
 
 # s390s don't have ttys
 if iutil.getArch() == "s390":
diff --git a/autopart.py b/autopart.py
index 37e136f54..d4b37b3ce 100644
--- a/autopart.py
+++ b/autopart.py
@@ -799,15 +799,16 @@ def setPreexistParts(diskset, requests, newParts):
                 request.device = partedUtils.get_partition_name(part)
                 if request.fstype:
                     if request.fstype.getName() != request.origfstype.getName():
-                        if request.fstype.getName() == "software RAID":
-                            part.set_flag(parted.PARTITION_RAID, 1)
-                        else:
-                            part.set_flag(parted.PARTITION_RAID, 0)
-
-                        if request.fstype.getName() == "physical volume (LVM)":
-                            part.set_flag(parted.PARTITION_LVM, 1)
-                        else:
-                            part.set_flag(parted.PARTITION_LVM, 0)
+                        if part.is_flag_available(parted.PARTITION_RAID):
+                            if request.fstype.getName() == "software RAID":
+                                part.set_flag(parted.PARTITION_RAID, 1)
+                            else:
+                                part.set_flag(parted.PARTITION_RAID, 0)
+                        if part.is_flag_available(parted.PARTITION_LVM):
+                            if request.fstype.getName() == "physical volume (LVM)":
+                                part.set_flag(parted.PARTITION_LVM, 1)
+                            else:
+                                part.set_flag(parted.PARTITION_LVM, 0)
 
                         partedUtils.set_partition_file_system_type(part, request.fstype)
                             
diff --git a/loader/loader.c b/loader/loader.c
index 8c796ca30..bcb5ba8d2 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -45,7 +45,7 @@
 #include <sys/vt.h>
 #include <linux/fb.h>
 
-#if defined(__i386__) || defined(__ia64__) || defined(__alpha__)
+#if defined(__i386__) || defined(__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__sparc64__)
 #include <linux/cdrom.h>
 #endif
 
diff --git a/loader/module-info b/loader/module-info
index b8fb8456a..548526dfc 100644
--- a/loader/module-info
+++ b/loader/module-info
@@ -416,10 +416,9 @@ strip
 	strip_proto
 	"Starmode Radio IP"
 
-# Not a module, may never be?
-#sunlance
-#	eth
-#	"Linux/Sparc/Lance Ethernet"
+sunlance
+	eth
+	"Linux/Sparc/Lance Ethernet"
 
 sunbmac
 	eth
diff --git a/loader/stubs.c b/loader/stubs.c
index 735843ec9..1dde0e77c 100644
--- a/loader/stubs.c
+++ b/loader/stubs.c
@@ -115,6 +115,8 @@ int _nl_C_LC_PAPER() { return 0; }
 int _nl_C_LC_ADDRESS() { return 0; }
 int _dl_clktck() { return 0;}
 int _dl_aux_init() { return 0;}
+int _dl_non_dynamic_init() { return 0; }
+void * _dl_important_hwcaps() { return 0; }
 void * __libc_dlopen() {return 0;}
 void * __libc_dlsym() {return 0;}
 void * __libc_dlclose() {return 0;}
diff --git a/partedUtils.py b/partedUtils.py
index 476e2bd35..071c448f0 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -219,6 +219,8 @@ def getDefaultDiskType():
         return parted.disk_type_get("dasd")
     elif iutil.getArch() == "alpha":
         return parted.disk_type_get("bsd")
+    elif iutil.getArch() == "sparc":
+        return parted.disk_type_get("sun")
     else:
         # XXX fix me for alpha at least
         return parted.disk_type_get("msdos")
@@ -227,6 +229,7 @@ archLabels = {'i386': ['msdos'],
               'alpha': ['bsd'],
               's390': ['dasd'],
               'alpha': ['bsd', 'msdos'],
+              'sparc': ['sun'],
               'ia64': ['msdos', 'GPT']}
 
 def checkDiskLabel(disk, intf):