From 9b6fb533bdf48dc4bc3adb21c57366090aa6c5f6 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Wed, 9 Feb 2011 15:19:44 -0600 Subject: Updated libretools PKGBUILD --- libre/libretools/PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libre') diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index ad9264063..231781b33 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -2,18 +2,18 @@ # Contributor: fauno pkgname=libretools -pkgver=$(date +%Y%m%d) +pkgver=20110209 pkgrel=1 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') url="http://parabolagnulinux.org" license=('GPL3+') -depends=(wget pacman devtools) +depends=(devtools git) makedepends=(git) backup=(etc/libretools.conf) install=libretools.install -source=(libretools.install) -md5sums=('07d2e7b0a1250d888fccc10969c7f436') +source=() +md5sums=() _gitroot="http://projects.parabolagnulinux.org/libretools.git" _gitname="libretools" @@ -40,12 +40,14 @@ package() { install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin -} - +} \ No newline at end of file -- cgit v1.2.3 From ca888a4fabb768d38874b5f983cd84eba801ae7f Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 10 Feb 2011 16:47:11 -0300 Subject: grub2-1.99~rc1-3 --- libre-testing/grub2/05_archtheme | 6 + libre-testing/grub2/20_memtest86+ | 27 +++ libre-testing/grub2/PKGBUILD | 204 +++++++++++++++++++++ .../grub2/archlinux_grub2_mkconfig_fixes.patch | 93 ++++++++++ libre-testing/grub2/grub.cfg | 26 +++ libre-testing/grub2/grub.default | 42 +++++ libre-testing/grub2/grub2.install | 30 +++ .../p7zip-libre-9.13-2-i686-package.log | 12 -- 8 files changed, 428 insertions(+), 12 deletions(-) create mode 100644 libre-testing/grub2/05_archtheme create mode 100644 libre-testing/grub2/20_memtest86+ create mode 100644 libre-testing/grub2/PKGBUILD create mode 100644 libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch create mode 100644 libre-testing/grub2/grub.cfg create mode 100644 libre-testing/grub2/grub.default create mode 100644 libre-testing/grub2/grub2.install delete mode 100644 libre/p7zip-libre/p7zip-libre-9.13-2-i686-package.log (limited to 'libre') diff --git a/libre-testing/grub2/05_archtheme b/libre-testing/grub2/05_archtheme new file mode 100644 index 000000000..4d1b6fb20 --- /dev/null +++ b/libre-testing/grub2/05_archtheme @@ -0,0 +1,6 @@ +#!/bin/bash -e + +cat << EOF +set menu_color_normal=light-blue/black +set menu_color_highlight=light-cyan/blue +EOF diff --git a/libre-testing/grub2/20_memtest86+ b/libre-testing/grub2/20_memtest86+ new file mode 100644 index 000000000..41ca11f02 --- /dev/null +++ b/libre-testing/grub2/20_memtest86+ @@ -0,0 +1,27 @@ +#! /bin/sh -e +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib + +. ${libdir}/grub/grub-mkconfig_lib + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then + # image exists, create menu entry + echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 + cat << EOF +menuentry "Memory test (memtest86+)" $CLASS { +EOF + prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" + cat << EOF + linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` +} +EOF +fi diff --git a/libre-testing/grub2/PKGBUILD b/libre-testing/grub2/PKGBUILD new file mode 100644 index 000000000..30ab7e893 --- /dev/null +++ b/libre-testing/grub2/PKGBUILD @@ -0,0 +1,204 @@ +# Maintainer: Ronald van Haren +# Contributor: Keshav P R + +# _grub2_rev=3072 + +_grub2_lua_ver=19 +_grub2_gpxe_ver=12 +_grub2_ntldr_ver=13 +_grub2_915_ver=6 + +pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') +pkgbase="grub2" +pkgver='1.99~rc1' +pkgrel=3 +url="http://www.gnu.org/software/grub/" +arch=('i686' 'x86_64') +license=('GPL3') +makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') +options=(strip purge docs zipman !emptydirs) + +source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz" + 'archlinux_grub2_mkconfig_fixes.patch' + 'grub.default' + 'grub.cfg' + '20_memtest86+' + '05_archtheme') + +noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" + "grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" + "grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" + "grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz") + + +build() { + # set architecture dependent variables + if [ "${CARCH}" = "x86_64" ] ; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + _HOST="${CARCH}" + + build_grub2-common_and_bios + build_grub2-efi +} + +build_grub2-common_and_bios() { + # copy the source for building the common/bios package + cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_bios-${pkgver} + + ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs + cd ${srcdir}/grub2_bios-${pkgver} + patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch + + # add the grub-extra sources + export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ + install -d ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + + ## Need to use python2 + sed -i 's|python|python2|' ${srcdir}/grub2_bios-${pkgver}/autogen.sh + + # start the actual build process + cd ${srcdir}/grub2_bios-${pkgver} + ./autogen.sh + + ## fix unifont.bdf location so grub-mkfont can create *.pf2 files + sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' ${srcdir}/grub2_bios-${pkgver}/configure + +# mkdir ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS +# cd ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS + + CFLAGS="" ./configure \ + --with-platform=pc --enable-mm-debug \ + ${_EFIEMU} --host=${CARCH}-unknown-linux-gnu \ + --enable-grub-mkfont --prefix=/usr \ + --bindir=/bin --sbindir=/sbin \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --sysconfdir=/etc --enable-nls \ + --program-transform-name=s,grub,grub, + CFLAGS="" make +} + +build_grub2-efi() { + # copy the source for building the efi package + cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_efi-${pkgver} + + # add the grub-extra sources + export GRUB_CONTRIB=${srcdir}/grub2_efi-${pkgver}/grub2-extras/ + install -d ${srcdir}/grub2_efi-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \ + -C ${srcdir}/grub2_efi-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \ + -C ${srcdir}/grub2_efi-${pkgver}/grub2-extras + + ## Need to use python2 + sed -i 's|python|python2|' ${srcdir}/grub2_efi-${pkgver}/autogen.sh + + # start the actual build process + cd ${srcdir}/grub2_efi-${pkgver} + ./autogen.sh + + CFLAGS="" ./configure \ + --with-platform=efi --target=i386 \ + --enable-mm-debug --disable-efiemu \ + --host=${CARCH}-unknown-linux-gnu \ + --prefix=/usr --bindir=/bin \ + --sbindir=/sbin --mandir=/usr/share/man \ + --infodir=/usr/share/info --sysconfdir=/etc \ + --enable-nls --program-transform-name=s,grub,grub, + CFLAGS="" make +} + +package_grub2-common() { + pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms" + install="grub2.install" + depends=('xz' 'freetype2' 'device-mapper') + conflicts=('grub') + backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') + cd ${srcdir}/grub2_bios-${pkgver} + make DESTDIR=${pkgdir} install + + ## install grub2-extras ntldr-img's grubinst as /sbin/grubinst + install -Dm755 ${srcdir}/grub2_bios-${pkgver}/grub-core/grubinst ${pkgdir}/sbin/grubinst + + install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install + install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install + install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_i386-install + + sed -i "s|^\(target_cpu\)=.*|\1=i386|; \ + s|^\(platform\)=.*|\1=pc|" \ + ${pkgdir}/sbin/grub_bios-install + + sed -i "s|^\(target_cpu\)=.*|\1=x86_64|; \ + s|^\(platform\)=.*|\1=efi|" \ + ${pkgdir}/sbin/grub_efi_x86_64-install + + sed -i "s|^\(target_cpu\)=.*|\1=i386|; \ + s|^\(platform\)=.*|\1=efi|" \ + ${pkgdir}/sbin/grub_efi_i386-install + + ## install extra /etc/grub.d/ files + install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme + install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+ + + ## install /etc/default/grub (used by grub-mkconfig) + install -Dm644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub + + ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) + install -Dm644 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg + + # remove platform specific files + rm -rf ${pkgdir}/usr/lib/grub/i386-pc/ +} + +package_grub2-bios() { + pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS" + depends=(grub2-common=${pkgver}) + replaces=('grub2') + provides=('grub2') + + cd ${srcdir}/grub2_bios-${pkgver} + make DESTDIR=${pkgdir} install + + ## remove non platform-specific files + rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} + rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} +} + +package_grub2-efi-i386() { + + pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version" + depends=("grub2-common=${pkgver}" 'dosfstools') + optdepends=('efibootmgr') + + cd ${srcdir}/grub2_efi-${pkgver} + make DESTDIR=${pkgdir} install + + ## remove non platform-specific files + rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} + rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} +} + +md5sums=('fd602ffaada5ba7939d0ea47091841a5' + '21b709f119e0bef1c51978d757e885dc' + '9e0944f3e63586dc4242fd8b7977e3c4' + '0a124ffc9835100ba0e7de7a0ac1c389' + '0016761d429e6a77b90d09ed6ee8a47d' + '93f0f96911451e86014e04f96e13462f' + 'ff99d316b0c59e514e5bb641a392d330' + '7cb90ebb04b856ded6ae171c3658fba2' + '5a07e04c4ecb8ed145d54fec3043e0d5' + 'e143ae2e453b7c3ced309667df30da55') diff --git a/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch new file mode 100644 index 000000000..62acd2ee8 --- /dev/null +++ b/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch @@ -0,0 +1,93 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index b041a38..6f31dce 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -252,6 +252,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_BADRAM +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 420b3f3..79fd4fb 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -100,6 +100,14 @@ cat <