Hello community,
here is the log from the commit of package powerpc-utils
checked in at Mon Jan 21 01:12:11 CET 2008.
--------
--- arch/ppc/powerpc-utils/powerpc-utils.changes 2008-01-17 09:26:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/powerpc-utils/powerpc-utils.changes 2008-01-18 13:40:22.888699000 +0100
@@ -1,0 +2,14 @@
+Thu Jan 17 16:08:59 CET 2008 - sassmann@suse.de
+
+- use kernel 2.6.24-rc8 for booting petitboot
+- update kernel config file to 2.6.24
+- update geninitrd.sh
+ * spawn ttys for debugging
+ * syslog to tty8
+ * update udev rule
+ * include setctsid
+- update to petitboot-0.2
+- adapt patches to petitboot-0.2
+- update to libtwin-0.0.3 (required for petitboot-0.2)
+
+-------------------------------------------------------------------
Old:
----
libtwin-0.0.2.tar.bz2
libtwin.patch2latest.patch
linux-2.6.22.tar.bz2
petitboot.tar.bz2
ps3config-2.6.22
ps3-linux-patches.tar.bz2
New:
----
libtwin-0.0.3.tar.bz2
linux-2.6.24-rc8.tar.bz2
petitboot-0.2.tar.bz2
ps3config-2.6.24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerpc-utils.spec ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:40.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:40.000000000 +0100
@@ -11,12 +11,12 @@
# norootforbuild
Name: powerpc-utils
-BuildRequires: busybox dtc gcc41 glibc-devel grep kexec-tools libjpeg-devel libpng-devel librtas mingetty netcat pkg-config quilt udev util-linux zlib-devel
+BuildRequires: busybox dtc gcc41 glibc-devel grep kexec-tools libjpeg-devel libpng-devel librtas netcat pkg-config quilt udev util-linux zlib-devel
Obsoletes: powerpc-utils-papr
Obsoletes: ppc64-utils
Provides: ppc64-utils
Version: 1.0.6
-Release: 27
+Release: 29
License: IBM Public License
Url: http://powerpc-utils.ozlabs.org/
Group: System/Management
@@ -26,12 +26,13 @@
%define papr_version 1.0.4
Source0: powerpc-utils-%{version}.tar.bz2
Source1: powerpc-utils-papr-%{papr_version}.tar.bz2
-Source2: linux-2.6.22.tar.bz2
-Source3: ps3-linux-patches.tar.bz2
-Source4: ps3config-2.6.22
+%define kernel_source linux-2.6.24-rc8
+Source2: %{kernel_source}.tar.bz2
+#Source3: ps3-linux-patches.tar.bz2
+Source4: ps3config-2.6.24
Source5: geninitrd.sh
-Source7: libtwin-0.0.2.tar.bz2
-Source8: petitboot.tar.bz2
+Source7: libtwin-0.0.3.tar.bz2
+Source8: petitboot-0.2.tar.bz2
Source9: extract_from_elf.c
Source10: ps3-utils-19-05-2007.tar.bz2
Source11: ps3av.h
@@ -41,7 +42,6 @@
#Patch3, Patch4 obsolete with powerpc-utils 1.0.6
Patch5: powerpc-utils.nvram.short-write.patch
Patch6: powerpc-utils.ofpathname.flat-device-tree.patch
-Patch10: libtwin.patch2latest.patch
Patch20: petitboot.pb_log.patch
Patch21: petitboot.continue-if-device-already-mounted.patch
Patch22: petitboot.kboot-conf-file-locations.patch
@@ -70,9 +70,10 @@
Michael Strosaker
%prep
-%setup -q -a 1 -a 2 -a 3 -a 7 -a 8 -a 10
-ln -s linux-2.6.22 linux
-ln -s ../ps3-linux-patches linux/patches
+%setup -q -a 1 -a 2 -a 7 -a 8 -a 10
+#%setup -q -a 1 -a 7 -a 8 -a 10
+ln -s %{kernel_source} linux
+#ln -s ../ps3-linux-patches linux/patches
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -80,7 +81,6 @@
%patch6 -p1
cd powerpc-utils-papr-%{papr_version}
cd ..
-%patch10 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
@@ -111,7 +111,7 @@
make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs}
cd ..
# make libtwin
-cd libtwin-0.0.2
+cd libtwin-0.0.3
autoreconf -fi
LDFLAGS="-s" \
CFLAGS="-Wall -O -g" \
@@ -150,7 +150,7 @@
%if %{build_kernel}
# make kernel
cd linux
-quilt push -q -a
+#quilt push -q -a
cp %{S:4} ../O/.config
make zImage.initrd O=../O %{?jobs:-j%jobs}
cd ..
@@ -202,6 +202,17 @@
%config %attr (755,root,root) /etc/init.d/ibmvscsis.sh
%changelog
+* Thu Jan 17 2008 sassmann@suse.de
+- use kernel 2.6.24-rc8 for booting petitboot
+- update kernel config file to 2.6.24
+- update geninitrd.sh
+ * spawn ttys for debugging
+ * syslog to tty8
+ * update udev rule
+ * include setctsid
+- update to petitboot-0.2
+- adapt patches to petitboot-0.2
+- update to libtwin-0.0.3 (required for petitboot-0.2)
* Thu Jan 17 2008 olh@suse.de
- update ofpathname for the sysfslayout of the week,
to fix bootlist -m normal eth1
++++++ geninitrd.sh ++++++
--- arch/ppc/powerpc-utils/geninitrd.sh 2008-01-07 09:03:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/powerpc-utils/geninitrd.sh 2008-01-18 13:40:22.905685000 +0100
@@ -13,40 +13,39 @@
rm -rf $DIR
mkdir $DIR
cd $DIR
-mkdir -p sbin bin lib lib64 usr etc var/tmp lib/udev
-mkdir -p usr/share/petitboot/artwork/ usr/bin usr/sbin
-cp -aL /sbin/kexec sbin/kexec.bin
-cp -aL /sbin/mingetty sbin/mingetty
+mkdir -p sbin bin lib lib64 usr etc var/tmp var/log lib/udev
+mkdir -p usr/share/petitboot/artwork/ usr/bin usr/sbin mnt
+
+cp -aL /sbin/kexec usr/sbin/kexec.bin
+cp -aL /usr/sbin/setctsid sbin/setctsid
cp -aL ../install-petitboot/usr/share usr
-cp -aL ../install-petitboot/usr/sbin/udev-helper sbin
-cp -aL ../install-petitboot/usr/sbin/petitboot bin
+cp -aL ../install-petitboot/usr/sbin/petitboot-udev-helper usr/sbin
+cp -aL ../install-petitboot/usr/sbin/petitboot usr/bin
cp -aL /etc/udev etc
cp -aL ../install-ps3-utils/usr/sbin/ps3-flash-util usr/sbin
-ln -s ../usr/sbin/ps3-flash-util ./sbin
-cp -aL ../install-ps3-utils/usr/bin/ps3-boot-game-os sbin
+ln -s ../usr/sbin/ps3-flash-util usr/sbin
+cp -aL ../install-ps3-utils/usr/bin/ps3-boot-game-os usr/bin
cp -aL ../install-ps3-utils/usr/bin/ps3-video-mode usr/bin
cp -aL ../install-ps3-utils/usr/lib/libps3-utils.so.1 lib
cp -avL /sbin/udevd /sbin/udevtrigger /sbin/udevsettle sbin
cp -avL /usr/bin/udevinfo usr/bin
cp -avL /lib/udev/*_id lib/udev
-cp -avL /usr/bin/netcat bin
-pwd
+
mv ../extract_from_elf sbin/
# create udev rules
cat > etc/udev/rules.d/00-petit.rules < \)\?\(/.*\) (0x[0-9a-f]*):\2:p' | sort -u)
+for i in $(for i in bin/* sbin/* usr/bin/* lib/udev/*_id ; do ldd "$i" ; done | sed -ne 's:\t\(.* => \)\?\(/.*\) (0x[0-9a-f]*):\2:p' | sort -u)
do
mylibdir=
case "$i" in
@@ -59,9 +58,18 @@
esac
cp -vL $i $mylibdir
done
+
+# copy libraries for dns resolving
cp /lib/libnss_dns.so.2 lib
cp /lib/libresolv.so.2 lib
+# flash otheros.bld
+cat > sbin/flash < /otheros.bld
+ps3-flash-util /otheros.bld
+EOF
# fix reboot
rm sbin/reboot
@@ -71,7 +79,7 @@
EOF
# make proper kexec call
-cat > sbin/kexec <<'EOF'
+cat > usr/sbin/kexec <<'EOF'
#!/bin/ash
set -x
@@ -116,18 +124,27 @@
# disable uevent helper, udevd listens to netlink
echo "" > /sys/kernel/uevent_helper
-syslogd -O /var/log
+# start syslogd
+syslogd -O /var/log/messages
/sbin/udevd --daemon < /dev/null > /dev/null 2>&1
/sbin/udevtrigger
/sbin/udevsettle --timeout=5
+
+# create some more terminals
+openvt 2 /bin/ash
+openvt 3 /bin/ash
+openvt 4 /bin/ash
+openvt 5 /bin/ash
+openvt 6 /bin/ash
+openvt 8 /usr/bin/tail -f /var/log/messages
# pipe syslog > /dev/tty10
-tail -f /var/log > /dev/tty10 < /dev/tty10 &
+#tail -f /var/log/messages > /dev/tty10 < /dev/tty10 &
# check for dhcp
udhcpc -i eth0 -n -q
# switch videomode to 720p
-#/usr/bin/ps3-video-mode -v 3
+#ps3-video-mode -v 3
petitboot -u
#echo "petitboot returned with $?"
@@ -142,11 +159,7 @@
done
petitboot -u
done
-
-while true
-do
/bin/ash
-done
EOF
mkdir -p usr/share/udhcpc
@@ -173,7 +186,7 @@
EOF
chmod 755 usr/share/udhcpc/default.script
-chmod 755 init sbin/* bin/*
+chmod 755 init sbin/* bin/* usr/sbin/*
du -s .
find . -type f -print0 | xargs -0 strip --strip-debug -R .comment
du -s .
++++++ libtwin-0.0.2.tar.bz2 -> libtwin-0.0.3.tar.bz2 ++++++
++++ 3928 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/configure.ac new/libtwin-0.0.3/configure.ac
--- old/libtwin-0.0.2/configure.ac 2007-04-05 13:21:28.000000000 +0200
+++ new/libtwin-0.0.3/configure.ac 2007-12-20 15:55:27.000000000 +0100
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
-AC_INIT(libtwin, 0.0.2, [keithp@keithp.com], libtwin)
+AC_INIT(libtwin, 0.0.3, [keithp@keithp.com], libtwin)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE()
AM_MAINTAINER_MODE
@@ -81,6 +81,12 @@
[Disable linux mouse support (default=enabled)]),
twin_mouse="$enableval", twin_mouse="yes")
+# linux joystick
+AC_ARG_ENABLE(linux-joystick,
+ AC_HELP_STRING([--disable-linux-joystick],
+ [Disable linux joystick support (default=enabled)]),
+ twin_joystick="$enableval", twin_joystick="yes")
+
# zlib
AC_ARG_ENABLE(zlib,
AC_HELP_STRING([--disable-zlib],
@@ -186,6 +192,7 @@
AM_CONDITIONAL(TWIN_JPEG, test x$twin_jpeg = xyes)
AM_CONDITIONAL(TWIN_TTF, test x$twin_ttf = xyes)
AM_CONDITIONAL(TWIN_MOUSE, test x$twin_mouse = xyes)
+AM_CONDITIONAL(TWIN_JOYSTICK, test x$twin_joystick = xyes)
AC_MSG_NOTICE([x11 support: $twin_x11])
AC_MSG_NOTICE([fbdev support: $twin_fb])
@@ -194,6 +201,7 @@
AC_MSG_NOTICE([jpeg support: $twin_jpeg])
AC_MSG_NOTICE([twin_ttf tool: $twin_ttf])
AC_MSG_NOTICE([linux mouse: $twin_mouse])
+AC_MSG_NOTICE([linux joystick: $twin_joystick])
AC_MSG_NOTICE([altivec: $twin_altivec])
AC_OUTPUT([Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/libtwin/twin_fbdev.c new/libtwin-0.0.3/libtwin/twin_fbdev.c
--- old/libtwin-0.0.2/libtwin/twin_fbdev.c 2007-04-02 02:14:52.000000000 +0200
+++ new/libtwin-0.0.3/libtwin/twin_fbdev.c 2007-08-27 05:39:57.000000000 +0200
@@ -291,7 +291,7 @@
for (i = 0; i < count; i++) {
unsigned char e = events[i];
- down = !!(e & 0x80);
+ down = !(e & 0x80);
e &= 0x7f;
/* XXX Handle special keys (make more configurable) */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/libtwin/twin.h new/libtwin-0.0.3/libtwin/twin.h
--- old/libtwin-0.0.2/libtwin/twin.h 2007-04-02 02:14:52.000000000 +0200
+++ new/libtwin-0.0.3/libtwin/twin.h 2007-06-27 15:16:32.000000000 +0200
@@ -35,6 +35,8 @@
typedef int16_t twin_style_t;
typedef int16_t twin_count_t;
typedef int16_t twin_keysym_t;
+typedef uint8_t twin_js_number_t;
+typedef int16_t twin_js_value_t;
typedef int32_t twin_area_t;
typedef int32_t twin_time_t;
typedef int16_t twin_stretch_t;
@@ -120,6 +122,10 @@
TwinEventActivate = 0x0201,
TwinEventDeactivate = 0x0202,
+ /* Joystick */
+ TwinEventJoyButton = 0x0401,
+ TwinEventJoyAxis = 0x0402,
+
/* Widgets */
TwinEventPaint = 0x1001,
TwinEventQueryGeometry = 0x1002,
@@ -139,6 +145,10 @@
twin_keysym_t key;
} key;
struct {
+ twin_js_number_t control;
+ twin_js_value_t value;
+ } js;
+ struct {
twin_ucs4_t ucs4;
} ucs4;
struct {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/libtwin/twin_linux_js.c new/libtwin-0.0.3/libtwin/twin_linux_js.c
--- old/libtwin-0.0.2/libtwin/twin_linux_js.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libtwin-0.0.3/libtwin/twin_linux_js.c 2007-06-27 15:17:52.000000000 +0200
@@ -0,0 +1,144 @@
+/*
+ * Linux joystick driver for Twin
+ *
+ * Copyright 2007 Jeremy Kerr
+ *
+ * This Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Twin Library; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include "twin.h"
+#include "twin_linux_js.h"
+
+#define DEBUG(fmt...) printf(fmt)
+
+struct twin_js_dev {
+ int fd;
+ twin_screen_t *screen;
+};
+
+static twin_bool_t twin_linux_js_events(int file, twin_file_op_t ops,
+ void *closure)
+{
+ struct twin_js_dev *js = closure;
+ struct js_event js_event;
+ int rc;
+ twin_event_t tev;
+
+ for (;;) {
+
+ rc = read(js->fd, &js_event, sizeof(js_event));
+ if (rc < 0 && errno == EAGAIN)
+ break;
+
+ if (rc < 0) {
+ DEBUG("Error reading from joystick device: %s\n",
+ strerror(errno));
+ return TWIN_FALSE;
+ }
+
+ if (rc != sizeof(js_event))
+ break;
+
+ if (js_event.type == JS_EVENT_BUTTON)
+ tev.kind = TwinEventJoyButton;
+ else if (js_event.type == JS_EVENT_AXIS)
+ tev.kind = TwinEventJoyAxis;
+ else
+ continue;
+
+ tev.u.js.control = js_event.number;
+ tev.u.js.value = js_event.value;
+ twin_screen_dispatch(js->screen, &tev);
+ }
+
+ return TWIN_TRUE;
+}
+
+
+static int nr_devs;
+struct twin_js_dev *js_devs;
+
+int twin_linux_js_create(twin_screen_t *screen)
+{
+ struct dirent *dirent;
+ DIR *dir;
+
+ dir = opendir("/dev/input");
+ if (dir == NULL) {
+ perror("opendir(/dev/input)");
+ return -1;
+ }
+
+ while ((dirent = readdir(dir))) {
+ /* buffer to hold dir.d_name, plus "/dev/input/" */
+ char dev_name[sizeof(dirent->d_name) + 12];
+ int dev_fd;
+ struct twin_js_dev *js_dev, *tmp;
+
+
+ if (strncmp(dirent->d_name, "js", 2))
+ continue;
+
+ strcpy(dev_name, "/dev/input/");
+ strcat(dev_name, dirent->d_name);
+
+ dev_fd = open(dev_name, O_RDONLY | O_NONBLOCK);
+ if (dev_fd < 0) {
+ perror("open");
+ continue;
+ }
+ DEBUG("Adding joystick device %s\n", dev_name);
+
+ tmp = realloc(js_devs, ++nr_devs * sizeof(*js_devs));
+ if (!tmp) {
+ close(dev_fd);
+ continue;
+ }
+ js_devs = tmp;
+
+ js_dev = js_devs + nr_devs - 1;
+ js_dev->fd = dev_fd;
+ js_dev->screen = screen;
+
+ twin_set_file(twin_linux_js_events, dev_fd, TWIN_READ, js_dev);
+ }
+ closedir(dir);
+
+ return 0;
+}
+
+void twin_linux_js_destroy()
+{
+ int i;
+
+ for (i = 0; i < nr_devs; i++)
+ close(js_devs[i].fd);
+
+ free(js_devs);
+ js_devs = NULL;
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/libtwin/twin_linux_js.h new/libtwin-0.0.3/libtwin/twin_linux_js.h
--- old/libtwin-0.0.2/libtwin/twin_linux_js.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libtwin-0.0.3/libtwin/twin_linux_js.h 2007-06-27 08:57:56.000000000 +0200
@@ -0,0 +1,37 @@
+/*
+ * Linux joystick driver for Twin
+ *
+ * Copyright 2007 Jeremy Kerr
+ *
+ * This Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Twin Library; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef _TWIN_LINUX_JS_H_
+#define _TWIN_LINUX_JS_H_
+
+#include
+
+/**
+ * twin_linux_js_create - create the linux joystick driver
+ * @file: device file to open, pass NULL for default
+ */
+int twin_linux_js_create(twin_screen_t *screen);
+
+/**
+ * twin_linux_js_destroy - destroy the linux js driver
+ */
+void twin_linux_js_destroy(void);
+
+#endif /* _TWIN_LINUX_JS_H_ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/Makefile.am new/libtwin-0.0.3/Makefile.am
--- old/libtwin-0.0.2/Makefile.am 2007-04-03 06:36:31.000000000 +0200
+++ new/libtwin-0.0.3/Makefile.am 2007-06-27 08:57:22.000000000 +0200
@@ -56,6 +56,11 @@
libtwin_libtwin_la_SOURCES += libtwin/twin_linux_mouse.c
endif
+if TWIN_JOYSTICK
+pkginclude_HEADERS += libtwin/twin_linux_js.h
+libtwin_libtwin_la_SOURCES += libtwin/twin_linux_js.c
+endif
+
if TWIN_PNG
pkginclude_HEADERS += libtwin/twin_png.h
libtwin_libtwin_la_SOURCES += libtwin/twin_png.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libtwin-0.0.2/twin_def.h new/libtwin-0.0.3/twin_def.h
--- old/libtwin-0.0.2/twin_def.h 2007-04-05 13:22:17.000000000 +0200
+++ new/libtwin-0.0.3/twin_def.h 2007-12-20 15:56:15.000000000 +0100
@@ -47,16 +47,16 @@
#define PACKAGE_NAME "libtwin"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtwin 0.0.2"
+#define PACKAGE_STRING "libtwin 0.0.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libtwin"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.0.2"
+#define PACKAGE_VERSION "0.0.3"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.0.2"
+#define VERSION "0.0.3"
++++++ petitboot.add-default-entry.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:41.000000000 +0100
@@ -1,7 +1,7 @@
-Index: powerpc-utils-1.0.0/petitboot/devices.c
+Index: powerpc-utils-1.0.6/petitboot/devices.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices.c
-+++ powerpc-utils-1.0.0/petitboot/devices.c
+--- powerpc-utils-1.0.6.orig/petitboot/devices.c
++++ powerpc-utils-1.0.6/petitboot/devices.c
@@ -142,7 +142,7 @@ static int read_device(int fd, struct de
if (!icon)
@@ -11,11 +11,11 @@
out:
free_strings(dev);
-Index: powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/kboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
-@@ -20,7 +20,7 @@ static const char *mountpoint;
+--- powerpc-utils-1.0.6.orig/petitboot/devices/kboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
+@@ -20,7 +20,7 @@ static const char *devpath;
static int param_is_ignored(const char *param)
{
static const char *ignored_options[] =
@@ -49,10 +49,10 @@
if (streq(name, "timeout")) {
dev->timeout = strdup(value);
continue;
-Index: powerpc-utils-1.0.0/petitboot/devices/message.h
+Index: powerpc-utils-1.0.6/petitboot/devices/message.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/message.h
-+++ powerpc-utils-1.0.0/petitboot/devices/message.h
+--- powerpc-utils-1.0.6.orig/petitboot/devices/message.h
++++ powerpc-utils-1.0.6/petitboot/devices/message.h
@@ -16,6 +16,7 @@ struct device {
char *description;
char *icon_file;
@@ -61,11 +61,11 @@
};
struct boot_option {
-Index: powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
+Index: powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/udev-helper.c
-+++ powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
-@@ -55,6 +55,7 @@ static void print_device(const struct de
+--- powerpc-utils-1.0.6.orig/petitboot/devices/petitboot-udev-helper.c
++++ powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
+@@ -56,6 +56,7 @@ static void print_device(const struct de
pb_log("\tname: %s\n", dev->name);
pb_log("\tdescription: %s\n", dev->description);
pb_log("\tboot_image: %s\n", dev->icon_file);
@@ -73,7 +73,7 @@
}
static int write_action(int fd, enum device_action action)
-@@ -113,7 +114,8 @@ int add_device(const struct device *dev)
+@@ -114,7 +115,8 @@ int add_device(const struct device *dev)
write_string(sock, dev->name) ||
write_string(sock, dev->description) ||
write_string(sock, dev->icon_file) ||
@@ -83,11 +83,11 @@
if (rc)
pb_log("error writing device %s to socket\n", dev->name);
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -103,6 +103,8 @@ struct _pboot_device
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -106,6 +106,8 @@ struct _pboot_device
twin_pixmap_t *badge;
twin_rect_t box;
int option_count;
@@ -96,7 +96,7 @@
char *timeout;
pboot_option_t options[PBOOT_MAX_OPTION];
};
-@@ -443,6 +445,10 @@ void pboot_set_rfocus(int index)
+@@ -436,6 +438,10 @@ void pboot_set_rfocus(int index)
static void pboot_select_rpane(void)
{
@@ -107,7 +107,7 @@
if (pboot_focus_lpane == 0)
return;
pboot_focus_lpane = 0;
-@@ -464,7 +470,15 @@ static void pboot_select_rpane(void)
+@@ -457,7 +463,15 @@ static void pboot_select_rpane(void)
twin_window_queue_paint(pboot_lpane->window);
twin_window_queue_paint(pboot_rpane->window);
@@ -124,7 +124,7 @@
}
static void pboot_select_lpane(void)
-@@ -609,6 +623,11 @@ int pboot_add_option(int devindex, const
+@@ -614,6 +628,11 @@ int pboot_add_option(int devindex, const
opt->box.bottom = opt->box.top + PBOOT_RIGHT_OPTION_HEIGHT;
opt->data = data;
@@ -136,7 +136,7 @@
return index;
}
-@@ -1049,7 +1068,7 @@ int pboot_update_lpane_focus(pboot_devic
+@@ -1062,7 +1081,7 @@ int pboot_update_lpane_focus(pboot_devic
static int sem = 1;
int pboot_add_device(const char *dev_id, const char *name,
@@ -145,7 +145,7 @@
{
int index;
int last;
-@@ -1100,6 +1119,11 @@ int pboot_add_device(const char *dev_id,
+@@ -1113,6 +1132,11 @@ int pboot_add_device(const char *dev_id,
strcpy(dev->id, dev_id);
dev->badge = pixmap;
dev->timeout = strdup(timeout);
@@ -157,11 +157,11 @@
pboot_devices[index] = dev;
-Index: powerpc-utils-1.0.0/petitboot/petitboot.h
+Index: powerpc-utils-1.0.6/petitboot/petitboot.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.h
-+++ powerpc-utils-1.0.0/petitboot/petitboot.h
-@@ -7,7 +7,7 @@
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.h
++++ powerpc-utils-1.0.6/petitboot/petitboot.h
+@@ -8,7 +8,7 @@
#define PBOOT_MAX_OPTION 16
int pboot_add_device(const char *dev_id, const char *name,
++++++ petitboot.add-timeout.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:41.000000000 +0100
@@ -1,7 +1,7 @@
-Index: powerpc-utils-1.0.0/petitboot/devices.c
+Index: powerpc-utils-1.0.6/petitboot/devices.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices.c
-+++ powerpc-utils-1.0.0/petitboot/devices.c
+--- powerpc-utils-1.0.6.orig/petitboot/devices.c
++++ powerpc-utils-1.0.6/petitboot/devices.c
@@ -142,8 +142,7 @@ static int read_device(int fd, struct de
if (!icon)
@@ -32,10 +32,10 @@
LOG("unsupported action %d\n", action);
goto out_err;
}
-Index: powerpc-utils-1.0.0/petitboot/devices/message.h
+Index: powerpc-utils-1.0.6/petitboot/devices/message.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/message.h
-+++ powerpc-utils-1.0.0/petitboot/devices/message.h
+--- powerpc-utils-1.0.6.orig/petitboot/devices/message.h
++++ powerpc-utils-1.0.6/petitboot/devices/message.h
@@ -6,7 +6,8 @@ enum device_action {
DEV_ACTION_ADD_DEVICE = 0,
DEV_ACTION_ADD_OPTION = 1,
@@ -54,11 +54,11 @@
};
struct boot_option {
-Index: powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
+Index: powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/udev-helper.c
-+++ powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
-@@ -106,13 +106,14 @@ int add_device(const struct device *dev)
+--- powerpc-utils-1.0.6.orig/petitboot/devices/petitboot-udev-helper.c
++++ powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
+@@ -107,13 +107,14 @@ int add_device(const struct device *dev)
{
int rc;
@@ -76,7 +76,7 @@
if (rc)
pb_log("error writing device %s to socket\n", dev->name);
-@@ -576,6 +577,14 @@ int main(int argc, char **argv)
+@@ -601,6 +602,14 @@ int main(int argc, char **argv)
return EXIT_SUCCESS;
}
@@ -91,13 +91,13 @@
dev_path = getenv("DEVNAME");
if (!dev_path) {
pb_log("missing environment?\n");
-Index: powerpc-utils-1.0.0/petitboot/devices/yaboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/yaboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/yaboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/yaboot-parser.c
-@@ -199,6 +199,15 @@ static int yaboot_parse(const char *devi
- dev->id = strdup(devicepath);
- dev->name = strrchr(devicepath, '/');dev->name++;
+--- powerpc-utils-1.0.6.orig/petitboot/devices/yaboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/yaboot-parser.c
+@@ -196,6 +196,15 @@ static int yaboot_parse(const char *devi
+ dev->id = strdup(devpath);
+ dev->name = strrchr(devpath, '/');dev->name++;
+ /* read timeout value */
+ if (cfg_get_strg(0, "timeout")) {
@@ -111,11 +111,11 @@
if (cfg_get_strg(0, "init-message")) {
char *newline;
dev->description = strdup(cfg_get_strg(0, "init-message"));
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -11,7 +11,6 @@
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -14,7 +14,6 @@
#include
#undef _USE_X11
@@ -123,7 +123,7 @@
#include
#include
#include
-@@ -100,9 +99,11 @@ struct _pboot_option
+@@ -103,9 +102,11 @@ struct _pboot_option
struct _pboot_device
{
char *id;
@@ -135,21 +135,18 @@
pboot_option_t options[PBOOT_MAX_OPTION];
};
-@@ -312,6 +313,75 @@ static void pboot_rpane_draw(twin_window
+@@ -170,6 +171,7 @@ uint8_t sixaxis_map[] = {
+
+
+ static int pboot_vmode_change = -1;
++static void pboot_choose_option(void);
+
+ /* XXX move to twin */
+ static inline twin_bool_t twin_rect_intersect(twin_rect_t r1,
+@@ -315,6 +317,64 @@ static void pboot_rpane_draw(twin_window
twin_path_destroy(path);
}
-+static void pboot_choose_option(void)
-+{
-+ pboot_device_t *dev = pboot_devices[pboot_dev_sel];
-+ pboot_option_t *opt = &dev->options[pboot_rpane->focus_curindex];
-+
-+ LOG("Selected device %s\n", opt->title);
-+
-+ /* Give user feedback, make sure errors and panics will be seen */
-+ pboot_exec_option(opt->data);
-+}
-+
+static int pboot_bootopt_timer = 1;
+static twin_time_t pboot_bootopt_starttime;
+static twin_time_t pboot_bootopt_timeout(twin_time_t now, void* closure)
@@ -211,7 +208,7 @@
static twin_time_t pboot_rfocus_timeout (twin_time_t now, void *closure)
{
int dir = 1, dist, pos;
-@@ -321,7 +391,12 @@ static twin_time_t pboot_rfocus_timeout
+@@ -324,7 +384,12 @@ static twin_time_t pboot_rfocus_timeout
dir = dist > 5 ? 5 : dist;
pos = pboot_rpane->focus_target - (int)pboot_rpane->focus_box.top;
if (pos == 0) {
@@ -225,7 +222,7 @@
}
if (pos < 0) {
dir = -dir;
-@@ -347,7 +422,8 @@ static twin_time_t pboot_rfocus_timeout
+@@ -350,7 +415,8 @@ static twin_time_t pboot_rfocus_timeout
return accel[(pos * 10) / dist];
}
@@ -235,25 +232,7 @@
{
pboot_device_t *dev;
-@@ -451,17 +527,6 @@ static void pboot_rpane_mousetrack(twin_
- pboot_rpane->mouse_target = candidate;
- }
-
--static void pboot_choose_option(void)
--{
-- pboot_device_t *dev = pboot_devices[pboot_dev_sel];
-- pboot_option_t *opt = &dev->options[pboot_rpane->focus_curindex];
--
-- LOG("Selected device %s\n", opt->title);
--
-- /* Give user feedback, make sure errors and panics will be seen */
-- pboot_exec_option(opt->data);
--}
--
- static twin_bool_t pboot_rpane_event (twin_window_t *window,
- twin_event_t *event)
- {
-@@ -472,6 +537,7 @@ static twin_bool_t pboot_rpane_event (tw
+@@ -476,6 +542,7 @@ static twin_bool_t pboot_rpane_event (tw
case TwinEventLeave:
pboot_select_rpane();
pboot_rpane_mousetrack(event->u.pointer.x, event->u.pointer.y);
@@ -261,7 +240,7 @@
return TWIN_TRUE;
case TwinEventButtonDown:
pboot_select_rpane();
-@@ -480,6 +546,7 @@ static twin_bool_t pboot_rpane_event (tw
+@@ -484,6 +551,7 @@ static twin_bool_t pboot_rpane_event (tw
case TwinEventButtonUp:
return TWIN_TRUE;
case TwinEventKeyDown:
@@ -269,7 +248,7 @@
switch(event->u.key.key) {
case KEY_UP:
pboot_set_rfocus(pboot_rpane->focus_curindex - 1);
-@@ -548,7 +615,6 @@ int pboot_add_option(int devindex, const
+@@ -552,7 +620,6 @@ int pboot_add_option(int devindex, const
static void pboot_set_device_select(int sel, int force)
{
@@ -277,7 +256,7 @@
if (!force && sel == pboot_dev_sel)
return;
if (sel >= pboot_dev_count)
-@@ -621,6 +687,10 @@ static twin_time_t pboot_lfocus_timeout
+@@ -625,6 +692,10 @@ static twin_time_t pboot_lfocus_timeout
pos = pboot_lpane->focus_target - (int)pboot_lpane->focus_box.top;
if (pos == 0) {
pboot_set_device_select(pboot_lpane->focus_curindex, 0);
@@ -288,7 +267,7 @@
return -1;
}
if (pos < 0) {
-@@ -647,7 +717,7 @@ static twin_time_t pboot_lfocus_timeout
+@@ -651,7 +722,7 @@ static twin_time_t pboot_lfocus_timeout
return accel[(pos * 10) / dist];
}
@@ -297,7 +276,7 @@
{
if (index >= pboot_dev_count)
return;
-@@ -708,6 +778,7 @@ static twin_bool_t pboot_lpane_event (tw
+@@ -712,6 +783,7 @@ static twin_bool_t pboot_lpane_event (tw
case TwinEventLeave:
pboot_select_lpane();
pboot_lpane_mousetrack(event->u.pointer.x, event->u.pointer.y);
@@ -305,7 +284,7 @@
return TWIN_TRUE;
case TwinEventButtonDown:
case TwinEventButtonUp:
-@@ -956,42 +1027,98 @@ static void pboot_create_spane(void)
+@@ -968,42 +1040,98 @@ static void pboot_create_spane(void)
twin_window_queue_paint(pboot_spane->window);
}
@@ -419,7 +398,7 @@
/* find the matching device */
for (i = 0; i < pboot_dev_count; i++) {
-@@ -1008,12 +1135,20 @@ int pboot_remove_device(const char *dev_
+@@ -1020,12 +1148,20 @@ int pboot_remove_device(const char *dev_
sizeof(*pboot_devices) * (pboot_dev_count + i - 1));
pboot_devices[--pboot_dev_count] = NULL;
@@ -442,11 +421,11 @@
/* todo: free device & options */
-Index: powerpc-utils-1.0.0/petitboot/petitboot.h
+Index: powerpc-utils-1.0.6/petitboot/petitboot.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.h
-+++ powerpc-utils-1.0.0/petitboot/petitboot.h
-@@ -7,7 +7,7 @@
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.h
++++ powerpc-utils-1.0.6/petitboot/petitboot.h
+@@ -8,7 +8,7 @@
#define PBOOT_MAX_OPTION 16
int pboot_add_device(const char *dev_id, const char *name,
@@ -455,11 +434,11 @@
int pboot_add_option(int devindex, const char *title,
const char *subtitle, twin_pixmap_t *badge, void *data);
int pboot_remove_device(const char *dev_id);
-Index: powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/kboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
-@@ -20,7 +20,7 @@ static const char *mountpoint;
+--- powerpc-utils-1.0.6.orig/petitboot/devices/kboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
+@@ -20,7 +20,7 @@ static const char *devpath;
static int param_is_ignored(const char *param)
{
static const char *ignored_options[] =
@@ -493,14 +472,14 @@
if (check_for_global_option(name, value))
continue;
-@@ -270,6 +277,10 @@ static int parse(const char *devicepath,
+@@ -270,6 +277,10 @@ static int parse(const char *device)
dev = malloc(sizeof(*dev));
memset(dev, 0, sizeof(*dev));
+
+ /* start filling the information about the device */
+
-+ dev->name = strrchr(devicepath, '/');dev->name++;
- dev->id = strdup(devicepath);
++ dev->name = strrchr(filepath, '/');dev->name++;
+ dev->id = strdup(device);
dev->icon_file = strdup(generic_icon_file(guess_device_type()));
++++++ petitboot.boot-game-os.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:41.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -919,6 +919,11 @@ static twin_bool_t pboot_rpane_event (tw
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -925,6 +925,11 @@ static twin_bool_t pboot_rpane_event (tw
pboot_rpane->window->event = pboot_changeres_event;
pboot_message("res: 0=auto 1=720p 2=1080i 3=1080p");
return TWIN_TRUE;
@@ -14,7 +14,7 @@
case KEY_ENTER:
pboot_choose_option();
default:
-@@ -1168,6 +1173,11 @@ static twin_bool_t pboot_lpane_event (tw
+@@ -1174,6 +1179,11 @@ static twin_bool_t pboot_lpane_event (tw
pboot_lpane->window->event = pboot_changeres_event;
pboot_message("res: 0=auto 1=720p 2=1080i 3=1080p");
return TWIN_TRUE;
++++++ petitboot.boot-screen.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:41.000000000 +0100
@@ -1,13 +1,21 @@
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -320,8 +320,15 @@ static void pboot_choose_option(void)
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -174,6 +174,7 @@ uint8_t sixaxis_map[] = {
+
+ static int pboot_vmode_change = -1;
+ static void pboot_choose_option(void);
++void pboot_make_background(const char *background);
+
+ /* XXX move to twin */
+ static inline twin_bool_t twin_rect_intersect(twin_rect_t r1,
+@@ -539,8 +540,14 @@ static void pboot_choose_option(void)
pboot_device_t *dev = pboot_devices[pboot_dev_sel];
pboot_option_t *opt = &dev->options[pboot_rpane->focus_curindex];
- LOG("Selected device %s\n", opt->title);
-
+- pboot_message("booting %s...", opt->title);
+ /* destroy windows to clear screen for boot logo */
+ twin_window_destroy(pboot_rpane->window);
+ twin_window_destroy(pboot_lpane->window);
@@ -16,10 +24,10 @@
+ pboot_make_background("loading.jpg");
+
+ LOG("Booting selected option %s\n", opt->title);
+
/* Give user feedback, make sure errors and panics will be seen */
pboot_exec_option(opt->data);
- }
-@@ -1179,14 +1186,18 @@ int pboot_remove_device(const char *dev_
+@@ -1192,14 +1199,18 @@ int pboot_remove_device(const char *dev_
return TWIN_TRUE;
}
@@ -41,7 +49,7 @@
filepic = twin_jpeg_to_pixmap(background_path, TWIN_ARGB32);
LOG("%s\n", filepic ? "ok" : "failed");
-@@ -1312,7 +1323,7 @@ int main(int argc, char **argv)
+@@ -1325,7 +1336,7 @@ int main(int argc, char **argv)
#endif
/* Set background pixmap */
@@ -50,12 +58,16 @@
/* Init more stuffs */
pboot_create_lpane();
-Index: powerpc-utils-1.0.0/petitboot/petitboot.h
+Index: powerpc-utils-1.0.6/petitboot/Makefile
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.h
-+++ powerpc-utils-1.0.0/petitboot/petitboot.h
-@@ -15,3 +15,4 @@ int pboot_remove_device(const char *dev_
- int pboot_start_device_discovery(int udev_trigger);
- void pboot_exec_option(void *data);
- void pboot_message(const char *message);
-+void pboot_make_background(const char *background);
+--- powerpc-utils-1.0.6.orig/petitboot/Makefile
++++ powerpc-utils-1.0.6/petitboot/Makefile
+@@ -10,7 +10,7 @@ LDFLAGS =
+ CFLAGS = --std=gnu99 -O0 -ggdb -Wall '-DPREFIX="$(PREFIX)"'
+
+ PARSERS = native yaboot kboot
+-ARTWORK = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
++ARTWORK = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz loading.jpg
+
+ all: petitboot petitboot-udev-helper
+
++++++ petitboot.continue-if-device-already-mounted.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:41.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
+Index: powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/udev-helper.c
-+++ powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
-@@ -415,11 +415,9 @@ static int found_new_device(const char *
+--- powerpc-utils-1.0.6.orig/petitboot/devices/petitboot-udev-helper.c
++++ powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
+@@ -447,11 +447,9 @@ static int found_new_device(const char *
if (mount_device(dev_path)) {
pb_log("failed to mount %s\n", dev_path);
++++++ petitboot.editor.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -17,6 +17,7 @@
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -20,6 +20,7 @@
#include
#include
@@ -10,7 +10,7 @@
#include "petitboot.h"
#include "petitboot-paths.h"
-@@ -31,7 +32,7 @@ static twin_fbdev_t *pboot_fbdev;
+@@ -34,7 +35,7 @@ static twin_fbdev_t *pboot_fbdev;
static twin_screen_t *pboot_screen;
#define PBOOT_INITIAL_MESSAGE \
@@ -19,7 +19,7 @@
#define PBOOT_LEFT_PANE_SIZE 160
#define PBOOT_LEFT_PANE_COLOR 0x80000000
-@@ -85,6 +86,11 @@ static twin_screen_t *pboot_screen;
+@@ -88,6 +89,11 @@ static twin_screen_t *pboot_screen;
#define PBOOT_STATUS_TEXT_SIZE (16 * TWIN_FIXED_ONE)
#define PBOOT_STATUS_TEXT_COLOR 0xff000000
@@ -31,7 +31,7 @@
typedef struct _pboot_option pboot_option_t;
typedef struct _pboot_device pboot_device_t;
-@@ -147,6 +153,15 @@ static pboot_lpane_t *pboot_lpane;
+@@ -150,6 +156,15 @@ static pboot_lpane_t *pboot_lpane;
static pboot_rpane_t *pboot_rpane;
static pboot_spane_t *pboot_spane;
@@ -47,7 +47,7 @@
/* control to keyboard mappings for the sixaxis controller */
uint8_t sixaxis_map[] = {
0, /* 0 Select */
-@@ -170,6 +185,272 @@ uint8_t sixaxis_map[] = {
+@@ -173,6 +188,272 @@ uint8_t sixaxis_map[] = {
0, /* 18 nothing */
};
@@ -319,8 +319,8 @@
+}
static int pboot_vmode_change = -1;
-
-@@ -585,8 +866,13 @@ static twin_bool_t pboot_rpane_event (tw
+ static void pboot_choose_option(void);
+@@ -590,8 +871,13 @@ static twin_bool_t pboot_rpane_event (tw
pboot_set_rfocus(pboot_rpane->focus_curindex + 1);
return TWIN_TRUE;
case KEY_LEFT:
@@ -334,7 +334,7 @@
case KEY_ENTER:
pboot_choose_option();
default:
-@@ -829,6 +1115,7 @@ static twin_bool_t pboot_lpane_event (tw
+@@ -834,6 +1120,7 @@ static twin_bool_t pboot_lpane_event (tw
pboot_set_lfocus(pboot_lpane->focus_curindex + 1);
return TWIN_TRUE;
case KEY_RIGHT:
@@ -342,7 +342,7 @@
pboot_select_rpane();
return TWIN_TRUE;
default:
-@@ -841,11 +1128,6 @@ static twin_bool_t pboot_lpane_event (tw
+@@ -846,11 +1133,6 @@ static twin_bool_t pboot_lpane_event (tw
return TWIN_FALSE;
}
@@ -354,7 +354,7 @@
twin_bool_t pboot_event_filter(twin_screen_t *screen,
twin_event_t *event)
{
-@@ -876,6 +1158,7 @@ twin_bool_t pboot_event_filter(twin_scre
+@@ -881,6 +1163,7 @@ twin_bool_t pboot_event_filter(twin_scre
/* fall through.. */
case TwinEventKeyDown:
switch(event->u.key.key) {
@@ -362,18 +362,10 @@
/* Gross hack for video modes, need something better ! */
case KEY_0:
pboot_vmode_change = 0; /* auto */
-@@ -893,12 +1176,14 @@ twin_bool_t pboot_event_filter(twin_scre
- pboot_vmode_change = 5; /* 1080p */
- pboot_quit();
- return TWIN_TRUE;
--
-+#endif
- /* Another gross hack for booting back to gameos */
-+#if 0
- case KEY_BACKSPACE:
+@@ -904,6 +1187,7 @@ twin_bool_t pboot_event_filter(twin_scre
case KEY_DELETE:
- system("boot-game-os");
- pboot_quit();
+ pboot_message("booting to GameOS...");
+ system(BOOT_GAMEOS_BIN);
+#endif
}
case TwinEventKeyUp:
++++++ petitboot.font.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -62,7 +62,9 @@ static twin_screen_t *pboot_screen;
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -65,7 +65,9 @@ static twin_screen_t *pboot_screen;
#define PBOOT_RIGHT_OPTION_HEIGHT 64
#define PBOOT_RIGHT_OPTION_STRIDE 100
#define PBOOT_RIGHT_TITLE_TEXT_SIZE (30 * TWIN_FIXED_ONE)
@@ -13,7 +13,7 @@
#define PBOOT_RIGHT_TITLE_XOFFSET 80
#define PBOOT_RIGHT_TITLE_YOFFSET 30
#define PBOOT_RIGHT_SUBTITLE_XOFFSET 100
-@@ -223,7 +225,14 @@ static void pboot_draw_option_cache(pboo
+@@ -228,7 +230,14 @@ static void pboot_draw_option_cache(pboo
twin_path_empty (path);
if (opt->subtitle) {
++++++ petitboot.kboot-boot_args.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,7 +1,7 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/kboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+--- powerpc-utils-1.0.6.orig/petitboot/devices/kboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
@@ -175,10 +175,6 @@ static int parse_option(struct boot_opti
initrd = get_global_option("initrd");
@@ -10,6 +10,6 @@
- free(cmdline);
- cmdline = tmp;
-
- opt->initrd_file = resolve_path(initrd, mountpoint);
+ opt->initrd_file = resolve_path(initrd, devpath);
}
++++++ petitboot.kboot-conf-file-locations.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,21 +1,21 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/kboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
-@@ -248,6 +248,18 @@ static int parse(const char *devicepath,
- filepath = join_paths(mountpoint, "/etc/kboot.conf");
+--- powerpc-utils-1.0.6.orig/petitboot/devices/kboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
+@@ -248,6 +248,18 @@ static int parse(const char *device)
+ filepath = resolve_path("/etc/kboot.conf", devpath);
fd = open(filepath, O_RDONLY);
+ if (fd < 0) {
-+ filepath = join_paths(mountpoint, "/ETC/KBOOT.CONF");
++ filepath = resolve_path("/ETC/KBOOT.CONF", devpath);
+ fd = open(filepath, O_RDONLY);
+ }
+ if (fd < 0) {
-+ filepath = join_paths(mountpoint, "/etc/kboot.cnf");
++ filepath = resolve_path("/etc/kboot.cnf", devpath);
+ fd = open(filepath, O_RDONLY);
+ }
+ if (fd < 0) {
-+ filepath = join_paths(mountpoint, "/ETC/KBOOT.CNF");
++ filepath = resolve_path("/ETC/KBOOT.CNF", devpath);
+ fd = open(filepath, O_RDONLY);
+ }
if (fd < 0)
++++++ petitboot.kboot-no-root.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,7 +1,7 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/kboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/kboot-parser.c
+--- powerpc-utils-1.0.6.orig/petitboot/devices/kboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/kboot-parser.c
@@ -188,10 +188,7 @@ static int parse_option(struct boot_opti
cmdline = tmp;
++++++ petitboot.pb_log.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
+Index: powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/udev-helper.c
-+++ powerpc-utils-1.0.0/petitboot/devices/udev-helper.c
-@@ -30,7 +30,7 @@
+--- powerpc-utils-1.0.6.orig/petitboot/devices/petitboot-udev-helper.c
++++ powerpc-utils-1.0.6/petitboot/devices/petitboot-udev-helper.c
+@@ -31,7 +31,7 @@
static FILE *logf;
static int sock;
@@ -11,10 +11,10 @@
{
va_list ap;
-Index: powerpc-utils-1.0.0/petitboot/devices/parser.h
+Index: powerpc-utils-1.0.6/petitboot/devices/parser.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/parser.h
-+++ powerpc-utils-1.0.0/petitboot/devices/parser.h
+--- powerpc-utils-1.0.6.orig/petitboot/devices/parser.h
++++ powerpc-utils-1.0.6/petitboot/devices/parser.h
@@ -3,6 +3,8 @@
#define _PARSERS_H
@@ -24,7 +24,7 @@
#include "message.h"
struct parser {
-@@ -33,7 +35,10 @@ char *join_paths(const char *a, const ch
+@@ -31,7 +33,10 @@ void free_boot_option(struct boot_option
const char *generic_icon_file(enum generic_icon_type type);
/* functions provided by udev-helper or the test wrapper */
++++++ petitboot.videomode-switch.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,8 +1,8 @@
-Index: powerpc-utils-1.0.0/petitboot/petitboot.c
+Index: powerpc-utils-1.0.6/petitboot/petitboot.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/petitboot.c
-+++ powerpc-utils-1.0.0/petitboot/petitboot.c
-@@ -32,7 +32,7 @@ static twin_fbdev_t *pboot_fbdev;
+--- powerpc-utils-1.0.6.orig/petitboot/petitboot.c
++++ powerpc-utils-1.0.6/petitboot/petitboot.c
+@@ -35,7 +35,7 @@ static twin_fbdev_t *pboot_fbdev;
static twin_screen_t *pboot_screen;
#define PBOOT_INITIAL_MESSAGE \
@@ -11,7 +11,7 @@
#define PBOOT_LEFT_PANE_SIZE 160
#define PBOOT_LEFT_PANE_COLOR 0x80000000
-@@ -153,6 +153,7 @@ static pboot_lpane_t *pboot_lpane;
+@@ -156,6 +156,7 @@ static pboot_lpane_t *pboot_lpane;
static pboot_rpane_t *pboot_rpane;
static pboot_spane_t *pboot_spane;
@@ -19,7 +19,7 @@
static int edit_in_progress;
static char pboot_edit_buf[EDIT_BUF_SIZE];
static twin_bool_t pboot_rpane_event (twin_window_t *window,
-@@ -346,6 +347,49 @@ int save_edit_option(char *new_opt)
+@@ -349,6 +350,49 @@ int save_edit_option(char *new_opt)
}
return 0;
}
@@ -69,7 +69,7 @@
static twin_bool_t pboot_edit_event (twin_window_t *window,
twin_event_t *event)
{
-@@ -363,7 +407,7 @@ static twin_bool_t pboot_edit_event (twi
+@@ -366,7 +410,7 @@ static twin_bool_t pboot_edit_event (twi
edit_in_progress = 0;
memset(pboot_edit_buf, 0, EDIT_BUF_SIZE);
pboot_rpane->window->event = pboot_rpane_event;
@@ -78,16 +78,15 @@
return TWIN_TRUE;
case KEY_BACKSPACE:
if( strlen(pboot_edit_buf) ) {
-@@ -452,8 +496,6 @@ static twin_bool_t pboot_select_event (t
+@@ -455,7 +499,6 @@ static twin_bool_t pboot_select_event (t
return TWIN_FALSE;
}
-static int pboot_vmode_change = -1;
--
- /* XXX move to twin */
- static inline twin_bool_t twin_rect_intersect(twin_rect_t r1,
- twin_rect_t r2)
-@@ -866,13 +908,17 @@ static twin_bool_t pboot_rpane_event (tw
+ static void pboot_choose_option(void);
+ void pboot_make_background(const char *background);
+
+@@ -871,13 +914,17 @@ static twin_bool_t pboot_rpane_event (tw
pboot_set_rfocus(pboot_rpane->focus_curindex + 1);
return TWIN_TRUE;
case KEY_LEFT:
@@ -106,7 +105,7 @@
case KEY_ENTER:
pboot_choose_option();
default:
-@@ -1115,9 +1161,13 @@ static twin_bool_t pboot_lpane_event (tw
+@@ -1120,9 +1167,13 @@ static twin_bool_t pboot_lpane_event (tw
pboot_set_lfocus(pboot_lpane->focus_curindex + 1);
return TWIN_TRUE;
case KEY_RIGHT:
++++++ petitboot.yaboot-suse.patch ++++++
--- /var/tmp/diff_new_pack.pI8082/_old 2008-01-21 01:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.pI8082/_new 2008-01-21 01:11:42.000000000 +0100
@@ -1,14 +1,14 @@
-Index: powerpc-utils-1.0.0/petitboot/devices/yaboot-parser.c
+Index: powerpc-utils-1.0.6/petitboot/devices/yaboot-parser.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/yaboot-parser.c
-+++ powerpc-utils-1.0.0/petitboot/devices/yaboot-parser.c
+--- powerpc-utils-1.0.6.orig/petitboot/devices/yaboot-parser.c
++++ powerpc-utils-1.0.6/petitboot/devices/yaboot-parser.c
@@ -1,4 +1,4 @@
-
+#define _GNU_SOURCE
#include "parser.h"
#include "params.h"
- #include "yaboot-cfg.h"
-@@ -96,21 +96,40 @@ static int check_and_add_device(struct d
+ #include "paths.h"
+@@ -97,21 +97,39 @@ static int check_and_add_device(struct d
void process_image(char *label)
{
struct boot_option opt;
@@ -19,27 +19,26 @@
opt.name = label;
cfgopt = cfg_get_strg(label, "image");
-- opt.boot_image_file = resolve_path(cfgopt, mountpoint);
+- opt.boot_image_file = resolve_path(cfgopt, devpath);
+ if (!cfgopt)
+ cfgopt = cfg_get_strg(label, "image[64bit]");
+ if (cfgopt[0] == '/')
-+ opt.boot_image_file = join_paths(mountpoint, cfgopt);
++ opt.boot_image_file = resolve_path(cfgopt, devpath);
+ else {
+ snprintf(path, sizeof(path), "/suseboot/%s", cfgopt);
-+ opt.boot_image_file = join_paths(mountpoint, path);
++ opt.boot_image_file = resolve_path(path, cfgopt);
+ }
+ pb_log("boot_image_file %s\n",opt.boot_image_file);
+
-+
if (cfgopt == defimage)
pb_log("This one is default. What do we do about it?\n");
cfgopt = cfg_get_strg(label, "initrd");
- if (cfgopt)
-- opt.initrd_file = resolve_path(cfgopt, mountpoint);
+- opt.initrd_file = resolve_path(cfgopt, devpath);
+ if (cfgopt) {
+ if (cfgopt[0] == '/')
-+ opt.initrd_file = resolve_path(cfgopt, mountpoint);
++ opt.initrd_file = resolve_path(cfgopt, devpath);
+ else {
+ snprintf(path, sizeof(path), "/suseboot/%s", cfgopt);
+ opt.initrd_file = resolve_path(cfgopt, path);
@@ -53,58 +52,46 @@
add_boot_option(&opt);
-@@ -130,18 +149,24 @@ static int yaboot_parse(const char *devi
+@@ -131,12 +149,15 @@ static int yaboot_parse(const char *devi
- mountpoint = _mountpoint;
+ devpath = strdup(device);
+ /* reset image list for re-parsing */
+ cfg_reset_image_list();
+
- filepath = join_paths(mountpoint, "/etc/yaboot.conf");
-+ //pb_log("mountpoint=%s filepath=%s\n", mountpoint, filepath);
+ filepath = resolve_path("/etc/yaboot.conf", devpath);
fd = open(filepath, O_RDONLY);
if (fd < 0) {
free(filepath);
- filepath = join_paths(mountpoint, "/yaboot.conf");
+- filepath = resolve_path("/yaboot.conf", devpath);
++ filepath = resolve_path("/suseboot/yaboot.cnf", devpath);
fd = open(filepath, O_RDONLY);
--
-- if (fd < 0)
-- return 0;
- }
--
-+ if (fd < 0) {
-+ filepath = join_paths(mountpoint, "/suseboot/yaboot.cnf");
-+ fd = open(filepath, O_RDONLY);
-+ }
-+ if (fd < 0)
-+ return 0;
- if (fstat(fd, &st)) {
- close(fd);
- return 0;
-@@ -172,6 +197,8 @@ static int yaboot_parse(const char *devi
+
+ if (fd < 0)
+@@ -173,6 +194,8 @@ static int yaboot_parse(const char *devi
dev = malloc(sizeof(*dev));
memset(dev, 0, sizeof(*dev));
- dev->id = strdup(devicepath);
-+ dev->name = strrchr(devicepath, '/');dev->name++;
+ dev->id = strdup(devpath);
++ dev->name = strrchr(devpath, '/');dev->name++;
+
if (cfg_get_strg(0, "init-message")) {
char *newline;
dev->description = strdup(cfg_get_strg(0, "init-message"));
-Index: powerpc-utils-1.0.0/petitboot/devices/yaboot-cfg.c
+Index: powerpc-utils-1.0.6/petitboot/devices/yaboot-cfg.c
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/yaboot-cfg.c
-+++ powerpc-utils-1.0.0/petitboot/devices/yaboot-cfg.c
-@@ -27,6 +27,8 @@
+--- powerpc-utils-1.0.6.orig/petitboot/devices/yaboot-cfg.c
++++ powerpc-utils-1.0.6/petitboot/devices/yaboot-cfg.c
+@@ -26,6 +26,8 @@
+ #include
#include
- #include
+#include "parser.h"
+
#define prom_printf printf
#define prom_putchar putchar
#define prom_vprintf vprintf
-@@ -113,6 +115,12 @@ static struct IMAGES {
+@@ -112,6 +114,12 @@ static struct IMAGES {
struct IMAGES *next;
} *images = NULL;
@@ -117,7 +104,7 @@
void cfg_error (char *msg,...)
{
va_list ap;
-@@ -296,7 +304,7 @@ static int cfg_set (char *item, char *va
+@@ -295,7 +303,7 @@ static int cfg_set (char *item, char *va
{
CONFIG *walk;
@@ -126,7 +113,7 @@
struct IMAGES **p = &images;
while (*p)
-@@ -309,6 +317,7 @@ static int cfg_set (char *item, char *va
+@@ -308,6 +316,7 @@ static int cfg_set (char *item, char *va
(*p)->next = 0;
curr_table = ((*p)->table);
memcpy (curr_table, cf_image, sizeof (cf_image));
@@ -134,10 +121,10 @@
}
for (walk = curr_table; walk->type != cft_end; walk++) {
if (walk->name && !strcasecmp (walk->name, item)) {
-Index: powerpc-utils-1.0.0/petitboot/devices/yaboot-cfg.h
+Index: powerpc-utils-1.0.6/petitboot/devices/yaboot-cfg.h
===================================================================
---- powerpc-utils-1.0.0.orig/petitboot/devices/yaboot-cfg.h
-+++ powerpc-utils-1.0.0/petitboot/devices/yaboot-cfg.h
+--- powerpc-utils-1.0.6.orig/petitboot/devices/yaboot-cfg.h
++++ powerpc-utils-1.0.6/petitboot/devices/yaboot-cfg.h
@@ -27,4 +27,5 @@ extern int cfg_get_flag(char *image, cha
extern void cfg_print_images(void);
extern char* cfg_get_default(void);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org