From def32bd35e374e41de0559901b7a75f3005f2e6a4d972fdb8526d98c4e7dc6d8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 18 Jul 2007 19:24:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/initviocons?expand=0&rev=3 --- initviocons.changes | 5 +++++ initviocons.ps3-matching.patch | 22 ++++++++++++++++++++++ initviocons.spec | 8 ++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 initviocons.ps3-matching.patch diff --git a/initviocons.changes b/initviocons.changes index d12e9cd..5dc09fb 100644 --- a/initviocons.changes +++ b/initviocons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 17 12:22:22 CEST 2007 - sassmann@suse.de + +- added new /proc/device-tree/model matching for ps3 detection + ------------------------------------------------------------------- Tue Apr 24 20:48:49 CEST 2007 - olh@suse.de diff --git a/initviocons.ps3-matching.patch b/initviocons.ps3-matching.patch new file mode 100644 index 0000000..7365c25 --- /dev/null +++ b/initviocons.ps3-matching.patch @@ -0,0 +1,22 @@ +Index: initviocons-0.4/main.c +=================================================================== +--- initviocons-0.4.orig/main.c ++++ initviocons-0.4/main.c +@@ -159,6 +159,7 @@ int main(int argc, char *argv[]) + char lines_s[4], cols_s[4]; + char model[42]; + ++ /* initviocons breaks fb on ps3, so disable it */ + fd = open("/proc/device-tree/model", O_RDONLY); + if (fd >=0) { + opt = read(fd, model, sizeof(model) - 1); +@@ -166,6 +167,9 @@ int main(int argc, char *argv[]) + model[opt] = '\0'; + if (strcmp("PLAYSTATION 3", model) == 0) + exit(0); ++ if (strcmp("SonyPS3", model) == 0) { ++ exit(0); ++ } + } + close(fd); + } diff --git a/initviocons.spec b/initviocons.spec index 8651eea..7daafbc 100644 --- a/initviocons.spec +++ b/initviocons.spec @@ -13,9 +13,9 @@ Name: initviocons URL: http://www.iseries.de/ Version: 0.4 -Release: 347 +Release: 364 Summary: Terminal Initialization for the iSeries Virtual Console -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/Console Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -23,6 +23,7 @@ Source: initviocons-%{version}.tar.bz2 Patch: initviocons-%{version}.dif Patch1: initviocons.minimal-termsize.patch Patch3: initviocons.ps3-hack.patch +Patch4: initviocons.ps3-matching.patch %description Initviocons can be used on the iSeries platform to recognize terminal @@ -45,6 +46,7 @@ Authors: %patch0 %patch1 -p1 %patch3 -p1 +%patch4 -p1 %build ./configure --prefix=/ --mandir=%{_mandir} @@ -63,6 +65,8 @@ cp -p termprobes $RPM_BUILD_ROOT/usr/bin/ /usr/bin/* %changelog +* Tue Jul 17 2007 - sassmann@suse.de +- added new /proc/device-tree/model matching for ps3 detection * Tue Apr 24 2007 - olh@suse.de - do not run initviocons on PS3, until the kernel fb is fixed * Wed Jan 25 2006 - mls@suse.de