rpms/petitboot/devel .cvsignore, 1.2, 1.3 petitboot-0.0.1-artwork-not-executable.patch, 1.2, 1.3 petitboot-0.0.1-build-limits_h.patch, 1.2, 1.3 petitboot-0.0.1-defaults.patch, 1.1, 1.2 petitboot-0.0.1-makefile.patch, 1.1, 1.2 petitboot.spec, 1.12, 1.13 sources, 1.3, 1.4
Joshua W. Boyer
jwboyer at fedoraproject.org
Tue Oct 14 14:31:06 UTC 2008
Author: jwboyer
Update of /cvs/pkgs/rpms/petitboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5938
Modified Files:
.cvsignore petitboot-0.0.1-artwork-not-executable.patch
petitboot-0.0.1-build-limits_h.patch
petitboot-0.0.1-defaults.patch petitboot-0.0.1-makefile.patch
petitboot.spec sources
Log Message:
* Tue Oct 14 2008 Josh Boyer <jwboyer at gmail.com> - 0.2-1
- Update to 0.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Apr 2007 03:30:01 -0000 1.2
+++ .cvsignore 14 Oct 2008 14:30:35 -0000 1.3
@@ -1 +1 @@
-libpng-1.2.16.tar.bz2
+petitboot-0.2.tar.gz
petitboot-0.0.1-artwork-not-executable.patch:
Index: petitboot-0.0.1-artwork-not-executable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/petitboot-0.0.1-artwork-not-executable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- petitboot-0.0.1-artwork-not-executable.patch 6 Apr 2007 23:35:48 -0000 1.2
+++ petitboot-0.0.1-artwork-not-executable.patch 14 Oct 2008 14:30:35 -0000 1.3
@@ -6,13 +6,15 @@
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
-diff --git a/Makefile b/Makefile
-index 54e8f9a..7974a27 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ install: all
- $(INSTALL) -D petitboot $(DESTDIR)$(PREFIX)/sbin/petitboot
- $(INSTALL) -D udev-helper $(DESTDIR)$(PREFIX)/sbin/udev-helper
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- petitboot-0.2.orig/Makefile
++++ petitboot-0.2/Makefile
+@@ -37,7 +37,7 @@ install: all
+ $(INSTALL) -D petitboot-udev-helper \
+ $(DESTDIR)$(PREFIX)/sbin/petitboot-udev-helper
$(INSTALL) -Dd $(DESTDIR)$(PREFIX)/share/petitboot/artwork/
- $(INSTALL) -t $(DESTDIR)$(PREFIX)/share/petitboot/artwork/ \
+ $(INSTALL) -m0644 -t $(DESTDIR)$(PREFIX)/share/petitboot/artwork/ \
petitboot-0.0.1-build-limits_h.patch:
Index: petitboot-0.0.1-build-limits_h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/petitboot-0.0.1-build-limits_h.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- petitboot-0.0.1-build-limits_h.patch 18 Sep 2008 18:14:23 -0000 1.2
+++ petitboot-0.0.1-build-limits_h.patch 14 Oct 2008 14:30:35 -0000 1.3
@@ -1,6 +1,10 @@
---- petitboot-0.0.1/devices/udev-helper.c~ 2008-04-23 02:54:05.000000000 +0100
-+++ petitboot-0.0.1/devices/udev-helper.c 2008-04-23 02:55:28.000000000 +0100
-@@ -12,6 +12,8 @@
+---
+ devices/petitboot-udev-helper.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- petitboot-0.2.orig/devices/petitboot-udev-helper.c
++++ petitboot-0.2/devices/petitboot-udev-helper.c
+@@ -14,6 +14,8 @@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
petitboot-0.0.1-defaults.patch:
Index: petitboot-0.0.1-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/petitboot-0.0.1-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- petitboot-0.0.1-defaults.patch 6 Apr 2007 23:35:48 -0000 1.1
+++ petitboot-0.0.1-defaults.patch 14 Oct 2008 14:30:35 -0000 1.2
@@ -10,11 +10,18 @@
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-diff --git a/devices.c b/devices.c
-index e4d6913..6c4bc40 100644
---- a/devices.c
-+++ b/devices.c
-@@ -168,7 +168,8 @@ static int read_option(int fd, struct device_context *dev_ctx)
+---
+ devices.c | 3 +-
+ devices/message.h | 1
+ devices/petitboot-udev-helper.c | 3 +-
+ devices/yaboot-parser.c | 5 ++--
+ petitboot.c | 44 ++++++++++++++++++++++++++++++++++++++--
+ petitboot.h | 5 ++--
+ 6 files changed, 53 insertions(+), 8 deletions(-)
+
+--- petitboot-0.2.orig/devices.c
++++ petitboot-0.2/devices.c
+@@ -168,7 +168,8 @@ static int read_option(int fd, struct de
if (icon)
index = pboot_add_option(dev_ctx->device_idx, opt->name,
@@ -24,10 +31,8 @@
return index != -1;
}
-diff --git a/devices/message.h b/devices/message.h
-index 7a5d4f2..2a16bdd 100644
---- a/devices/message.h
-+++ b/devices/message.h
+--- petitboot-0.2.orig/devices/message.h
++++ petitboot-0.2/devices/message.h
@@ -24,6 +24,7 @@ struct boot_option {
char *boot_image_file;
char *initrd_file;
@@ -36,11 +41,9 @@
};
-diff --git a/devices/udev-helper.c b/devices/udev-helper.c
-index 4ec054b..491662d 100644
---- a/devices/udev-helper.c
-+++ b/devices/udev-helper.c
-@@ -132,7 +132,8 @@ int add_boot_option(const struct boot_option *opt)
+--- petitboot-0.2.orig/devices/petitboot-udev-helper.c
++++ petitboot-0.2/devices/petitboot-udev-helper.c
+@@ -135,7 +135,8 @@ int add_boot_option(const struct boot_op
write_string(sock, opt->icon_file) ||
write_string(sock, opt->boot_image_file) ||
write_string(sock, opt->initrd_file) ||
@@ -50,28 +53,24 @@
if (rc)
pb_log("error writing boot option %s to socket\n", opt->name);
-diff --git a/devices/yaboot-parser.c b/devices/yaboot-parser.c
-index 2324950..286babb 100644
---- a/devices/yaboot-parser.c
-+++ b/devices/yaboot-parser.c
+--- petitboot-0.2.orig/devices/yaboot-parser.c
++++ petitboot-0.2/devices/yaboot-parser.c
@@ -104,9 +104,10 @@ void process_image(char *label)
opt.name = label;
cfgopt = cfg_get_strg(label, "image");
- opt.boot_image_file = join_paths(mountpoint, cfgopt);
+ opt.boot_image_file = resolve_path(cfgopt, devpath);
+ /* FIXME: Lower priority for removable media */
if (cfgopt == defimage)
- pb_log("This one is default. What do we do about it?\n");
-
+ opt.default_prio = "99";
-+
++
cfgopt = cfg_get_strg(label, "initrd");
if (cfgopt)
- opt.initrd_file = join_paths(mountpoint, cfgopt);
-diff --git a/petitboot.c b/petitboot.c
-index f875768..2c5b8d7 100644
---- a/petitboot.c
-+++ b/petitboot.c
-@@ -29,6 +29,7 @@ static twin_fbdev_t *pboot_fbdev;
+ opt.initrd_file = resolve_path(cfgopt, devpath);
+--- petitboot-0.2.orig/petitboot.c
++++ petitboot-0.2/petitboot.c
+@@ -33,6 +33,7 @@ static twin_fbdev_t *pboot_fbdev;
#endif
static twin_screen_t *pboot_screen;
@@ -79,7 +78,7 @@
#define PBOOT_INITIAL_MESSAGE \
"keys: 0=safe 1=720p 2=1080i 3=1080p del=GameOS"
-@@ -143,6 +144,9 @@ static pboot_spane_t *pboot_spane;
+@@ -171,6 +172,9 @@ uint8_t sixaxis_map[] = {
static int pboot_vmode_change = -1;
@@ -89,7 +88,7 @@
/* XXX move to twin */
static inline twin_bool_t twin_rect_intersect(twin_rect_t r1,
twin_rect_t r2)
-@@ -326,6 +330,11 @@ static void pboot_set_rfocus(int index)
+@@ -354,6 +358,11 @@ static void pboot_set_rfocus(int index)
{
pboot_device_t *dev;
@@ -101,7 +100,7 @@
if (pboot_dev_sel < 0 || pboot_dev_sel >= pboot_dev_count)
return;
dev = pboot_devices[pboot_dev_sel];
-@@ -477,9 +486,16 @@ static twin_bool_t pboot_rpane_event (twin_window_t *window,
+@@ -506,9 +515,16 @@ static twin_bool_t pboot_rpane_event (tw
return TWIN_FALSE;
}
@@ -120,7 +119,7 @@
{
pboot_device_t *dev;
pboot_option_t *opt;
-@@ -517,6 +533,26 @@ int pboot_add_option(int devindex, const char *title,
+@@ -546,6 +562,26 @@ int pboot_add_option(int devindex, const
opt->box.bottom = opt->box.top + PBOOT_RIGHT_OPTION_HEIGHT;
opt->data = data;
@@ -147,7 +146,7 @@
return index;
}
-@@ -627,6 +663,10 @@ static void pboot_set_lfocus(int index)
+@@ -656,6 +692,10 @@ static void pboot_set_lfocus(int index)
if (index >= pboot_dev_count)
return;
@@ -158,11 +157,9 @@
pboot_lpane->focus_start = pboot_lpane->focus_box.top;
if (index < 0)
-diff --git a/petitboot.h b/petitboot.h
-index a77bfef..bc4563d 100644
---- a/petitboot.h
-+++ b/petitboot.h
-@@ -8,8 +8,9 @@
+--- petitboot-0.2.orig/petitboot.h
++++ petitboot-0.2/petitboot.h
+@@ -9,8 +9,9 @@
int pboot_add_device(const char *dev_id, const char *name,
twin_pixmap_t *pixmap);
petitboot-0.0.1-makefile.patch:
Index: petitboot-0.0.1-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/petitboot-0.0.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- petitboot-0.0.1-makefile.patch 9 Apr 2007 03:35:01 -0000 1.1
+++ petitboot-0.0.1-makefile.patch 14 Oct 2008 14:30:35 -0000 1.2
@@ -1,7 +1,11 @@
---- petitboot-0.0.1/Makefile.orig 2007-04-08 23:11:34.000000000 -0400
-+++ petitboot-0.0.1/Makefile 2007-04-08 23:12:05.000000000 -0400
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- petitboot-0.2.orig/Makefile
++++ petitboot-0.2/Makefile
@@ -15,7 +15,7 @@ ARTWORK = background.jpg cdrom.png hdd.p
- all: petitboot udev-helper
+ all: petitboot petitboot-udev-helper
petitboot: petitboot.o devices.o
- $(CC) $(LDFLAGS) -o $@ $^
Index: petitboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/petitboot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- petitboot.spec 18 Sep 2008 18:17:06 -0000 1.12
+++ petitboot.spec 14 Oct 2008 14:30:35 -0000 1.13
@@ -1,8 +1,8 @@
%define pngver 1.2.16
Name: petitboot
-Version: 0.0.1
-Release: 10%{?dist}
+Version: 0.2
+Release: 1%{?dist}
Summary: Graphical kexec-based bootloader, originally for PlayStation 3
Group: System Environment/Base
@@ -21,7 +21,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel zlib-devel libX11-devel libjpeg-devel
-BuildRequires: freetype-devel libtwin-devel autoconf
+BuildRequires: freetype-devel autoconf
+BuildRequires: libtwin-devel >= 0.0.3
%description
Petitboot is a graphical bootloader for the PlayStation 3. It's based
@@ -66,6 +67,9 @@
%changelog
+* Tue Oct 14 2008 Josh Boyer <jwboyer at gmail.com> - 0.2-1
+- Update to 0.2
+
* Thu Sep 18 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.0.1-10
- Build fix: include <linux/limits.h> in devices/udev-helper.c. FTBFS BZ#434071
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/petitboot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Apr 2007 03:30:01 -0000 1.3
+++ sources 14 Oct 2008 14:30:35 -0000 1.4
@@ -1,2 +1 @@
-730e7e4b559d886f01d26f56f70dbe63 petitboot-0.0.1.tar.gz
-7a1ca4f49bcffdec60d50f48460642bd libpng-1.2.16.tar.bz2
+b320c434f38d57c1fcc6980e51d934a8 petitboot-0.2.tar.gz
More information about the scm-commits
mailing list