Update ps3-kboot patch

[petitboot] / utils / ps3-kboot-0.1-petitboot.patch

diff --git a/utils/ps3-kboot-0.1-petitboot.patch b/utils/ps3-kboot-0.1-petitboot.patch
index 61d4979d694e271bb4a5390488513c0f7fae99d4..181fc9f29e5db8894f11ef29fcaa246a87ec7b0d 100644 (file)
--- a/utils/ps3-kboot-0.1-petitboot.patch
+++ b/utils/ps3-kboot-0.1-petitboot.patch
@@ -7,12 +7,13 @@ More info at http://ozlabs.org/~jk/projects/petitboot/
 
 --- ps3-kboot.orig/ps3-kboot-0.1/Makefile      2007-04-05 20:10:44.000000000 +1000
 +++ ps3-kboot/ps3-kboot-0.1/Makefile   2007-04-04 20:54:40.000000000 +1000
 
 --- ps3-kboot.orig/ps3-kboot-0.1/Makefile      2007-04-05 20:10:44.000000000 +1000
 +++ ps3-kboot/ps3-kboot-0.1/Makefile   2007-04-04 20:54:40.000000000 +1000

-@@ -20,6 +20,8 @@
+@@ -20,6 +20,9 @@

  LOCAL_KERNEL_CONFIG=$(PWD)/config/kernel-config
  LOCAL_KBOOT_CONF=$(PWD)/config/kboot.conf
  LOCAL_FSTAB=$(PWD)/config/fstab
 +LOCAL_UDEV_RULES=$(PWD)/config/65-persistent-storage.rules \
  LOCAL_KERNEL_CONFIG=$(PWD)/config/kernel-config
  LOCAL_KBOOT_CONF=$(PWD)/config/kboot.conf
  LOCAL_FSTAB=$(PWD)/config/fstab
 +LOCAL_UDEV_RULES=$(PWD)/config/65-persistent-storage.rules \

-+               $(PWD)/config/99-petitboot.rules
++               $(PWD)/config/99-petitboot.rules \
++              $(PWD)/config/20-input-names.rules

  KBOOT_MESSAGE=$(PWD)/config/message
  KBOOT_FEATURES=$(PWD)/config/kboot-features
  
  KBOOT_MESSAGE=$(PWD)/config/message
  KBOOT_FEATURES=$(PWD)/config/kboot-features
  


@@ -50,7 +51,7 @@ More info at http://ozlabs.org/~jk/projects/petitboot/
 +      find root/ -name '*.a' -o -name '*.la' -exec rm {} \;
        mkdir -p root/etc root/tmp root/proc root/dev root/sys
        mkdir -p root/mnt/tmp root/mnt/root root/bin root/sbin
 +      find root/ -name '*.a' -o -name '*.la' -exec rm {} \;
        mkdir -p root/etc root/tmp root/proc root/dev root/sys
        mkdir -p root/mnt/tmp root/mnt/root root/bin root/sbin

-+      mkdir -p root/var/tmp
++      mkdir -p root/var/tmp/mnt

 +      mkdir -p root/etc/udev/rules.d
        [ -e root/dev/console ] || mknod root/dev/console c 5 1
        [ -e root/dev/null ] || mknod root/dev/null c 1 3
 +      mkdir -p root/etc/udev/rules.d
        [ -e root/dev/console ] || mknod root/dev/console c 5 1
        [ -e root/dev/null ] || mknod root/dev/null c 1 3


@@ -104,7 +105,7 @@ More info at http://ozlabs.org/~jk/projects/petitboot/
 +$(TWIN_DIR)/.twin-configured: \
 +        $(TWIN_DIR)/.twin-extracted
 +      ( cd $(TWIN_DIR) && \
 +$(TWIN_DIR)/.twin-configured: \
 +        $(TWIN_DIR)/.twin-extracted
 +      ( cd $(TWIN_DIR) && \

-+        ./configure --prefix=/ $(GNU_ARCH); )
++        ./configure --prefix=/ --disable-x11 $(GNU_ARCH); )

 +      touch $@
 +
 +$(TWIN_DIR)/.twin-built: \
 +      touch $@
 +
 +$(TWIN_DIR)/.twin-built: \


@@ -283,7 +284,7 @@ diff -urN ps3-kboot.orig/ps3-kboot-0.1/scripts/petitboot-init ps3-kboot/ps3-kboo
 +      /sbin/petitboot -u
 +
 +      # clean up after petitboot
 +      /sbin/petitboot -u
 +
 +      # clean up after petitboot

-+      for dir in /var/tmp/mnt-*;
++      for dir in /var/tmp/mnt/*;

 +      do
 +              umount "$dir"
 +              rmdir "$dir"
 +      do
 +              umount "$dir"
 +              rmdir "$dir"


@@ -299,9 +300,44 @@ diff -urN ps3-kboot.orig/ps3-kboot-0.1/scripts/petitboot-init ps3-kboot/ps3-kboo
 @@ -2,7 +2,7 @@
  Section: base
  Priority: optional
 @@ -2,7 +2,7 @@
  Section: base
  Priority: optional

- Maintainer: Ben Collins <bcollins@ubuntu.com>
--Build-Depends: debhelper (>= 4.1.67), bzip2, cdbs, fakeroot, udev, ps3pf-utils, libc6-dev-ppc64, lib64z1-dev
-+Build-Depends: debhelper (>= 4.1.67), bzip2, cdbs, fakeroot, udev, ps3pf-utils, libc6-dev-ppc64, lib64z1-dev, libpng12-dev, libjpeg62-dev, pkg-config
+ Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
+-Build-Depends: debhelper (>= 4.1.67), bzip2, cdbs, fakeroot, udev, ps3pf-utils, zlib1g-dev
++Build-Depends: debhelper (>= 4.1.67), bzip2, cdbs, fakeroot, udev, ps3pf-utils, libc6-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, pkg-config

  Standards-Version: 3.6.1
  
  Package: ps3-kboot
  Standards-Version: 3.6.1
  
  Package: ps3-kboot

+--- ps3-kboot.orig/ps3-kboot-0.1/config/kernel-config  2007-06-27 14:25:08.000000000 +1000
++++ ps3-kboot/ps3-kboot-0.1/config/kernel-config 7-06-27 14:28:28.000000000 +1000
+@@ -449,10 +449,13 @@
+ #
+ # Userland interfaces
+ #
+-# CONFIG_INPUT_MOUSEDEV is not set
+-# CONFIG_INPUT_JOYDEV is not set
++CONFIG_INPUT_MOUSEDEV=y
++# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++CONFIG_INPUT_JOYDEV=y
+ # CONFIG_INPUT_TSDEV is not set
+-# CONFIG_INPUT_EVDEV is not set
++CONFIG_INPUT_EVDEV=y
+ # CONFIG_INPUT_EVBUG is not set
+ 
+ #
+@@ -668,6 +671,7 @@
+ # CONFIG_USB_STORAGE_SDDR55 is not set
+ # CONFIG_USB_STORAGE_JUMPSHOT is not set
+ # CONFIG_USB_STORAGE_ALAUDA is not set
++# CONFIG_USB_STORAGE_ONETOUCH is not set
+ # CONFIG_USB_LIBUSUAL is not set
+ 
+ #
+--- /dev/null   2007-04-18 20:56:03.000000000 +1000
++++ ps3-kboot-0.1/ps3-kboot-0.1/config/20-input-names.rules   2007-06-27 14:34:05.000000000 +1000
+@@ -0,0 +1,5 @@
++# Input devices, group under /dev/input
++KERNEL=="event[0-9]*",                 NAME="input/%k"
++KERNEL=="mice",                                NAME="input/%k"
++KERNEL=="mouse[0-9]*",                 NAME="input/%k"
++KERNEL=="js[0-9]*",                    NAME="input/%k"