[arch-commits] Commit in (5 files)
Tom Gundersen
tomegun at nymeria.archlinux.org
Thu Feb 28 22:19:47 UTC 2013
Date: Thursday, February 28, 2013 @ 23:19:47
Author: tomegun
Revision: 178932
rename gummiboot-efi to gummiboot
Added:
gummiboot/
gummiboot/trunk/gummiboot.install
Modified:
gummiboot/trunk/PKGBUILD
Deleted:
gummiboot-efi/
gummiboot/trunk/gummiboot-fix-makefile.patch
------------------------------------+
gummiboot/trunk/gummiboot.install | 11 +++++
trunk/PKGBUILD | 74 ++++++++++-------------------------
trunk/gummiboot-fix-makefile.patch | 66 -------------------------------
3 files changed, 34 insertions(+), 117 deletions(-)
Modified: gummiboot/trunk/PKGBUILD
===================================================================
--- gummiboot-efi/trunk/PKGBUILD 2013-02-28 21:40:33 UTC (rev 178930)
+++ gummiboot/trunk/PKGBUILD 2013-02-28 22:19:47 UTC (rev 178932)
@@ -1,69 +1,41 @@
# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Maintainer: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Contributor: Mantas Mikulėnas <grawity at gmail.com>
-pkgname="gummiboot-efi"
-pkgver="23"
-pkgrel="3"
+pkgname="gummiboot"
+pkgver="24"
+pkgrel="1"
pkgdesc="Simple text-mode UEFI Boot Manager"
url="http://freedesktop.org/wiki/Software/gummiboot"
-arch=('any')
+arch=('x86_64' 'i686')
license=('LGPL2.1')
makedepends=('gnu-efi-libs')
-depends=('dosfstools' 'efibootmgr')
-optdepends=('mactel-boot: For bless command in Apple Mac systems')
-conflicts=('gummiboot-efi-x86_64' 'gummiboot-efi-i386')
-provides=('gummiboot-efi-x86_64' 'gummiboot-efi-i386')
-replaces=('gummiboot-efi-x86_64' 'gummiboot-efi-i386')
-options=('!strip' '!makeflags')
-source=("ftp://ftp.archlinux.org/other/gummiboot-efi/gummiboot-${pkgver}.tar.gz"
- 'gummiboot-fix-makefile.patch'
+depends=('util-linux')
+conflicts=('gummiboot-efi')
+provides=('gummiboot-efi')
+replaces=('gummiboot-efi')
+options=('!strip')
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
'loader.conf'
'arch.conf')
+install="gummiboot.install"
build() {
- if [[ "${CARCH}" != "x86_64" ]]; then
- msg "${pkgname} can be built only in an x86_64 system. Exiting."
- exit 1
- fi
+ cd "${srcdir}/${pkgname}-${pkgver}/"
- cd "${srcdir}/gummiboot-${pkgver}/"
-
- ## Fix Makefile to enable compile for both x86_64 and i386 UEFI
- patch -Np1 -i "${srcdir}/gummiboot-fix-makefile.patch"
-
- unset CFLAGS
- unset CPPFLAGS
- unset LDFLAGS
-
- ## Compile gummiboot for x86_64 UEFI
- cp -r "${srcdir}/gummiboot-${pkgver}" "${srcdir}/gummiboot-${pkgver}-x86_64"
- cd "${srcdir}/gummiboot-${pkgver}-x86_64/"
- ARCH="x86_64" CFLAGS="-m64" LIBDIR="/usr/lib" make gummibootx64.efi
-
- unset CFLAGS
- unset CPPFLAGS
- unset LDFLAGS
-
- ## Compile gummiboot for i386 aka IA32 UEFI
- cp -r "${srcdir}/gummiboot-${pkgver}" "${srcdir}/gummiboot-${pkgver}-i386"
- cd "${srcdir}/gummiboot-${pkgver}-i386/"
- ARCH="i686" CFLAGS="-m32" LIBDIR="/usr/lib32" make gummibootia32.efi
+ make
}
package() {
- install -d "${pkgdir}/usr/lib/gummiboot/loader/entries/"
-
- ## Install gummiboot UEFI applications
- install -D -m0644 "${srcdir}/gummiboot-${pkgver}-x86_64/gummibootx64.efi" "${pkgdir}/usr/lib/gummiboot/gummibootx64.efi"
- install -D -m0644 "${srcdir}/gummiboot-${pkgver}-i386/gummibootia32.efi" "${pkgdir}/usr/lib/gummiboot/gummibootia32.efi"
-
- ## Install gummiboot example configuration files
+ ## Install gummiboot example configuration files (can go away with systemd's kernel-install)
install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf"
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+ make DESTDIR="${pkgdir}" install
}
-sha1sums=('b883516a6dbec17823ddefb6b5789b6183132814'
- 'ec31cc88b3b0de26493b1b9ea06332f717a1f06f'
- '82a59f90d9138c26f8db52bb8e94991602cf1edd'
- 'aff6e152c3f7494e6113a8e2f073810366433015')
+md5sums=('6fe2f9fb9f9a61f37612a8120ea42c1f'
+ '6ea803e5179d623716e3be0b636de658'
+ '82bda9612e3a361a74cf8de2a0134b15')
Deleted: gummiboot/trunk/gummiboot-fix-makefile.patch
===================================================================
--- gummiboot-efi/trunk/gummiboot-fix-makefile.patch 2013-02-28 21:40:33 UTC (rev 178930)
+++ gummiboot/trunk/gummiboot-fix-makefile.patch 2013-02-28 22:19:47 UTC (rev 178932)
@@ -1,66 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b45855e..0997263 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,16 +9,17 @@ else
- endif
- export E Q
-
--ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
--LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
-+ARCH?=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
-+LIBDIR?=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
- LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
-
- ifeq ($(ARCH),i686)
-- ARCH=ia32
-+ GNUEFI_ARCH=ia32
- MACHINE_TYPE_NAME=ia32
- endif
-
- ifeq ($(ARCH),x86_64)
-+ GNUEFI_ARCH=x86_64
- MACHINE_TYPE_NAME=x64
- ARCH_CFLAGS= \
- -DEFI_FUNCTION_WRAPPER \
-@@ -28,12 +29,12 @@ endif
- all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot
-
- # ------------------------------------------------------------------------------
--CPPFLAGS = \
-+CPPFLAGS += \
- -I. \
- -I/usr/include/efi \
-- -I/usr/include/efi/$(ARCH)
-+ -I/usr/include/efi/$(GNUEFI_ARCH)
-
--CFLAGS = \
-+CFLAGS += \
- -DVERSION=$(VERSION) \
- -Wall \
- -Wextra \
-@@ -48,13 +49,13 @@ CFLAGS = \
- -Wsign-compare \
- $(ARCH_CFLAGS)
-
--LDFLAGS = -T $(LIBEFIDIR)/elf_$(ARCH)_efi.lds \
-+LDFLAGS += -T $(LIBEFIDIR)/elf_$(GNUEFI_ARCH)_efi.lds \
- -shared \
- -Bsymbolic \
- -nostdlib \
- -znocombreloc \
- -L $(LIBDIR) \
-- $(LIBEFIDIR)/crt0-efi-$(ARCH).o
-+ $(LIBEFIDIR)/crt0-efi-$(GNUEFI_ARCH).o
-
- %.o: %.c
- $(E) " CC " $@
-@@ -71,7 +72,7 @@ gummiboot$(MACHINE_TYPE_NAME).efi: src/efi/gummiboot.so
- $(E) " OBJCOPY " $@
- $(Q) objcopy -j .text -j .sdata -j .data -j .dynamic \
- -j .dynsym -j .rel -j .rela -j .reloc -j .eh_frame \
-- --target=efi-app-$(ARCH) $< $@
-+ --target=efi-app-$(GNUEFI_ARCH) $< $@
-
- # ------------------------------------------------------------------------------
- gummiboot: src/setup/setup.c src/setup/efivars.h src/setup/efivars.c Makefile
Added: gummiboot/trunk/gummiboot.install
===================================================================
--- gummiboot/trunk/gummiboot.install (rev 0)
+++ gummiboot/trunk/gummiboot.install 2013-02-28 22:19:47 UTC (rev 178932)
@@ -0,0 +1,11 @@
+post_install() {
+ /usr/bin/gummiboot install
+}
+
+post_upgrade() {
+ /usr/bin/gummiboot upgrade
+}
+
+pre_remove() {
+ /usr/bin/gummiboot remove
+}
More information about the arch-commits
mailing list