[arch-commits] Commit in gummiboot-efi/repos/testing-any (8 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Feb 26 15:29:18 UTC 2013
Date: Tuesday, February 26, 2013 @ 16:29:17
Author: tpowa
Revision: 178735
archrelease: copy trunk to testing-any
Added:
gummiboot-efi/repos/testing-any/PKGBUILD
(from rev 178734, gummiboot-efi/trunk/PKGBUILD)
gummiboot-efi/repos/testing-any/arch.conf
(from rev 178734, gummiboot-efi/trunk/arch.conf)
gummiboot-efi/repos/testing-any/gummiboot-fix-makefile.patch
(from rev 178734, gummiboot-efi/trunk/gummiboot-fix-makefile.patch)
gummiboot-efi/repos/testing-any/loader.conf
(from rev 178734, gummiboot-efi/trunk/loader.conf)
Deleted:
gummiboot-efi/repos/testing-any/PKGBUILD
gummiboot-efi/repos/testing-any/arch.conf
gummiboot-efi/repos/testing-any/gummiboot-fix-makefile.patch
gummiboot-efi/repos/testing-any/loader.conf
------------------------------+
PKGBUILD | 138 ++++++++++++++++++++---------------------
arch.conf | 14 ++--
gummiboot-fix-makefile.patch | 132 +++++++++++++++++++--------------------
loader.conf | 4 -
4 files changed, 144 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-26 15:29:11 UTC (rev 178734)
+++ PKGBUILD 2013-02-26 15:29:17 UTC (rev 178735)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Maintainer: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Mantas Mikulėnas <grawity at gmail.com>
-
-pkgname="gummiboot-efi"
-pkgver="23"
-pkgrel="2"
-pkgdesc="Simple text-mode UEFI Boot Manager"
-url="http://freedesktop.org/wiki/Software/gummiboot"
-arch=('any')
-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'
- 'loader.conf'
- 'arch.conf')
-
-build() {
- if [[ "${CARCH}" != "x86_64" ]]; then
- msg "${pkgname} can be built only in an x86_64 system. Exiting."
- exit 1
- fi
-
- 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
-}
-
-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 -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"
-}
-sha1sums=('b883516a6dbec17823ddefb6b5789b6183132814'
- 'ec31cc88b3b0de26493b1b9ea06332f717a1f06f'
- '82a59f90d9138c26f8db52bb8e94991602cf1edd'
- 'aff6e152c3f7494e6113a8e2f073810366433015')
Copied: gummiboot-efi/repos/testing-any/PKGBUILD (from rev 178734, gummiboot-efi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-02-26 15:29:17 UTC (rev 178735)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: 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"
+pkgdesc="Simple text-mode UEFI Boot Manager"
+url="http://freedesktop.org/wiki/Software/gummiboot"
+arch=('any')
+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'
+ 'loader.conf'
+ 'arch.conf')
+
+build() {
+ if [[ "${CARCH}" != "x86_64" ]]; then
+ msg "${pkgname} can be built only in an x86_64 system. Exiting."
+ exit 1
+ fi
+
+ 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
+}
+
+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 -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"
+}
+sha1sums=('b883516a6dbec17823ddefb6b5789b6183132814'
+ 'ec31cc88b3b0de26493b1b9ea06332f717a1f06f'
+ '82a59f90d9138c26f8db52bb8e94991602cf1edd'
+ 'aff6e152c3f7494e6113a8e2f073810366433015')
Deleted: arch.conf
===================================================================
--- arch.conf 2013-02-26 15:29:11 UTC (rev 178734)
+++ arch.conf 2013-02-26 15:29:17 UTC (rev 178735)
@@ -1,7 +0,0 @@
-## This is just an exmaple config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title Arch Linux
-linux /vmlinuz-linux
-initrd /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Copied: gummiboot-efi/repos/testing-any/arch.conf (from rev 178734, gummiboot-efi/trunk/arch.conf)
===================================================================
--- arch.conf (rev 0)
+++ arch.conf 2013-02-26 15:29:17 UTC (rev 178735)
@@ -0,0 +1,7 @@
+## This is just an exmaple config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Deleted: gummiboot-fix-makefile.patch
===================================================================
--- gummiboot-fix-makefile.patch 2013-02-26 15:29:11 UTC (rev 178734)
+++ gummiboot-fix-makefile.patch 2013-02-26 15:29:17 UTC (rev 178735)
@@ -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
Copied: gummiboot-efi/repos/testing-any/gummiboot-fix-makefile.patch (from rev 178734, gummiboot-efi/trunk/gummiboot-fix-makefile.patch)
===================================================================
--- gummiboot-fix-makefile.patch (rev 0)
+++ gummiboot-fix-makefile.patch 2013-02-26 15:29:17 UTC (rev 178735)
@@ -0,0 +1,66 @@
+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
Deleted: loader.conf
===================================================================
--- loader.conf 2013-02-26 15:29:11 UTC (rev 178734)
+++ loader.conf 2013-02-26 15:29:17 UTC (rev 178735)
@@ -1,2 +0,0 @@
-timeout 10
-default arch
Copied: gummiboot-efi/repos/testing-any/loader.conf (from rev 178734, gummiboot-efi/trunk/loader.conf)
===================================================================
--- loader.conf (rev 0)
+++ loader.conf 2013-02-26 15:29:17 UTC (rev 178735)
@@ -0,0 +1,2 @@
+timeout 10
+default arch
More information about the arch-commits
mailing list