--- ps3-kboot-1.6.orig/debian/copyright +++ ps3-kboot-1.6/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Dan Munckton +Tue Apr 8 23:03:23 BST 2008. + +It was downloaded from: + +http://www.kernel.org/pub/linux/kernel/people/geoff/cell/CELL-Linux-CL_20080201-ADDON/src/kboot-20080130.tar.gz + +KBoot is an agregate of multiple packages. These packages are copyrighted +by their respective authors. + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- ps3-kboot-1.6.orig/debian/changelog +++ ps3-kboot-1.6/debian/changelog @@ -0,0 +1,121 @@ +ps3-kboot (1.6-4) precise; urgency=low + + * Fix use of dpkg-buildflags so that CPPFLAGS is actually set properly. + * Remove '-fstack-protector --param=ssp-buffer-size=4 + -Werror=format-security' from CFLAGS and CXXFLAGS; the first two don't + work with the elderly gcc used here, and the last causes a failure + somewhere in binutils. Life's too short. + * Change Section to admin to match overrides. + + -- Colin Watson Sat, 14 Apr 2012 18:38:27 +0100 + +ps3-kboot (1.6-3) precise; urgency=low + + * Backport build fixes from Linux upstream: + - Convert ps3.dts to dts-v1 format. + - Fix bootwrapper builds with newer gcc versions. + * Fix gcc build: pass mode to open() when using O_CREAT. + * Backport build fixes from kexec-tools upstream: + - Make configure.ac compatible with autoconf >= 2.64. + - Pass --no-undefined as a linker option. + * Build with -U_FORTIFY_SOURCE. The defaults are too painful with code + this old, and realistically it doesn't look likely to be on anyone's + security boundary. + + -- Colin Watson Wed, 11 Apr 2012 00:31:07 +0100 + +ps3-kboot (1.6-2build1) karmic; urgency=low + + * No-change rebuild to gain FORTIFY defaults. + + -- Kees Cook Wed, 24 Jun 2009 16:54:41 -0700 + +ps3-kboot (1.6-2) hardy; urgency=low + + * 01-disable-cross-compile.patch: Unexport LDFLAGS in kboot-11/Makefile; + it got exported when running within dpkg-buildpackage, but the setting + here was not intended to be exported. + + -- Colin Watson Tue, 15 Apr 2008 00:48:57 +0100 + +ps3-kboot (1.6-1) hardy; urgency=low + + * New upstream version. Updated to kboot-20080130 from PS3 Linux + Distributor's Starter Kit v1.6. + + -- Dan Munckton Fri, 04 Apr 2008 22:37:50 +0100 + +ps3-kboot (0.1-11) hardy; urgency=low + + * Adjust debian/rules to avoid calling fakeroot within fakeroot. + + -- Colin Watson Thu, 17 Jan 2008 11:14:15 +0000 + +ps3-kboot (0.1-10) hardy; urgency=low + + * Fix paths to ps3-flash-util and ps3-boot-game-os. + + -- Colin Watson Thu, 17 Jan 2008 09:18:03 +0000 + +ps3-kboot (0.1-9) hardy; urgency=low + + * Update for flash utility changes in ps3pf-utils 2.0-1. + + -- Colin Watson Wed, 16 Jan 2008 22:00:57 +0000 + +ps3-kboot (0.1-8) hardy; urgency=low + + * Makefile: install udevd and udevadm, rather than the other two things + * scripts/kboot: run udevadm with trigger and settle arguments + + -- Scott James Remnant Fri, 14 Dec 2007 16:44:10 +0000 + +ps3-kboot (0.1-7) feisty; urgency=low + + * Add zlib1g-dev to build-deps. Fixes FTBFS. + + -- Ben Collins Wed, 11 Apr 2007 12:37:09 +0000 + +ps3-kboot (0.1-6) feisty; urgency=low + + * Add fix for no boot param crash in kexec. + * Add patch from David Woodhouse to build kexec as 32-bit. + * Remove 64-bit build-deps. + + -- Ben Collins Mon, 9 Apr 2007 15:35:49 +0000 + +ps3-kboot (0.1-5) feisty; urgency=low + + * Fix round and round build. + * Provide boot-loader + + -- Ben Collins Thu, 22 Mar 2007 22:41:45 +0000 + +ps3-kboot (0.1-4) feisty; urgency=low + + * Set NO_PKG_MANGLE to keep dbgsym stuff from corrupting otheros.bld. + + -- Ben Collins Wed, 21 Mar 2007 23:43:02 +0000 + +ps3-kboot (0.1-3) feisty; urgency=low + + * Rework build to see if we can ensure probably deps in the make process. + * Did some checks to see if linux32 builds cause the bad otheros.bld + currently in the archive. Found nothing, but maybe a rebuild will fix it. + + -- Ben Collins Thu, 15 Mar 2007 03:28:42 +0000 + +ps3-kboot (0.1-2) feisty; urgency=low + + * Depend on ps3pf-utils + * Build-Depend on libc6-dev-ppc64 and lib64z-dev + * Better default message file, letting the user know it didn't find a usable + rootfs. + + -- Ben Collins Fri, 2 Mar 2007 21:58:54 +0000 + +ps3-kboot (0.1-1) feisty; urgency=low + + * Initial Release + + -- Ben Collins Thu, 1 Mar 2007 21:05:49 +0000 --- ps3-kboot-1.6.orig/debian/control +++ ps3-kboot-1.6/debian/control @@ -0,0 +1,17 @@ +Source: ps3-kboot +Section: admin +Priority: optional +Maintainer: Ubuntu PS3 Port Team +Build-Depends: dpkg-dev (>= 1.16.1.1~), debhelper (>= 4.1.67), bzip2, cdbs, fakeroot, udev, ps3pf-utils (>= 2.0-1), zlib1g-dev, device-tree-compiler, autoconf, automake, libtool, gcc-multilib +Standards-Version: 3.7.3 + +Package: ps3-kboot +Architecture: powerpc +Depends: ps3pf-utils (>= 2.0-1) +Provides: boot-loader +Description: This package provides the PS3 first stage boot loader + The Playstations 3 requires a special first stage bootloader, AKA + otherosfs.bld. It's based on kboot. Normally, you do not need to install + this package on an already installed system. + . + This package provides one file, /boot/otheros.bld. --- ps3-kboot-1.6.orig/debian/TODO +++ ps3-kboot-1.6/debian/TODO @@ -0,0 +1,4 @@ +Get patches into kexec package so we can use that pre-built binary. + +Get mailine kernel usable for kboot so we can use that source tree instead +of the 2.6.16 tree. --- ps3-kboot-1.6.orig/debian/ps3-kboot.postinst +++ ps3-kboot-1.6/debian/ps3-kboot.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "configure" ]; then + echo -n "Updating flash with ps3-kboot bootloader..." + # Prints results + ps3-flash-util /boot/otheros.bld +fi --- ps3-kboot-1.6.orig/debian/rules +++ ps3-kboot-1.6/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +# _FORTIFY_SOURCE is too painful with code this old. +DEB_CPPFLAGS_MAINT_STRIP := -D_FORTIFY_SOURCE=2 +DEB_CPPFLAGS_MAINT_APPEND := -U_FORTIFY_SOURCE + +# We build with an ancient compiler which doesn't understand some of the +# default flags nowadays. +DEB_CFLAGS_MAINT_STRIP := \ + -fstack-protector --param=ssp-buffer-size=4 -Werror=format-security +DEB_CXXFLAGS_MAINT_STRIP := \ + -fstack-protector --param=ssp-buffer-size=4 -Werror=format-security + +DPKG_EXPORT_BUILDFLAGS := 1 +include /usr/share/dpkg/buildflags.mk + +export NO_PKG_MANGLE=true + + +# We build an initrd during the build process, so this is run (indirectly) +# from binary-arch rather than build-arch in order that it will run as root. +kboot-11/otheros.bld: + $(MAKE) + +install/ps3-kboot:: kboot-11/otheros.bld + install -m644 -D kboot-11/otheros.bld debian/ps3-kboot/boot/otheros.bld + +clean:: + $(MAKE) -C kboot-11 clean --- ps3-kboot-1.6.orig/debian/compat +++ ps3-kboot-1.6/debian/compat @@ -0,0 +1 @@ +4 --- ps3-kboot-1.6.orig/debian/patches/05-bootwrapper-gcc-4.4.patch +++ ps3-kboot-1.6/debian/patches/05-bootwrapper-gcc-4.4.patch @@ -0,0 +1,269 @@ +Description: Fix bootwrapper builds with newer gcc versions + GCC 4.4.x looks to be adding support for generating out-of-line register + saves/restores based on: + . + http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html + . + This breaks the bootwrapper as we'd need to link with libgcc to get the + implementation of the register save/restores. + . + To workaround this issue, we just stole the save/restore code from gcc and + simplified it down for our needs (integer only). +Author: Kumar Gala +Origin: backport, http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=143580ecfb7999147e546cc3814023e233e95fa5 +Forwarded: not-needed +Last-Update: 2012-04-10 + +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/patches/linux/2.6.24/bootwrapper-gcc-4.4.patch ps3-kboot-1.6.new/kboot-11/patches/linux/2.6.24/bootwrapper-gcc-4.4.patch +--- ps3-kboot-1.6/kboot-11/patches/linux/2.6.24/bootwrapper-gcc-4.4.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/linux/2.6.24/bootwrapper-gcc-4.4.patch 2012-04-10 22:46:57.000000000 +0100 +@@ -0,0 +1,249 @@ ++diff -Nru linux-2.6.24.orig/arch/powerpc/boot/Makefile linux-2.6.24/arch/powerpc/boot/Makefile ++--- linux-2.6.24.orig/arch/powerpc/boot/Makefile 2012-04-10 22:44:12.000000000 +0100 +++++ linux-2.6.24/arch/powerpc/boot/Makefile 2012-04-10 22:45:43.000000000 +0100 ++@@ -46,7 +46,7 @@ ++ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ ++ $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) ++ ++-src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \ +++src-wlib := string.S crt0.S crtsavres.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \ ++ ns16550.c serial.c simple_alloc.c div64.S util.S \ ++ gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ ++ 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ ++diff -Nru linux-2.6.24.orig/arch/powerpc/boot/crtsavres.S linux-2.6.24/arch/powerpc/boot/crtsavres.S ++--- linux-2.6.24.orig/arch/powerpc/boot/crtsavres.S 1970-01-01 01:00:00.000000000 +0100 +++++ linux-2.6.24/arch/powerpc/boot/crtsavres.S 2012-04-10 22:45:28.000000000 +0100 ++@@ -0,0 +1,233 @@ +++/* +++ * Special support for eabi and SVR4 +++ * +++ * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. +++ * Copyright 2008 Freescale Semiconductor, Inc. +++ * Written By Michael Meissner +++ * +++ * Based on gcc/config/rs6000/crtsavres.asm from gcc +++ * +++ * This file is free software; you can redistribute it and/or modify it +++ * under the terms of the GNU General Public License as published by the +++ * Free Software Foundation; either version 2, or (at your option) any +++ * later version. +++ * +++ * In addition to the permissions in the GNU General Public License, the +++ * Free Software Foundation gives you unlimited permission to link the +++ * compiled version of this file with other programs, and to distribute +++ * those programs without any restriction coming from the use of this +++ * file. (The General Public License restrictions do apply in other +++ * respects; for example, they cover modification of the file, and +++ * distribution when not linked into another program.) +++ * +++ * This file 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 +++ * General Public License for more details. +++ * +++ * You should have received a copy of the GNU General Public License +++ * along with this program; see the file COPYING. If not, write to +++ * the Free Software Foundation, 51 Franklin Street, Fifth Floor, +++ * Boston, MA 02110-1301, USA. +++ * +++ * As a special exception, if you link this library with files +++ * compiled with GCC to produce an executable, this does not cause +++ * the resulting executable to be covered by the GNU General Public License. +++ * This exception does not however invalidate any other reasons why +++ * the executable file might be covered by the GNU General Public License. +++ */ +++ +++ .file "crtsavres.S" +++ .section ".text" +++ +++/* On PowerPC64 Linux, these functions are provided by the linker. */ +++#ifndef __powerpc64__ +++ +++#define _GLOBAL(name) \ +++ .type name,@function; \ +++ .globl name; \ +++name: +++ +++/* Routines for saving integer registers, called by the compiler. */ +++/* Called with r11 pointing to the stack header word of the caller of the */ +++/* function, just beyond the end of the integer save area. */ +++ +++_GLOBAL(_savegpr_14) +++_GLOBAL(_save32gpr_14) +++ stw 14,-72(11) /* save gp registers */ +++_GLOBAL(_savegpr_15) +++_GLOBAL(_save32gpr_15) +++ stw 15,-68(11) +++_GLOBAL(_savegpr_16) +++_GLOBAL(_save32gpr_16) +++ stw 16,-64(11) +++_GLOBAL(_savegpr_17) +++_GLOBAL(_save32gpr_17) +++ stw 17,-60(11) +++_GLOBAL(_savegpr_18) +++_GLOBAL(_save32gpr_18) +++ stw 18,-56(11) +++_GLOBAL(_savegpr_19) +++_GLOBAL(_save32gpr_19) +++ stw 19,-52(11) +++_GLOBAL(_savegpr_20) +++_GLOBAL(_save32gpr_20) +++ stw 20,-48(11) +++_GLOBAL(_savegpr_21) +++_GLOBAL(_save32gpr_21) +++ stw 21,-44(11) +++_GLOBAL(_savegpr_22) +++_GLOBAL(_save32gpr_22) +++ stw 22,-40(11) +++_GLOBAL(_savegpr_23) +++_GLOBAL(_save32gpr_23) +++ stw 23,-36(11) +++_GLOBAL(_savegpr_24) +++_GLOBAL(_save32gpr_24) +++ stw 24,-32(11) +++_GLOBAL(_savegpr_25) +++_GLOBAL(_save32gpr_25) +++ stw 25,-28(11) +++_GLOBAL(_savegpr_26) +++_GLOBAL(_save32gpr_26) +++ stw 26,-24(11) +++_GLOBAL(_savegpr_27) +++_GLOBAL(_save32gpr_27) +++ stw 27,-20(11) +++_GLOBAL(_savegpr_28) +++_GLOBAL(_save32gpr_28) +++ stw 28,-16(11) +++_GLOBAL(_savegpr_29) +++_GLOBAL(_save32gpr_29) +++ stw 29,-12(11) +++_GLOBAL(_savegpr_30) +++_GLOBAL(_save32gpr_30) +++ stw 30,-8(11) +++_GLOBAL(_savegpr_31) +++_GLOBAL(_save32gpr_31) +++ stw 31,-4(11) +++ blr +++ +++/* Routines for restoring integer registers, called by the compiler. */ +++/* Called with r11 pointing to the stack header word of the caller of the */ +++/* function, just beyond the end of the integer restore area. */ +++ +++_GLOBAL(_restgpr_14) +++_GLOBAL(_rest32gpr_14) +++ lwz 14,-72(11) /* restore gp registers */ +++_GLOBAL(_restgpr_15) +++_GLOBAL(_rest32gpr_15) +++ lwz 15,-68(11) +++_GLOBAL(_restgpr_16) +++_GLOBAL(_rest32gpr_16) +++ lwz 16,-64(11) +++_GLOBAL(_restgpr_17) +++_GLOBAL(_rest32gpr_17) +++ lwz 17,-60(11) +++_GLOBAL(_restgpr_18) +++_GLOBAL(_rest32gpr_18) +++ lwz 18,-56(11) +++_GLOBAL(_restgpr_19) +++_GLOBAL(_rest32gpr_19) +++ lwz 19,-52(11) +++_GLOBAL(_restgpr_20) +++_GLOBAL(_rest32gpr_20) +++ lwz 20,-48(11) +++_GLOBAL(_restgpr_21) +++_GLOBAL(_rest32gpr_21) +++ lwz 21,-44(11) +++_GLOBAL(_restgpr_22) +++_GLOBAL(_rest32gpr_22) +++ lwz 22,-40(11) +++_GLOBAL(_restgpr_23) +++_GLOBAL(_rest32gpr_23) +++ lwz 23,-36(11) +++_GLOBAL(_restgpr_24) +++_GLOBAL(_rest32gpr_24) +++ lwz 24,-32(11) +++_GLOBAL(_restgpr_25) +++_GLOBAL(_rest32gpr_25) +++ lwz 25,-28(11) +++_GLOBAL(_restgpr_26) +++_GLOBAL(_rest32gpr_26) +++ lwz 26,-24(11) +++_GLOBAL(_restgpr_27) +++_GLOBAL(_rest32gpr_27) +++ lwz 27,-20(11) +++_GLOBAL(_restgpr_28) +++_GLOBAL(_rest32gpr_28) +++ lwz 28,-16(11) +++_GLOBAL(_restgpr_29) +++_GLOBAL(_rest32gpr_29) +++ lwz 29,-12(11) +++_GLOBAL(_restgpr_30) +++_GLOBAL(_rest32gpr_30) +++ lwz 30,-8(11) +++_GLOBAL(_restgpr_31) +++_GLOBAL(_rest32gpr_31) +++ lwz 31,-4(11) +++ blr +++ +++/* Routines for restoring integer registers, called by the compiler. */ +++/* Called with r11 pointing to the stack header word of the caller of the */ +++/* function, just beyond the end of the integer restore area. */ +++ +++_GLOBAL(_restgpr_14_x) +++_GLOBAL(_rest32gpr_14_x) +++ lwz 14,-72(11) /* restore gp registers */ +++_GLOBAL(_restgpr_15_x) +++_GLOBAL(_rest32gpr_15_x) +++ lwz 15,-68(11) +++_GLOBAL(_restgpr_16_x) +++_GLOBAL(_rest32gpr_16_x) +++ lwz 16,-64(11) +++_GLOBAL(_restgpr_17_x) +++_GLOBAL(_rest32gpr_17_x) +++ lwz 17,-60(11) +++_GLOBAL(_restgpr_18_x) +++_GLOBAL(_rest32gpr_18_x) +++ lwz 18,-56(11) +++_GLOBAL(_restgpr_19_x) +++_GLOBAL(_rest32gpr_19_x) +++ lwz 19,-52(11) +++_GLOBAL(_restgpr_20_x) +++_GLOBAL(_rest32gpr_20_x) +++ lwz 20,-48(11) +++_GLOBAL(_restgpr_21_x) +++_GLOBAL(_rest32gpr_21_x) +++ lwz 21,-44(11) +++_GLOBAL(_restgpr_22_x) +++_GLOBAL(_rest32gpr_22_x) +++ lwz 22,-40(11) +++_GLOBAL(_restgpr_23_x) +++_GLOBAL(_rest32gpr_23_x) +++ lwz 23,-36(11) +++_GLOBAL(_restgpr_24_x) +++_GLOBAL(_rest32gpr_24_x) +++ lwz 24,-32(11) +++_GLOBAL(_restgpr_25_x) +++_GLOBAL(_rest32gpr_25_x) +++ lwz 25,-28(11) +++_GLOBAL(_restgpr_26_x) +++_GLOBAL(_rest32gpr_26_x) +++ lwz 26,-24(11) +++_GLOBAL(_restgpr_27_x) +++_GLOBAL(_rest32gpr_27_x) +++ lwz 27,-20(11) +++_GLOBAL(_restgpr_28_x) +++_GLOBAL(_rest32gpr_28_x) +++ lwz 28,-16(11) +++_GLOBAL(_restgpr_29_x) +++_GLOBAL(_rest32gpr_29_x) +++ lwz 29,-12(11) +++_GLOBAL(_restgpr_30_x) +++_GLOBAL(_rest32gpr_30_x) +++ lwz 30,-8(11) +++_GLOBAL(_restgpr_31_x) +++_GLOBAL(_rest32gpr_31_x) +++ lwz 0,4(11) +++ lwz 31,-4(11) +++ mtlr 0 +++ mr 1,11 +++ blr +++#endif --- ps3-kboot-1.6.orig/debian/patches/08-kexec-tools-no-undefined.patch +++ ps3-kboot-1.6/debian/patches/08-kexec-tools-no-undefined.patch @@ -0,0 +1,25 @@ +Description: Pass --no-undefined as a linker option + gcc-4.6 does not accept --no-undefined as a compiler option. +Author: Simon Horman +Origin: backport, http://git.kernel.org/?p=utils/kernel/kexec/kexec-tools.git;a=commitdiff;h=8880e5b8a295788dcae8f5cc038de92cd97b6807 +Forwarded: not-needed +Last-Update: 2012-04-11 + +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/patches/kexec/1.101/ubuntu/no-undefined.patch ps3-kboot-1.6.new/kboot-11/patches/kexec/1.101/ubuntu/no-undefined.patch +--- ps3-kboot-1.6/kboot-11/patches/kexec/1.101/ubuntu/no-undefined.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/kexec/1.101/ubuntu/no-undefined.patch 2012-04-11 00:18:34.000000000 +0100 +@@ -0,0 +1,14 @@ ++diff -ru kexec-tools-1.101.orig/purgatory/Makefile kexec-tools-1.101/purgatory/Makefile ++--- kexec-tools-1.101.orig/purgatory/Makefile 2008-01-30 07:48:07.000000000 +0000 +++++ kexec-tools-1.101/purgatory/Makefile 2012-04-11 00:18:12.000000000 +0100 ++@@ -37,8 +37,8 @@ ++ $(PURGATORY): CPPFLAGS+=-I$(srcdir)/purgatory/include \ ++ -I$(srcdir)/purgatory/arch/$(ARCH)/include \ ++ -I$(shell $(CC) -print-file-name=include) ++-$(PURGATORY): LDFLAGS+=--no-undefined -nostartfiles -nostdlib -nodefaultlibs \ ++- -e purgatory_start -r +++$(PURGATORY): LDFLAGS+=-Wl,--no-undefined -nostartfiles -nostdlib \ +++ -nodefaultlibs -e purgatory_start -r ++ ++ $(PURGATORY): $(PURGATORY_OBJS) ++ $(MKDIR) -p $(@D) --- ps3-kboot-1.6.orig/debian/patches/03-configure-kboot-build.patch +++ ps3-kboot-1.6/debian/patches/03-configure-kboot-build.patch @@ -0,0 +1,93 @@ +diff -Nur ps3-kboot-1.6/kboot-11/answers ps3-kboot-1.6.new/kboot-11/answers +--- ps3-kboot-1.6/kboot-11/answers 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/answers 2008-04-07 21:44:25.000000000 +0100 +@@ -0,0 +1,5 @@ ++# MACHINE-GENERATED - TRY NOT TO EDIT ! ++ ++copy_fstab=false ++booted_config=true ++inetworking=false +diff -Nur ps3-kboot-1.6/kboot-11/config/answers ps3-kboot-1.6.new/kboot-11/config/answers +--- ps3-kboot-1.6/kboot-11/config/answers 2006-03-30 10:57:25.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/config/answers 2008-04-07 21:44:44.000000000 +0100 +@@ -2,16 +2,4 @@ + + copy_fstab=false + booted_config=true +-inetworking=true +-use_dhcp=true +-static_ip=true +-ipv4_addr="192.168.0.10" +-ipv4_netmask="255.255.255.0" +-ipv4_default="" +-ipv4_nameserver="" +-dns_domain="" +-ssh_client=false +-ssh_server=false +-ssh_update_keys=false +-ssh_generate_keys=false +-nfs_client=true ++inetworking=false +diff -Nur ps3-kboot-1.6/kboot-11/config/fstab ps3-kboot-1.6.new/kboot-11/config/fstab +--- ps3-kboot-1.6/kboot-11/config/fstab 2007-03-09 04:46:15.000000000 +0000 ++++ ps3-kboot-1.6.new/kboot-11/config/fstab 2008-04-07 21:40:55.000000000 +0100 +@@ -1 +1,6 @@ + # for kernel and initrd ++LABEL=/ / auto defaults 1 1 ++# ++LABEL=BOOTMC / auto defaults 0 0 ++# ++/dev/sr0 / auto ro 0 0 +diff -Nur ps3-kboot-1.6/kboot-11/config/message ps3-kboot-1.6.new/kboot-11/config/message +--- ps3-kboot-1.6/kboot-11/config/message 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/config/message 2008-04-07 21:41:50.000000000 +0100 +@@ -0,0 +1,15 @@ ++Ubuntu PS3 KBoot Loader. ++ ++No default root fs was found, or one was found and it didn't contains a ++message= config file. ++ ++If no rootfs was found, you can enter the shell here with 'sh'. Exiting ++will return you to this prompt. In the shell you can mount your rootfs as ++/mnt/root/. ++ ++Reasons this may have happened include: ++ ++ - No drive with a rootfs was actually found. ++ - Your rootfs does not have the correct volume label of "/" ++ - Your rootfs is corrupt (use the rescue CD to fix this). ++ +diff -Nur ps3-kboot-1.6/kboot-11/root/etc/fstab ps3-kboot-1.6.new/kboot-11/root/etc/fstab +--- ps3-kboot-1.6/kboot-11/root/etc/fstab 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/root/etc/fstab 2008-04-07 21:43:17.000000000 +0100 +@@ -0,0 +1,6 @@ ++# for kernel and initrd ++LABEL=/ / auto defaults 1 1 ++# ++LABEL=BOOTMC / auto defaults 0 0 ++# ++/dev/sr0 / auto ro 0 0 +diff -Nur ps3-kboot-1.6/kboot-11/root/etc/kboot-features ps3-kboot-1.6.new/kboot-11/root/etc/kboot-features +--- ps3-kboot-1.6/kboot-11/root/etc/kboot-features 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/root/etc/kboot-features 2008-04-07 21:43:35.000000000 +0100 +@@ -0,0 +1,3 @@ ++__booted_config=true ++__inetworking=false ++root=fe01 +diff -Nur ps3-kboot-1.6/kboot-11/root-meta/cache/features ps3-kboot-1.6.new/kboot-11/root-meta/cache/features +--- ps3-kboot-1.6/kboot-11/root-meta/cache/features 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/root-meta/cache/features 2008-04-07 21:42:23.000000000 +0100 +@@ -0,0 +1,3 @@ ++__booted_config=true ++__inetworking=false ++root=fe01 +diff -Nur ps3-kboot-1.6/kboot-11/root-meta/cache/fstab ps3-kboot-1.6.new/kboot-11/root-meta/cache/fstab +--- ps3-kboot-1.6/kboot-11/root-meta/cache/fstab 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/root-meta/cache/fstab 2008-04-07 21:43:17.000000000 +0100 +@@ -0,0 +1,6 @@ ++# for kernel and initrd ++LABEL=/ / auto defaults 1 1 ++# ++LABEL=BOOTMC / auto defaults 0 0 ++# ++/dev/sr0 / auto ro 0 0 --- ps3-kboot-1.6.orig/debian/patches/04-dtc-v1.patch +++ ps3-kboot-1.6/debian/patches/04-dtc-v1.patch @@ -0,0 +1,52 @@ +Description: Convert ps3.dts to dts-v1 format +Author: David Gibson +Origin: backport, http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=71f349799b34c8b6ce3df42126b4de6cfa16456d +Forwarded: not-needed +Last-Update: 2012-04-10 + +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/patches/linux/2.6.24/dtc-v1.patch ps3-kboot-1.6.new/kboot-11/patches/linux/2.6.24/dtc-v1.patch +--- ps3-kboot-1.6/kboot-11/patches/linux/2.6.24/dtc-v1.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/linux/2.6.24/dtc-v1.patch 2012-04-10 22:31:03.000000000 +0100 +@@ -0,0 +1,42 @@ ++diff -ru linux-2.6.24.orig/arch/powerpc/boot/dts/ps3.dts linux-2.6.24/arch/powerpc/boot/dts/ps3.dts ++--- linux-2.6.24.orig/arch/powerpc/boot/dts/ps3.dts 2008-01-24 22:58:37.000000000 +0000 +++++ linux-2.6.24/arch/powerpc/boot/dts/ps3.dts 2012-04-10 22:30:27.000000000 +0100 ++@@ -18,6 +18,8 @@ ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ +++/dts-v1/; +++ ++ / { ++ model = "SonyPS3"; ++ compatible = "sony,ps3"; ++@@ -34,7 +36,7 @@ ++ ++ memory { ++ device_type = "memory"; ++- reg = <0 0 0 0>; +++ reg = <0x00000000 0x00000000 0x00000000 0x00000000>; ++ }; ++ ++ /* ++@@ -55,14 +57,14 @@ ++ ++ cpu@0 { ++ device_type = "cpu"; ++- reg = <0>; ++- ibm,ppc-interrupt-server#s = <0 1>; +++ reg = <0x00000000>; +++ ibm,ppc-interrupt-server#s = <0x0 0x1>; ++ clock-frequency = <0>; ++ timebase-frequency = <0>; ++- i-cache-size = <8000>; ++- d-cache-size = <8000>; ++- i-cache-line-size = <80>; ++- d-cache-line-size = <80>; +++ i-cache-size = <32768>; +++ d-cache-size = <32768>; +++ i-cache-line-size = <128>; +++ d-cache-line-size = <128>; ++ }; ++ }; ++ }; --- ps3-kboot-1.6.orig/debian/patches/07-kexec-tools-autoconf.patch +++ ps3-kboot-1.6/debian/patches/07-kexec-tools-autoconf.patch @@ -0,0 +1,70 @@ +Description: Fix a problem caused by autoconf 2.64 which redefined AC_MSG_ERROR + autoconf 2.64 redefined AC_MSG_ERROR and now a ";" is required at the end + of AC_MSG_ERROR macro invocation in configure.ac. Absence of this ";" + causes an "unexpected end of file" message when configure script generated + by autoconf is run. This patch adds the ";" in right places. +Author: Khalid Aziz +Origin: backport, http://git.kernel.org/?p=utils/kernel/kexec/kexec-tools.git;a=commitdiff;h=15302512abb2de7f253494d3ebaae7c68bcdca3c +Forwarded: not-needed +Last-Update: 2012-04-11 + +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/Makefile ps3-kboot-1.6.new/kboot-11/Makefile +--- ps3-kboot-1.6/kboot-11/Makefile 2012-04-10 23:53:08.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/Makefile 2012-04-10 23:58:47.000000000 +0100 +@@ -1622,6 +1622,9 @@ + # for i in `ls patches/kexec/$(KEXEC_TOOLS_VERSION)/*patch*` ; do \ + # patch -d $(KEXEC_TOOLS_DIR) -p1 < $$i ; \ + # done ++ for i in `ls patches/kexec/$(KEXEC_TOOLS_VERSION)/ubuntu/*patch*` ; do \ ++ patch -d $(KEXEC_TOOLS_DIR) -p1 < $$i ; \ ++ done + #ifneq ($(HOST_ARCH),$(KERNEL_ARCH)) + # for i in `ls patches/kexec/$(KEXEC_TOOLS_VERSION)/cross/*patch*` ; do \ + # patch -d $(KEXEC_TOOLS_DIR) -p1 < $$i ; \ +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/patches/kexec/1.101/ubuntu/autoconf.patch ps3-kboot-1.6.new/kboot-11/patches/kexec/1.101/ubuntu/autoconf.patch +--- ps3-kboot-1.6/kboot-11/patches/kexec/1.101/ubuntu/autoconf.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/kexec/1.101/ubuntu/autoconf.patch 2012-04-10 23:59:10.000000000 +0100 +@@ -0,0 +1,43 @@ ++diff -ru kexec-tools-1.101.orig/configure.ac kexec-tools-1.101/configure.ac ++--- kexec-tools-1.101.orig/configure.ac 2008-01-30 07:48:07.000000000 +0000 +++++ kexec-tools-1.101/configure.ac 2012-04-10 23:56:54.000000000 +0100 ++@@ -120,23 +120,23 @@ ++ fi ++ ++ dnl ---Sanity checks ++-if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]) fi ++-if test "$CPP" = "no"; then AC_MSG_ERROR([cpp not found]) fi ++-if test "$LD" = "no"; then AC_MSG_ERROR([ld not found]) fi ++-if test "$AS" = "no"; then AC_MSG_ERROR([as not found]) fi ++-if test "$OBJCOPY" = "no"; then AC_MSG_ERROR([objcopy not found]) fi ++-if test "$AR" = "no"; then AC_MSG_ERROR([ar not found]) fi +++if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]); fi +++if test "$CPP" = "no"; then AC_MSG_ERROR([cpp not found]); fi +++if test "$LD" = "no"; then AC_MSG_ERROR([ld not found]); fi +++if test "$AS" = "no"; then AC_MSG_ERROR([as not found]); fi +++if test "$OBJCOPY" = "no"; then AC_MSG_ERROR([objcopy not found]); fi +++if test "$AR" = "no"; then AC_MSG_ERROR([ar not found]); fi ++ ++-if test "$MKDIR" = "no"; then AC_MSG_ERROR([ mkdir not found]) fi ++-if test "$RM" = "no"; then AC_MSG_ERROR([ rm not found]) fi ++-if test "$CP" = "no"; then AC_MSG_ERROR([ cp not found]) fi ++-if test "$LN" = "no"; then AC_MSG_ERROR([ ln not found]) fi ++-if test "$TAR" = "no"; then AC_MSG_ERROR([ tar not found]) fi ++-if test "$RPM" = "no"; then AC_MSG_ERROR([ rpm not found]) fi ++-if test "$SED" = "no"; then AC_MSG_ERROR([ sed not found]) fi ++-if test "$FIND" = "no"; then AC_MSG_ERROR([ find not found]) fi ++-if test "$XARGS" = "no"; then AC_MSG_ERROR([ xargs not found]) fi ++-if test "$DIRNAME" = "no"; then AC_MSG_ERROR([ dirname not found]) fi +++if test "$MKDIR" = "no"; then AC_MSG_ERROR([ mkdir not found]); fi +++if test "$RM" = "no"; then AC_MSG_ERROR([ rm not found]); fi +++if test "$CP" = "no"; then AC_MSG_ERROR([ cp not found]); fi +++if test "$LN" = "no"; then AC_MSG_ERROR([ ln not found]); fi +++if test "$TAR" = "no"; then AC_MSG_ERROR([ tar not found]); fi +++if test "$RPM" = "no"; then AC_MSG_ERROR([ rpm not found]); fi +++if test "$SED" = "no"; then AC_MSG_ERROR([ sed not found]); fi +++if test "$FIND" = "no"; then AC_MSG_ERROR([ find not found]); fi +++if test "$XARGS" = "no"; then AC_MSG_ERROR([ xargs not found]); fi +++if test "$DIRNAME" = "no"; then AC_MSG_ERROR([ dirname not found]); fi ++ ++ dnl ---Output variables... ++ AC_SUBST([BUILD_CC]) --- ps3-kboot-1.6.orig/debian/patches/02-fix-busybox-build-bashism.patch +++ ps3-kboot-1.6/debian/patches/02-fix-busybox-build-bashism.patch @@ -0,0 +1,15 @@ +diff -Nur ps3-kboot-1.6/kboot-11/patches/busybox/1.3.2/600-fix-trylink-bashism.patch ps3-kboot-1.6.new/kboot-11/patches/busybox/1.3.2/600-fix-trylink-bashism.patch +--- ps3-kboot-1.6/kboot-11/patches/busybox/1.3.2/600-fix-trylink-bashism.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/busybox/1.3.2/600-fix-trylink-bashism.patch 2008-04-07 21:24:38.000000000 +0100 +@@ -0,0 +1,11 @@ ++--- busybox-1.3.2/scripts/trylink 2007-01-20 20:16:45.000000000 +0000 +++++ busybox-1.3.2.new/scripts/trylink 2008-04-07 21:10:52.000000000 +0100 ++@@ -2,7 +2,7 @@ ++ ++ debug=false ++ ++-function try { +++try() { ++ added="$1" ++ shift ++ $debug && echo "Trying: $* $added" --- ps3-kboot-1.6.orig/debian/patches/06-gcc-collect2-open.patch +++ ps3-kboot-1.6/debian/patches/06-gcc-collect2-open.patch @@ -0,0 +1,21 @@ +Description: Pass mode to open() when using O_CREAT +Author: Colin Watson +Forwarded: not-needed +Last-Update: 2012-04-10 + +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/patches/gcc/3.4.6/collect2-open.patch ps3-kboot-1.6.new/kboot-11/patches/gcc/3.4.6/collect2-open.patch +--- ps3-kboot-1.6/kboot-11/patches/gcc/3.4.6/collect2-open.patch 1970-01-01 01:00:00.000000000 +0100 ++++ ps3-kboot-1.6.new/kboot-11/patches/gcc/3.4.6/collect2-open.patch 2012-04-10 23:06:17.000000000 +0100 +@@ -0,0 +1,12 @@ ++diff -ru gcc-3.4.6.orig/gcc/collect2.c gcc-3.4.6/gcc/collect2.c ++--- gcc-3.4.6.orig/gcc/collect2.c 2005-01-10 15:25:23.000000000 +0000 +++++ gcc-3.4.6/gcc/collect2.c 2012-04-10 23:05:51.000000000 +0100 ++@@ -1534,7 +1534,7 @@ ++ if (redir) ++ { ++ /* Open response file. */ ++- redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT); +++ redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, 0600); ++ ++ /* Duplicate the stdout and stderr file handles ++ so they can be restored later. */ --- ps3-kboot-1.6.orig/debian/patches/01-disable-cross-compile.patch +++ ps3-kboot-1.6/debian/patches/01-disable-cross-compile.patch @@ -0,0 +1,25 @@ +diff -Nur -x '*.orig' -x '*~' ps3-kboot-1.6/kboot-11/Makefile ps3-kboot-1.6.new/kboot-11/Makefile +--- ps3-kboot-1.6/kboot-11/Makefile 2008-01-25 09:20:05.000000000 +0000 ++++ ps3-kboot-1.6.new/kboot-11/Makefile 2008-04-15 00:34:32.000000000 +0100 +@@ -21,9 +21,10 @@ + TARGET_ARCH=powerpc + KERNEL_ARCH=powerpc64 + KEXEC_ARCH=ppc64 +-CROSS_TOOLCHAIN_PATH_PREFIX=/opt/ppc64-redhat-linux +-CROSS_ARCH_PREFIX=ppc64-redhat-linux- ++CROSS_TOOLCHAIN_PATH_PREFIX=/usr ++CROSS_ARCH_PREFIX= + LDFLAGS=-m elf32ppclinux ++unexport LDFLAGS + + # internal define + OPTIMIZE_FOR_CPU=$(TARGET_ARCH) +@@ -1604,7 +1605,7 @@ + $(root_meta_inst_uclibc) + rm -f $@ + mkdir -p root root-meta/installed +- cp $(PS3PF_UTILS_DIR)/{ps3-flash-util,ps3-boot-game-os} $(PWD)/root/sbin ++ cp $(PS3PF_UTILS_DIR)/ps3-flash-util $(PS3PF_UTILS_DIR)/ps3-boot-game-os $(PWD)/root/sbin + $(TARGET_CROSS)strip $(PWD)/root/sbin/ps3-flash-util + touch $@ + endif