OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
Browse Source

first cp for a kernel module seperation for mol (name layout used 

from linux-drm - although it is not fully intuitive ...)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2566 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
e082568289
commit
46aece7593
11 changed files with 580 additions and 0 deletions
Unified View
  1. +54
    -0
      package/powerpc/linux-mol/console-driver-devfs.patch
  2. +59
    -0
      package/powerpc/linux-mol/kernel-name-clash.patch
  3. +36
    -0
      package/powerpc/linux-mol/mol.cache
  4. +29
    -0
      package/powerpc/linux-mol/mol.conf
  5. +45
    -0
      package/powerpc/linux-mol/mol.desc
  6. +34
    -0
      package/powerpc/linux-mol/molrc.linux
  7. +85
    -0
      package/powerpc/linux-mol/molrc.macos
  8. +67
    -0
      package/powerpc/linux-mol/molrc.osx
  9. +83
    -0
      package/powerpc/linux-mol/molrc.video
  10. +33
    -0
      package/powerpc/linux-mol/startmol-typo.patch
  11. +55
    -0
      package/powerpc/linux-mol/vconfig-devfs.patch

+ 54
- 0
package/powerpc/linux-mol/console-driver-devfs.patch
View File

@ -0,0 +1,54 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/console-driver-devfs.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- mol-2003-06-20/src/drivers/console.c 2003-06-12 13:00:59.000000000 +0200
+++ mol-2003-06-20-devfs/src/drivers/console.c 2003-06-21 19:43:11.000000000 +0200
@@ -359,11 +359,13 @@
{
struct vt_stat vts;
char vtname[32];
+ char vtname2[32];
int vt_no = get_numeric_res( "vt" ); /* -1 if missing */
int fd;
- if( (fd=open("/dev/tty0", O_WRONLY)) < 0 ) {
- printm("failed to open /dev/tty0: %s\n", strerror(errno));
+ if( (fd=open("/dev/tty0", O_WRONLY)) < 0 &&
+ (fd=open("/dev/vc/0", O_WRONLY)) < 0) {
+ printm("failed to open /dev/tty0 or /dev/vc/0: %s\n", strerror(errno));
return 1;
}
@@ -396,8 +398,11 @@
/* open our vt */
sprintf( vtname, "/dev/tty%d", vt_no );
if( (fd=open(vtname, O_RDWR | O_NONBLOCK )) < 0) {
- perrorm("Cannot open %s", vtname );
- return 1;
+ sprintf( vtname2, "/dev/vc/%d", vt_no );
+ if( (fd=open(vtname2, O_RDWR | O_NONBLOCK )) < 0) {
+ perrorm("Cannot open %s or %s", vtname, vtname2 );
+ return 1;
+ }
}
/* set controlling tty */

+ 59
- 0
package/powerpc/linux-mol/kernel-name-clash.patch
View File

@ -0,0 +1,59 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/kernel-name-clash.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- mol-2003-06-20/src/shared/asmdefs.h.orig 2003-06-12 13:00:59.000000000 +0200
+++ mol-2003-06-20/src/shared/asmdefs.h 2003-09-16 13:02:46.000000000 +0200
@@ -83,26 +83,26 @@
addi _dreg,_dreg,LO(_addr)
])
-MACRO(LOAD_GPR_RANGE, [start, end, offs, base], [
- mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _end)
+MACRO(LOAD_GPR_RANGE, [istart, iend, offs, base], [
+ mFORLOOP([i],0,31,[ .if (i >= _istart) & (i <= _iend)
lwz rPREFIX[]i,_offs+i[]*4(_base)
.endif
])])
-MACRO(STORE_GPR_RANGE, [start, end, offs, base], [
- mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _end)
+MACRO(STORE_GPR_RANGE, [istart, iend, offs, base], [
+ mFORLOOP([i],0,31,[ .if (i >= _istart) & (i <= _iend)
stw rPREFIX[]i,_offs+i[]*4(_base)
.endif
])])
-MACRO(LOAD_FPR_RANGE, [start, end, offs, base], [
- mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _end)
+MACRO(LOAD_FPR_RANGE, [istart, iend, offs, base], [
+ mFORLOOP([i],0,31,[ .if (i >= _istart) & (i <= _iend)
lfd fPREFIX[]i,_offs+i[]*8(_base)
.endif
])])
-MACRO(STORE_FPR_RANGE, [start, end, offs, base], [
- mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _end)
+MACRO(STORE_FPR_RANGE, [istart, iend, offs, base], [
+ mFORLOOP([i],0,31,[ .if (i >= _istart) & (i <= _iend)
stfd fPREFIX[]i,_offs+i[]*8(_base)
.endif
])])

+ 36
- 0
package/powerpc/linux-mol/mol.cache
View File

@ -0,0 +1,36 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/powerpc/mol/mol.cache
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[TIMESTAMP] 1067810392 Sun Nov 2 22:59:52 2003
[CONFIG-ID] 2.0.0-rc3-powerpc-powerpc-750-desktop-expert
[ROCKVER] 2.0.0-rc3
[LOGS] 9-mol.log
[BUILDTIME] 26205 (9)
[SIZE] 3.63 MB, 127 files
[DEP] alsa audiofile bash binutils bzip2 coreutils diffutils esound
[DEP] findutils flex gawk gcc3 glibc23 grep libpng linux24benh-header
[DEP] linux24benh-src m4 make mktemp mol ncurses net-tools patch sed
[DEP] sysfiles tar util-linux xfree86 zlib

+ 29
- 0
package/powerpc/linux-mol/mol.conf
View File

@ -0,0 +1,29 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/mol.conf
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
mol_pm (){
echo "Copying cleaned and DevFS-aware ROCK Linux default config ..."
cp -fv $confdir/molrc* $sysconfdir/mol/
}
hook_add postmake 5 mol_pm

+ 45
- 0
package/powerpc/linux-mol/mol.desc
View File

@ -0,0 +1,45 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/powerpc/mol/mol.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] Mac On Linux
[T] Mac-on-Linux makes it possible to run Mac OS (including OS X) under
[T] Linux/ppc. MOL is not an emulator but runs the OS directly without
[T] any CPU emulation. Moreover, NO ROM IMAGE is required.
[T]
[T] It is also possible to run a Linux/ppc in mol.
[U] http://www.maconlinux.net/
[A] <samuel@ibrium.se>
[M] Rene Rebe <rene@rocklinux.org>
[C] base/system
[R] + powerpc
[L] GPL
[S] Beta
[V] 2003-06-20
[P] X -----5---9 721.000
[D] 2066366425 mol-2003-06-20.tar.bz2 http://schillernet.dyndns.org/rock-linux/

+ 34
- 0
package/powerpc/linux-mol/molrc.linux
View File

@ -0,0 +1,34 @@
# -*- perl -*- (emacs syntax coloring)
#
# Master config file for booting Linux within MOL
#
include ${etc}/molrc.video # video
include ${etc}/molrc.input # mouse & keyboard
include ${etc}/molrc.net # networking
ram_size: 64
ifempty ${altconfig} {
# booting without CD (session 3)
blkdev: /var/rock.img -rw # diskimage
} else {
# booting with CD (session 4)
blkdev: /dev/cdrom -ro
blkdev: /var/rock-linux-mol/disk.img -rw # diskimage
}
#symfile: /usr/src/linux/System.map # Symbols (for the debugger)
###################################################################
# Pseudo filesystem (yaboot/OF sees these files)
###################################################################
#
# MOL will boot 'yaboot' which in turn will load 'yaboot.conf'
pseudofile: "yaboot" /usr/lib/yaboot/yaboot
pseudofile: "yaboot.conf" /etc/mol/yaboot.conf
pseudofile: "vmlinux" /var/rock-linux-mol/vmlinux
pseudofile: "root.bin" /var/rock-linux-mol/initrd

+ 85
- 0
package/powerpc/linux-mol/molrc.macos
View File

@ -0,0 +1,85 @@
# -*- perl -*- (for emacs syntax coloring)
#
# /etc/mol/molrc.macos
#
# Mac-on-Linux master configuration file for MacOS (classic) booting
#
#------------------------------------------------------------------------------
# Parse other config files (these files are in /etc/mol/)
#------------------------------------------------------------------------------
include ${etc}/molrc.video # video configuration
include ${etc}/molrc.input # mouse and keyboard
include ${etc}/molrc.net # networking
#------------------------------------------------------------------------------
# Misc Settings
#------------------------------------------------------------------------------
ram_size: 48 # should probably be increased
disable_altivec: no #
sound_driver: dsp # (any | dsp | esd)
sound_device: /dev/sound/dsp
play_startboing: no # play startboing
#disable_sound: yes #
#------------------------------------------------------------------------------
# HFS Volumes
#------------------------------------------------------------------------------
#
# To use a HFS disk in mol, add a blkdev line. The syntax is
#
# blkdev: <device> [flags]
#
# where <device> can be an entire disk (/dev/sda), a single
# partition (/dev/sda6) or a disk image (/home/samuel/moldisk).
#
# Valid flags are
#
# -rw/-ro read-write / read-only [default]
# -force export non-HFS partitions (be careful!)
# -whole export the complete disk rather than individual
# partitions (be careful!)
# -cd CD/DVD
# -boot boot from this disk.
# -boot1 boot from this disk (ignore other -boot flags)
#
# If the --cdboot switch is used, then MOL will boot from CD
blkdev: /dev/cdrom -cd ${cdboot}
ifeq ${session} 0 {
# default configuration
blkdev: /dev/discs/disc0/disc -rw
blkdev: /dev/discs/disc1/disc -rw
}
ifeq ${session} 4 {
# alternate configuration (startmol --alt)
blkdev: /var/hfs.image -rw
}
ifeq ${boot_type} oldworld {
# oldworld booting (for MacOS 8.5 or older)
blkdev: /var/oldworld.image -rw
}
#------------------------------------------------------------------------------
# MacOS ROM Newworld Configuration
#------------------------------------------------------------------------------
#
# By default, MOL loads the 'Mac OS ROM' file directly from the System
# Folder of the startup disk. If this is not desirable (unlikely),
# then the ROM can be loaded from the linux side by using the
# newworld_rom keyword. Note that the ROM file must be copied to the
# linux side as a *binary* without any kind of encoding (avoid
# MacBinary in particular).
#
# newworld_rom: /BK/roms/rom.1.6.nw

+ 67
- 0
package/powerpc/linux-mol/molrc.osx
View File

@ -0,0 +1,67 @@
# -*- perl -*- (for emacs syntax coloring)
#
# /etc/mol/molrc.osx
#
# Mac-on-Linux master configuration file for MacOS X booting
#
#------------------------------------------------------------------------------
# Parse other config files (these files are in /etc/mol/)
#------------------------------------------------------------------------------
include ${etc}/molrc.video # video configuration
include ${etc}/molrc.input # mouse and keyboard
include ${etc}/molrc.net # networking
#------------------------------------------------------------------------------
# Misc Settings
#------------------------------------------------------------------------------
ram_size: 96
disable_altivec: no
# OSX has severe real-time requirements for sound. If this appears to be
# a problem, it might help to limit the sound rate to 22050 Hz.
#max_sound_rate: 22050
#------------------------------------------------------------------------------
# OS X Volumes
#------------------------------------------------------------------------------
#
# Volumes to be mounted in MacOS X are specified through the
# blkdev keyword:
#
# blkdev: <device> [flags]
#
# where <device> can be a complete disk (/dev/discs/disc0/disc), a single
# partition (/dev/discs/disc0/disc7) or a disk image.
#
# The following flags are supported
#
# -rw/-ro read-write / read-only [default]
# -force force usage of device (be careful!)
# -boot boot from this disk
# -boot1 boot from this disk (ignore other -boot flags)
# -whole export the entire device (including
# any non-HFS partitions). BE CAREFUL!
# -cd CDROM/DVD
#
# MOL will boot from CD if it invoked through 'startmol -X --cdboot'.
blkdev: /dev/cdrom -cd ${cdboot}
ifempty ${altconfig} {
# default configuration
blkdev: /dev/discs/disc0/disc -rw
blkdev: /dev/discs/disc1/disc -rw
} else {
# alternate configuration
blkdev: /vra/osx.image -rw
#blkdev: /dev/loop/0 -rw
}

+ 83
- 0
package/powerpc/linux-mol/molrc.video
View File

@ -0,0 +1,83 @@
# -*- perl -*- (for emacs syntax coloring)
#
# Mac-on-Linux video configuration
#
# ----------------------------------------------------------------------
# Startup Resolution (this is used as a hint only)
# ----------------------------------------------------------------------
#
resolution: 640/480/75 # width/height/Hz
depth: 32
# ----------------------------------------------------------------------
# X11 Settings
# ----------------------------------------------------------------------
#
# Some config options:
#
# xdisplay: remote.host:0.0
# use_backing_store: yes/no
#
# Backing store is primarily useful if the X-connection is remote.
# Note: X11-video is not as fast as full-screen video.
enable_xvideo: yes
# ----------------------------------------------------------------------
# Fullscreen (Console/fbdev) Settings
# ----------------------------------------------------------------------
#
# The tool 'molvconfig' is used to configure the fullscreen mode.
#
# Some config options:
#
# vt: 9 # VT-number to use
# gamma: 1.0 # gamma (parameter between 0.1 and 1.0)
# gamma: 1.0 1.0 1.0 # gamma (r,g,b)
#
# Ctrl-Cmd-Space switches back to the orignal VT
enable_console_video: yes
start_on_console: no # switch to console initially
autoswitch_console: yes # allow automatic switching to console
#fb_modes: /etc/fb.modes # extra video modes for molvconfig
# ----------------------------------------------------------------------
# XDGA (X11 fullscreen) Settings
# ----------------------------------------------------------------------
#
# At startup, all available XDGA modes are listed. Unfortunately,
# some of the modes might be broken (depending on the video card
# and the XFree86 version).
#
# By default, MOL uses just a single mode with high
# probability of working. However, it is possible to manually
# specify multiple modes. For instance
#
# xdga_modes: 3 5 9
#
# instructs MOL to use mode 3, 5 and 9.
#
# Cntrl-Cmd-Space leaves XDGA mode and switches back to X
enable_xdga_video: no
# ----------------------------------------------------------------------
# VNC Settings
# ----------------------------------------------------------------------
#
# For VNC information, visit http://www.uk.research.att.com/vnc/
#
enable_vncvideo: no # Enable the VNC server
vnc_port: 5900 # port to use for VNC

+ 33
- 0
package/powerpc/linux-mol/startmol-typo.patch
View File

@ -0,0 +1,33 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/startmol-typo.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- mol-2003-06-20/src/startmol.in 2003-06-12 13:00:59.000000000 +0200
+++ mol-2003-06-20-devfs/src/startmol.in 2003-06-21 17:58:58.000000000 +0200
@@ -256,7 +256,7 @@
[ "$LINUX" -a ! -f `getres -F console_video_prefs` ] && {
echo
echo "*************************************************************"
- echo " No video modes has been configured. Please run 'molvconfig'"
+ echo " No video modes have been configured. Please run 'molvconfig'"
echo " as root to configure full screen video or disable console"
echo " video in /etc/mol/molrc.video."
echo "*************************************************************"

+ 55
- 0
package/powerpc/linux-mol/vconfig-devfs.patch
View File

@ -0,0 +1,55 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/vconfig-devfs.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- mol-2003-06-20/src/vconfig/main.c 2003-06-12 13:00:59.000000000 +0200
+++ mol-2003-06-20-devfs/src/vconfig/main.c 2003-06-21 13:37:54.000000000 +0200
@@ -99,10 +99,12 @@
struct vt_stat vts;
int fd;
char vtname[32];
+ char vtname2[32];
struct termios tio;
- if ((fd = open("/dev/tty0", O_WRONLY)) < 0) {
- fprintf(stderr, "failed to open /dev/tty0: %s\n", strerror(errno));
+ if ( (fd = open("/dev/tty0", O_WRONLY)) < 0 &&
+ (fd = open("/dev/vc/0", O_WRONLY)) < 0 ) {
+ fprintf(stderr, "failed to open /dev/tts0 or /dev/vc/0: %s\n", strerror(errno));
return 1;
}
@@ -128,10 +130,12 @@
/* open our vt */
sprintf(vtname,"/dev/tty%d",vt_no);
if ((console_fd = open(vtname, O_RDWR )) < 0) {
- fprintf(stderr, "Cannot open %s (%s)\n",vtname, strerror(errno));
- return 1;
+ sprintf(vtname2,"/dev/vc/%d",vt_no);
+ if ((console_fd = open(vtname2, O_RDWR )) < 0) {
+ fprintf(stderr, "Cannot open %s or %s (%s)\n",vtname, vtname, strerror(errno));
+ return 1;
+ }
}
-
printf("Running MOL video configurator on VT%d\n", vt_no );
#if 0
/* set controlling tty */

Write Preview
|||||||
100:0
Loading…
Cancel
Save