lp:~noskcaj/ubuntu/trusty/elilo/merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/elilo

Michael Terry: Approve on 2014-01-14

Diff: 3477 lines (+1147/-1046)

53 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/apple.diff/Makefile (+1/-1)
.pc/apple.diff/elilo.c (+1/-1)
.pc/applied-patches (+0/-1)
.pc/debian-changes-3.12-3/Makefile (+0/-109)
.pc/debian-changes-3.12-3/choosers/Makefile (+0/-58)
.pc/debian-changes-3.12-3/devschemes/Makefile (+0/-46)
.pc/debian-changes-3.12-3/fs/Makefile (+0/-70)
.pc/debian-changes-3.12-3/ia32/Makefile (+0/-51)
.pc/debian-changes-3.12-3/ia64/Makefile (+0/-42)
.pc/debian-changes-3.12-3/tools/Makefile (+0/-47)
.pc/debian-changes-3.12-3/x86_64/Makefile (+0/-52)
.pc/fix-paths.diff/Make.defaults (+1/-1)
ChangeLog (+57/-0)
Makefile (+6/-11)
alloc.c (+15/-7)
bootparams.c (+2/-0)
choosers/Makefile (+10/-19)
choosers/simple.c (+7/-6)
choosers/textmenu.c (+3/-3)
config.c (+5/-5)
debian/changelog (+49/-3)
debian/control (+4/-2)
debian/elilo.sh (+1/-1)
debian/patches/cross-build.diff (+266/-0)
debian/patches/debian-changes-3.12-3 (+0/-284)
debian/patches/fix-paths.diff (+1/-1)
debian/patches/series (+1/-1)
debian/po/da.po (+86/-0)
debian/po/pl.po (+90/-0)
debian/rules (+5/-9)
devschemes/Makefile (+5/-10)
elilo.c (+1/-1)
elilo.h (+8/-2)
fileops.c (+1/-1)
fs/Makefile (+10/-19)
fs/localfs.c (+1/-1)
glue_netfs.c (+23/-0)
ia32/Makefile (+7/-12)
ia32/bzimage.c (+1/-1)
ia32/system.c (+19/-1)
ia64/Makefile (+4/-9)
ia64/system.c (+6/-0)
initrd.c (+10/-2)
strops.c (+6/-6)
tools/Makefile (+4/-9)
tools/eliloalt.c (+23/-12)
x86_64/Makefile (+7/-12)
x86_64/bzimage.c (+136/-32)
x86_64/config.c (+16/-3)
x86_64/sysdeps.h (+27/-36)
x86_64/system.c (+219/-46)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1175026: Please update elilo to a newer version

Undecided

Fix Released

Link a bug report

Related blueprints

20. By Jackson Doak on 2013-12-06

Merge from debian

19. By Colin Watson on 2011-08-22

* Resynchronise with Debian. Remaining changes:
  - Add nasty hacks for Apple systems - switch to text mode on startup,
    pass the framebuffer size to the system on boot, and automatically set
    legacy-free option on ia32 Apple systems.
    (needs-to-go-upstream)
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu.
    (ubuntu-only)
  - Add a modprobe call if efivars facility is not found.

18. By Colin Watson on 2009-12-08

* Resynchronise with Debian. Remaining changes:
  - Automatically set legacy-free option on ia32 Apple systems.
    (needs-to-go-upstream)
  - Add nasty hacks for Apple systems - switch to text mode on startup,
    and pass the framebuffer size to the system on boot.
    (needs-to-go-upstream)
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu.
    (ubuntu-only)
  - Add a modprobe call if efivars facility is not found.
* Drop lpia support, as lpia is being decommissioned.

17. By Colin Watson on 2009-10-07

Pass -nostdlib to the compiler as well, so that it knows not to use
stack protection.

16. By Bryce Harrington on 2008-06-19

* Merge from debian unstable, remaining changes:
  - Build package for architecture lpia.
  - Automatically set legacy-free option on ia32 Apple systems. (needs-to-go-upstream)
  - Add nasty hacks for Apple systems - switch to text mode on startup, and
    pass the framebuffer size to the system on boot. (needs-to-go-upstream)
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu. (ubuntu-only)
  - Add a modprobe call if efivars facility is not found.

15. By Fabio Massimo Di Nitto on 2007-12-24

* Merge from debian unstable, remaining changes:
  - Build package for architecture lpia.
  - Automatically set legacy-free option on ia32 Apple systems.
  - Add nasty hacks for Apple systems - switch to text mode on startup, and
    pass the framebuffer size to the system on boot.
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu.
  - Add a modprobe call if efivars facility is not found.

14. By Matthias Klose on 2007-12-05

* Merge with Debian, remaining changes:
  - Build package for architecture lpia.
  - elilo.sh: Set interpreter to /bin/bash, uses bashisms.
  - Automatically set legacy-free option on ia32 Apple systems.
  - Add nasty hacks for Apple systems - switch to text mode on startup, and
    pass the framebuffer size to the system on boot.
  - Build with -march=i386 on ia32 systems - appears to be needed for Apple
    hardware.
  - Perform some Ubuntu branding, put all files in /EFI/ubuntu.
  - Add a modprobe call if efivars facility is not found.

13. By Matthias Klose on 2007-08-10

* Build package for architecture lpia.
* Set Ubuntu maintainer address.

12. By Matthias Klose on 2007-05-23

Merge with Debian; remaining changes:

11. By Matthias Klose on 2006-09-22

elilo.sh: Set interpreter to /bin/bash, uses bashisms.