diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2013-07-02 15:29:48 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2013-07-02 15:29:48 +0000 |
| commit | 1b5fb6c04f2017cbb47d978ccce1d5cc457d818a (patch) | |
| tree | 3f6cf148d428b33b0a662e8463c8e7e8fdc85c85 /debian | |
| parent | 0bab096d4bd6290d802cb41132ff2f928e0ab2b1 (diff) | |
| parent | bfab8d6791bccc38a8604cbc933048319c920780 (diff) | |
| download | efi-boot-shim-1b5fb6c04f2017cbb47d978ccce1d5cc457d818a.tar.gz efi-boot-shim-1b5fb6c04f2017cbb47d978ccce1d5cc457d818a.zip | |
Merge upstream release 0.4
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/second-stage-path | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 0c349e5d..380df83d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,15 @@ -shim (0.2+20121127.9c0c64eb-0ubuntu1) UNRELEASED; urgency=low +shim (0.4-0ubuntu1) UNRELEASED; urgency=low - * New upstream snapshot. + * New upstream release. * Drop debian/patches/shim-before-loadimage; upstream has changed this to not call loadimage at all. * debian/patches/sbsigntool-not-pesign: Sign MokManager with sbsigntool instead of pesign. * Add a versioned build-dependency on gnu-efi; we need features only found in 3.0k to build the netboot support. + * New upstream release. - -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 12 Dec 2012 16:36:12 -0800 + -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 02 Jul 2013 15:24:08 +0000 shim (0~20120906.bcd0a4e8-0ubuntu4) quantal-proposed; urgency=low diff --git a/debian/patches/second-stage-path b/debian/patches/second-stage-path index f0727c47..63c5d443 100644 --- a/debian/patches/second-stage-path +++ b/debian/patches/second-stage-path @@ -9,12 +9,12 @@ Index: shim/shim.c =================================================================== --- shim.orig/shim.c +++ shim/shim.c -@@ -42,7 +42,7 @@ - #include "netboot.h" +@@ -43,7 +43,7 @@ #include "shim_cert.h" + #include "ucs2.h" --#define SECOND_STAGE L"\\grub.efi" -+#define SECOND_STAGE L"\\grubx64.efi" +-#define DEFAULT_LOADER L"\\grub.efi" ++#define DEFAULT_LOADER L"\\grubx64.efi" + #define FALLBACK L"\\fallback.efi" #define MOK_MANAGER L"\\MokManager.efi" - static EFI_SYSTEM_TABLE *systab; |