Hello community,
here is the log from the commit of package petitboot
checked in at Sat Sep 6 03:10:45 CEST 2008.
--------
--- arch/ppc/petitboot/petitboot.changes 2008-08-07 01:12:50.000000000 +0200
+++ petitboot/petitboot.changes 2008-09-05 15:50:17.218636000 +0200
@@ -1,0 +2,13 @@
+Mon Sep 1 11:12:02 CEST 2008 - sassmann@suse.de
+
+- switch to Geoff Levands branch which is a rework of petitboot
+ * Rename the original graphical petitboot application to petitboot-gui
+ * Convert the build to use autotools
+ * Rewrite or update the path related petitboot library functions.
+ * Cleanup kboot parser
+ * Cleanup native parser
+ * Cleanup yaboot parser
+ * fixes various focus behavior related bugs
+- fix gen-initrd.sh library issues
+
+-------------------------------------------------------------------
Old:
----
petitboot-0.2.tar.bz2
petitboot.add-default-entry.patch
petitboot.add-timeout.patch
petitboot.boot-game-os.patch
petitboot.boot-screen.patch
petitboot.compile-fix-gcc4.3.patch
petitboot.continue-if-device-already-mounted.patch
petitboot.editor.patch
petitboot.font.patch
petitboot.kboot-boot_args.patch
petitboot.kboot-conf-file-locations.patch
petitboot.kboot-no-root.patch
petitboot.new-udev-uses-udevadm.patch
petitboot.pb_log.patch
petitboot.picture-permissions.patch
petitboot.videomode-switch.patch
petitboot.yaboot-suse.patch
New:
----
petitboot-handle-new-udev.patch
petitboot-multiple-font-sizes.patch
petitboot-no-default-root-cmdline-parameter.patch
petitboot-reorder-devices.patch
petitboot.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ petitboot.spec ++++++
--- /var/tmp/diff_new_pack.K13728/_old 2008-09-06 03:06:10.000000000 +0200
+++ /var/tmp/diff_new_pack.K13728/_new 2008-09-06 03:06:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package petitboot (Version 0.2)
+# spec file for package petitboot (Version 1.0rc2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,35 +19,21 @@
Name: petitboot
-Version: 0.2
-Release: 61
+Version: 1.0rc2
+Release: 1
Url: http://ozlabs.org/~jk/projects/petitboot/
Summary: Petitboot is a graphical bootloader for the PlayStation 3
License: GPL v2 only
BuildRequires: busybox kexec-tools libjpeg-devel libpng-devel libtwin0-devel pkg-config ps3-utils
-%ifarch ppc ppc64
BuildRequires: dtc kernel-ps3 lilo powerpc-utils
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}.tar.bz2
Source1: gen-initrd.sh
Source2: extract_from_elf.c
-Patch0: petitboot.pb_log.patch
-Patch1: petitboot.continue-if-device-already-mounted.patch
-Patch2: petitboot.kboot-conf-file-locations.patch
-Patch3: petitboot.kboot-no-root.patch
-Patch4: petitboot.kboot-boot_args.patch
-Patch5: petitboot.yaboot-suse.patch
-Patch6: petitboot.add-timeout.patch
-Patch7: petitboot.add-default-entry.patch
-Patch8: petitboot.boot-screen.patch
-Patch9: petitboot.font.patch
-Patch10: petitboot.editor.patch
-Patch11: petitboot.videomode-switch.patch
-Patch12: petitboot.boot-game-os.patch
-Patch13: petitboot.compile-fix-gcc4.3.patch
-Patch14: petitboot.picture-permissions.patch
-Patch15: petitboot.new-udev-uses-udevadm.patch
+Patch0: petitboot-handle-new-udev.patch
+Patch1: petitboot-no-default-root-cmdline-parameter.patch
+Patch2: petitboot-multiple-font-sizes.patch
+Patch3: petitboot-reorder-devices.patch
Group: System/Boot
ExclusiveArch: ppc ppc64
@@ -63,29 +49,19 @@
jeremy kerr
%prep
-%setup -q
+%setup -n petitboot
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
+# patch3 disabled, not working correctly
+#%patch3 -p1
-%build
+%build -n petitboot
+./bootstrap
+./configure
# make petitboot
-make %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs} libdir=%{_libdir}
gcc -Wall -Os -s -o extract_from_elf %{S:2}
-%ifarch ppc ppc64
# make initrd
bash -x %{S:1} %{_lib} initrd-tmp
# make otheros.bld
@@ -99,31 +75,45 @@
MAXSIZE=$(( 0x3FFE00 ))
echo "otheros.bld filesize:$FILESIZE max size:$MAXSIZE size left:$(( $MAXSIZE - $FILESIZE )) "
test $FILESIZE -lt $MAXSIZE
-%endif
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-%ifarch ppc ppc64
+make DESTDIR=$RPM_BUILD_ROOT install sysconfdir=/etc libdir=%{_libdir}
mkdir $RPM_BUILD_ROOT/usr/share/ps3
cp otheros.bld $RPM_BUILD_ROOT/usr/share/ps3
-%endif
+rm $RPM_BUILD_ROOT/%{_libdir}/libpetitboot.a
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%dir /usr/share/petitboot
%dir /usr/share/petitboot/artwork
-/usr/sbin/petitboot
-/usr/sbin/petitboot-udev-helper
/usr/share/petitboot/artwork/*
-%ifarch ppc ppc64
+%config /etc/udev/rules.d/99-petitboot.rules
+/etc/udhcpc.user
+/usr/sbin/petitboot*
+%{_libdir}/libpetitboot*
%dir /usr/share/ps3
/usr/share/ps3/otheros.bld
-%endif
%changelog
+* Mon Sep 01 2008 sassmann@suse.de
+- switch to Geoff Levands branch which is a rework of petitboot
+ * Rename the original graphical petitboot application to petitboot-gui
+ * Convert the build to use autotools
+ * Rewrite or update the path related petitboot library functions.
+ * Cleanup kboot parser
+ * Cleanup native parser
+ * Cleanup yaboot parser
+ * fixes various focus behavior related bugs
+- fix gen-initrd.sh library issues
* Thu Aug 07 2008 ro@suse.de
- add exclusivearch to specfile
* Thu Jul 03 2008 sassmann@suse.de
++++++ gen-initrd.sh ++++++
--- arch/ppc/petitboot/gen-initrd.sh 2008-07-03 14:53:34.000000000 +0200
+++ petitboot/gen-initrd.sh 2008-08-11 13:08:50.000000000 +0200
@@ -21,13 +21,16 @@
cp -aL /sbin/kexec usr/sbin/kexec.bin
cp -aL /usr/sbin/setctsid sbin/setctsid
cp -aL ../artwork usr/share/petitboot/
-cp -aL ../petitboot-udev-helper usr/sbin
-cp -aL ../petitboot usr/bin
+cp -aL ../src/.libs/petitboot-udev usr/sbin
+cp -aL ../src/.libs/petitboot-gui usr/bin
+cp -aL ../src/.libs/petitboot-cui usr/bin
cp -aL /etc/udev etc
cp -aL /usr/sbin/ps3-flash-util usr/sbin
-cp -aL /usr/sbin/ps3-boot-game-os usr/bin
+cp -aL /usr/sbin/ps3-boot-game-os usr/sbin
cp -aL /usr/bin/ps3-video-mode usr/bin
cp -aL /usr/$myLIB/libps3-utils.so.* $myLIB
+cp -aL ../lib/.libs/libpetitboot.so.0 $myLIB
+cp -aL ../scripts/99-petitboot.rules etc/udev/rules.d/
cp -avL /sbin/udevd /sbin/udevadm sbin
cp -avL /usr/bin/udevinfo usr/bin
@@ -36,9 +39,9 @@
mv ../extract_from_elf sbin/
# create udev rules
-cat > etc/udev/rules.d/00-petit.rules < etc/udev/rules.d/00-petit.rules < /otheros.bld
-ps3-flash-util /otheros.bld
+ps3-flash-util -w /otheros.bld
EOF
# fix reboot
@@ -153,19 +156,7 @@
# switch videomode to 720p
#ps3-video-mode -v 3
-petitboot -u
-#echo "petitboot returned with $?"
-
-# evaluating return code
-while [ $? -eq 42 ]; do
- echo "changing resolution"
- for i in /000*
- do
- umount $i
- rm -rf $i
- done
- petitboot -u
-done
+petitboot-gui
/bin/ash
EOF
++++++ petitboot-handle-new-udev.patch ++++++
---
lib/petitboot-device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/lib/petitboot-device.c
+++ b/lib/petitboot-device.c
@@ -491,8 +491,8 @@ int pb_device_init(const struct pb_callb
pb_poll_device_thread_exit = 0;
/* invoke udevtrigger to get udev events */
- if (system("udevtrigger"))
- pb_log("ERROR: udevtrigger\n");
+ if (system("udevadm trigger"))
+ pb_log("ERROR: udevadm trigger failed\n");
pb_log("device init - done\n");
++++++ petitboot-multiple-font-sizes.patch ++++++
---
src/petitboot-gui.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
--- a/src/petitboot-gui.c
+++ b/src/petitboot-gui.c
@@ -64,7 +64,9 @@ static twin_screen_t *pboot_screen;
#define PBOOT_RIGHT_OPTION_HEIGHT (64 * PBOOT_SCALE)
#define PBOOT_RIGHT_OPTION_STRIDE (100 * PBOOT_SCALE)
#define PBOOT_RIGHT_TITLE_TEXT_SIZE (30 * PBOOT_SCALE * TWIN_FIXED_ONE)
-#define PBOOT_RIGHT_SUBTITLE_TEXT_SIZE (18 * PBOOT_SCALE * TWIN_FIXED_ONE)
+#define PBOOT_RIGHT_SUB_TEXT_SIZE_L (18 * TWIN_FIXED_ONE)
+#define PBOOT_RIGHT_SUB_TEXT_SIZE_M (15 * TWIN_FIXED_ONE)
+#define PBOOT_RIGHT_SUB_TEXT_SIZE_S (13 * TWIN_FIXED_ONE)
#define PBOOT_RIGHT_TITLE_XOFFSET (80 * PBOOT_SCALE)
#define PBOOT_RIGHT_TITLE_YOFFSET (30 * PBOOT_SCALE)
#define PBOOT_RIGHT_SUBTITLE_XOFFSET (100 * PBOOT_SCALE)
@@ -572,7 +574,14 @@ static void pboot_draw_option_cache(pboo
twin_path_empty (path);
if (opt->subtitle) {
- twin_path_set_font_size(path, PBOOT_RIGHT_SUBTITLE_TEXT_SIZE);
+ int sub_length;
+ sub_length = strlen(opt->subtitle);
+ if (sub_length < 80)
+ twin_path_set_font_size(path, PBOOT_RIGHT_SUB_TEXT_SIZE_L);
+ else if (sub_length < 100)
+ twin_path_set_font_size(path, PBOOT_RIGHT_SUB_TEXT_SIZE_M);
+ else
+ twin_path_set_font_size(path, PBOOT_RIGHT_SUB_TEXT_SIZE_S);
twin_path_set_font_style(path, TWIN_TEXT_UNHINTED);
tx = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_XOFFSET);
ty = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_YOFFSET);
++++++ petitboot-no-default-root-cmdline-parameter.patch ++++++
---
lib/parser/kboot-parser/kboot-parser.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/lib/parser/kboot-parser/kboot-parser.c
+++ b/lib/parser/kboot-parser/kboot-parser.c
@@ -180,10 +180,7 @@ static int parse_option(struct pb_option
free(cmdline);
cmdline = tmp;
} else if (initrd) {
- /* if there's initrd but no root, fake up /dev/ram0 */
- asprintf(&tmp, "root=/dev/ram0 %s", cmdline);
- free(cmdline);
- cmdline = tmp;
+ /* if there's initrd but no root, then it's not a problem */
}
/* remove double whitespaces */
++++++ petitboot-reorder-devices.patch ++++++
---
src/petitboot-gui.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
--- a/src/petitboot-gui.c
+++ b/src/petitboot-gui.c
@@ -1411,11 +1411,13 @@ static void pboot_create_spane(void)
twin_window_queue_paint(pboot_spane->window);
}
+static int sem = 1;
static void pboot_add_device(const struct pb_device *device)
{
pboot_device_t *dev;
int devindex;
+ /* sanity checks */
if (pboot_dev_count >= PBOOT_MAX_DEV)
return;
@@ -1437,16 +1439,62 @@ static void pboot_add_device(const struc
dev->id = malloc(strlen(device->devname) + 1);
strcpy(dev->id, device->devname);
+ /* only one at a time here */
+ while (sem <= 0)
+ usleep(100000);
+ sem--;
+
+ /* order devices lexicographically - ascending */
+ pb_log("XXX pboot_add_device device=%s\n", device->devname);
+ for (devindex = 0; devindex < pboot_dev_count; devindex++) {
+ int ret;
+ pb_log("XXX devindex=%d pboot_dev_count=%d\n", devindex, pboot_dev_count);
+ if (pboot_devices[devindex] == NULL) {
+ break;
+ }
+ if (*pboot_devices[devindex]->id != '/')
+ continue;
+
+ ret = strcasecmp(pboot_devices[devindex]->id, dev->id);
+ /* ret < 0 : try next
+ * ret > 0 : insert before current entry
+ */
+ if (ret < 0) {
+ pb_log("XXX pboot_devices[devindex]->id=%s dev->id=%s, ret=%d -> continue\n", pboot_devices[devindex]->id, dev->id, ret);
+ continue;
+ } else {
+ int counter;
+ pb_log("XXX moving devices\n");
+
+ for (counter = pboot_dev_count; counter >= devindex; counter--) {
+ pb_log("XXX counter=%d\n", counter);
+ pboot_devices[counter] = pboot_devices[counter-1];
+ pboot_devices[counter]->box.top += PBOOT_LEFT_ICON_STRIDE;
+ }
+ break;
+ }
+ pb_log("XXX move done\n");
+ }
+ sem++;
+
dev->badge = get_icon(device->icon_file, device->type);
dev->box.left = PBOOT_LEFT_ICON_XOFF;
dev->box.right = dev->box.left + PBOOT_LEFT_ICON_WIDTH;
dev->box.top = PBOOT_LEFT_ICON_YOFF +
- PBOOT_LEFT_ICON_STRIDE * pboot_dev_count;
+ PBOOT_LEFT_ICON_STRIDE * devindex;
+ //dev->box.top = PBOOT_LEFT_ICON_YOFF +
+ // PBOOT_LEFT_ICON_STRIDE * pboot_dev_count;
dev->box.bottom = dev->box.top + PBOOT_LEFT_ICON_HEIGHT;
pboot_devices[devindex] = dev;
pboot_dev_count++;
+ /* redraw lpane */
+ twin_window_damage(pboot_lpane->window,
+ 0, 0,
+ PBOOT_LEFT_PANE_SIZE, pboot_screen->height);
+ twin_window_queue_paint(pboot_lpane->window);
+
twin_window_damage(pboot_lpane->window,
dev->box.left, dev->box.top,
dev->box.right, dev->box.bottom);
++++++ petitboot-0.2.tar.bz2 -> petitboot.tar.bz2 ++++++
++++ 14820 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org