Rene Rebe:

21 years ago · 72829c14e0
8 changed files with 17 additions and 208 deletions
--- a/package/powerpc/linux-mol/kernel-name-clash.patch
+++ b/package/powerpc/linux-mol/kernel-name-clash.patch
@ -1,59 +0,0 @@
 # --- 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 
 ])])
--- a/package/powerpc/linux-mol/linux-mol.conf
+++ b/package/powerpc/linux-mol/linux-mol.conf
@ -20,6 +20,11 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 hook_add premake 3 "cd src/kmod"
 hook_add postmake 3 "cd ../.. ; $MAKE install-modules"
 # just build / install the kernel modules ...
 makeinstopt="$makeopt install-modules"
 var_append makeopt " " "modules"

 # might need a review: why do the .depend files show up in the wrapper wlog?
 var_append flist''del "|" 'usr/src/linux.*/\..*depend'


--- a/package/powerpc/linux-mol/linux-mol.desc
+++ b/package/powerpc/linux-mol/linux-mol.desc
@ -38,8 +38,9 @@

 [L] GPL
 [S] Beta
 [V] 2003-06-20
 [V] 0.9.70
 [P] X -----5---9 722.000

 [D] 2066366425 mol-2003-06-20.tar.bz2 http://schillernet.dyndns.org/rock-linux/
 [D] 0 mol-0.9.70.tgz http://www.maconlinux.org/downloads/


--- a/package/powerpc/mol/console-driver-devfs.patch
+++ b/package/powerpc/mol/console-driver-devfs.patch
@ -1,54 +0,0 @@
 # --- 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 */
--- a/package/powerpc/mol/mol.conf
+++ b/package/powerpc/mol/mol.conf
@ -25,5 +25,9 @@ mol_pm (){
 	cp -fv $confdir/molrc* $sysconfdir/mol/
 }

 hook_add postmake 5 mol_pm
 var_append makeopt " " "BUILD_MODS=n"
 var_append makeinstopt " " "BUILD_MODS=n"

 hook_add premake 3 "make oldconfig"
 hook_add postmake 5 "mol_pm"

--- a/package/powerpc/mol/mol.desc
+++ b/package/powerpc/mol/mol.desc
@ -38,8 +38,8 @@

 [L] GPL
 [S] Beta
 [V] 2003-06-20
 [V] 0.9.70
 [P] X -----5---9 721.000

 [D] 2066366425 mol-2003-06-20.tar.bz2 http://schillernet.dyndns.org/rock-linux/
 [D] 0 mol-0.9.70.tgz http://www.maconlinux.org/downloads/

--- a/package/powerpc/mol/startmol-typo.patch
+++ b/package/powerpc/mol/startmol-typo.patch
@ -1,33 +0,0 @@
 # --- 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 "*************************************************************"
--- a/package/powerpc/mol/vconfig-devfs.patch
+++ b/package/powerpc/mol/vconfig-devfs.patch
@ -1,55 +0,0 @@
 # --- 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 */