public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gummiboot: Update to 23.

Browse Source 
Requires a corresponding change in nixos to work there.
This commit is contained in:
Shea Levy 2013-02-21 12:06:03 -05:00
parent afe3758b1b
commit 754f9a44fd
2 changed files with 70 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/gummiboot/default.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchurl, gnu_efi, unzip }: { stdenv, fetchurl, gnu_efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gummiboot-16"; name = "gummiboot-23";
buildInputs = [ unzip ]; buildInputs = [ unzip pkgconfig utillinux libxslt docbook_xsl docbook_xml_dtd_42 ];
patches = [ ./no-usr.patch ]; patches = [ ./no-usr.patch ];
buildFlags = [ buildFlags = [ "GNU_EFI=${gnu_efi}" ];
"GNU_EFI=${gnu_efi}"
] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32";
installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; makeFlags = [ "PREFIX=$(out)" ];
src = fetchurl { src = fetchurl {
url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip"; url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip";
sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1"; sha256 = "1lmfk4k52ha00ppna5g7h51vhd27i9fipf5k7mc2d9jkm2480z4j";
}; };
meta = { meta = {

69
pkgs/tools/misc/gummiboot/no-usr.patch
View File

@ -1,14 +1,24 @@
diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile diff -Naur gummiboot-23-orig/Makefile gummiboot-23/Makefile
--- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500 --- gummiboot-23-orig/Makefile 2013-02-20 00:55:44.000000000 -0500
+++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500 +++ gummiboot-23/Makefile 2013-02-21 12:00:35.783637645 -0500
@@ -1,13 +1,13 @@ @@ -10,7 +10,8 @@
VERSION=16 export E Q
ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//") ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd)) -LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
+PREFIX=/usr
+LIBDIR=$(GNU_EFI)/lib +LIBDIR=$(GNU_EFI)/lib
LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR)) LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
ifeq ($(ARCH),i686)
@@ -25,13 +26,13 @@
-mno-red-zone
endif
-all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot
+all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot man
# ------------------------------------------------------------------------------
CPPFLAGS = \ CPPFLAGS = \
-I. \ -I. \
- -I/usr/include/efi \ - -I/usr/include/efi \
@ -18,3 +28,52 @@ diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
CFLAGS = \ CFLAGS = \
-DVERSION=$(VERSION) \ -DVERSION=$(VERSION) \
@@ -82,6 +83,7 @@
`pkg-config --cflags --libs blkid` \
src/setup/setup.c \
src/setup/efivars.c \
+ -DPREFIX=\"$(PREFIX)\" \
-o $@
# ------------------------------------------------------------------------------
@@ -101,11 +103,11 @@
rm -f src/efi/gummiboot.o src/efi/gummiboot.so gummiboot gummiboot$(MACHINE_TYPE_NAME).efi
install: all
- mkdir -p $(DESTDIR)/usr/bin/
- cp gummiboot $(DESTDIR)/usr/bin
- mkdir -p $(DESTDIR)/usr/lib/gummiboot/
- cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)/usr/lib/gummiboot/
- [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)/usr/share/man/man1/ && cp gummiboot.1 $(DESTDIR)/usr/share/man/man1/ || :
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+ cp gummiboot $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(PREFIX)/lib/gummiboot/
+ cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)$(PREFIX)/lib/gummiboot/
+ [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1/ && cp gummiboot.1 $(DESTDIR)$(PREFIX)/share/man/man1/ || :
tar:
git archive --format=tar --prefix=gummiboot-$(VERSION)/ $(VERSION) | xz > gummiboot-$(VERSION).tar.xz
diff -Naur gummiboot-23-orig/src/setup/setup.c gummiboot-23/src/setup/setup.c
--- gummiboot-23-orig/src/setup/setup.c 2013-02-20 00:55:44.000000000 -0500
+++ gummiboot-23/src/setup/setup.c 2013-02-21 11:57:43.295324700 -0500
@@ -736,7 +736,7 @@
char *p = NULL, *q = NULL, *v = NULL;
int r;
- if (asprintf(&p, "/usr/lib/gummiboot/%s", name) < 0) {
+ if (asprintf(&p, PREFIX "/lib/gummiboot/%s", name) < 0) {
fprintf(stderr, "Out of memory.\n");
r = -ENOMEM;
goto finish;
@@ -791,9 +791,9 @@
return r;
}
- d = opendir("/usr/lib/gummiboot");
+ d = opendir(PREFIX "/lib/gummiboot");
if (!d) {
- fprintf(stderr, "Failed to open /usr/lib/gummiboot: %m\n");
+ fprintf(stderr, "Failed to open " PREFIX "/lib/gummiboot: %m\n");
return -errno;
}