Alexander/grub-luks2-improved-stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump to latest version, updated to git

Browse Source
This commit is contained in:
Tobias Powalowski 2013-10-23 20:28:51 +00:00
parent 7747868269
commit 9465f7c7a4
1 changed files with 100 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
PKGBUILD
View File

@ -1,18 +1,20 @@
# Maintainer : Tobias Powalowski <tpowa@archlinux.org> # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
# Maintainer : Ronald van Haren <ronald.archlinux.org> # Maintainer : Ronald van Haren <ronald.archlinux.org>
# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
_GRUB_BZR_REV="5086" _pkgver="2.00"
_GRUB_GIT_COMMIT="bca274b45597725f21f77a773087b62a2922eb2b"
## grub-extras lua and gpxe fail to build with grub bzr rev 5043 ## grub-extras gpxe is not needed
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
pkgname=grub pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)" pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00.${_GRUB_BZR_REV} pkgver=2.00.900.gbca274b
pkgrel=1 pkgrel=1
epoch="1"
url="https://www.gnu.org/software/grub/" url="https://www.gnu.org/software/grub/"
arch=('x86_64' 'i686') arch=('x86_64' 'i686')
license=('GPL3') license=('GPL3')
@ -24,8 +26,8 @@ conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' makedepends=('git' 'bzr' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr') 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper') depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage' optdepends=('freetype2: For grub-mkfont usage'
'fuse: For grub-mount usage' 'fuse: For grub-mount usage'
@ -36,59 +38,92 @@ optdepends=('freetype2: For grub-mkfont usage'
'mtools: For grub-mkrescue FAT FS support') 'mtools: For grub-mkrescue FAT FS support')
# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" # source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
'archlinux_grub_mkconfig_fixes.patch' 'archlinux_grub_mkconfig_fixes.patch'
'60_memtest86+' '60_memtest86+'
'grub.default' 'grub.default'
'grub.cfg' 'grub.cfg')
'grub-2.00-mkinitcpio-0.15.patch'
'grub-2.00.5086-fix-lvm-parsing.patch')
md5sums=('SKIP' md5sums=('SKIP'
'ee1262cc4e20031df019779b1a4b1e39' 'ee1262cc4e20031df019779b1a4b1e39'
'be55eabc102f2c60b38ed35c203686d6' 'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d' 'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46' 'c8b9511586d57d6f2524ae7898397a46'
'd25d2dcf8ba708dcf768fcaea799f59c' 'SKIP'
'7a0ce6aa4a23fa12e1f79ab03fe63f88'
'SKIP' 'SKIP'
'SKIP') 'SKIP')
for _DIR_ in 915resolution ntldr-img ; do for _DIR_ in 915resolution lua ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done done
pkgver() {
cd "${srcdir}/grub-${_pkgver}/"
echo "$(git describe --tags)" | sed -e 's|-|\.|g'
}
prepare() { prepare() {
cd "${srcdir}/grub-${pkgver}"
patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" cd "${srcdir}/grub-${_pkgver}/"
patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch"
msg "Patch to enable grub-mkconfig detect Arch kernels and initramfs"
patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch"
msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
msg "Fix mkinitcpio 'rw' FS#36275"
sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
msg "Fix OS naming FS#33393"
sed 's|GNU/Linux|Linux|' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
# msg "Requires python2"
# sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
msg "Pull in latest language files"
./linguas.sh
echo
msg "Remove non working langs which need LC_ALL=C.UTF-8"
sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
} }
_build_grub-common_and_bios() { _build_grub-common_and_bios() {
## Copy the source for building the common/bios package msg "Set ARCH dependent variables for bios build"
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios" if [[ "${CARCH}" == 'x86_64' ]]; then
cd "${srcdir}/grub-${pkgver}-bios/" _EFIEMU="--enable-efiemu"
else
_EFIEMU="--disable-efiemu"
fi
## Add the grub-extra sources msg "Copy the source for building the bios package"
export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/" cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
cd "${srcdir}/grub-${_pkgver}-bios/"
install -d "${srcdir}/grub-${pkgver}-bios/grub-extras" msg "Add the grub-extra sources for bios build"
for _DIR_ in 915resolution ntldr-img ; do install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}" for _DIR_ in 915resolution lua ntldr-img ; do
cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}"
done done
export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
## Unset all compiler FLAGS for bios build msg "Unset all compiler FLAGS for bios build"
unset CFLAGS unset CFLAGS
unset CPPFLAGS unset CPPFLAGS
unset CXXFLAGS unset CXXFLAGS
unset LDFLAGS unset LDFLAGS
unset MAKEFLAGS unset MAKEFLAGS
## Start the actual build process cd "${srcdir}/grub-${_pkgver}-bios/"
cd "${srcdir}/grub-${pkgver}-bios/"
msg "Run autogen.sh for bios build"
./autogen.sh ./autogen.sh
echo echo
msg "Run ./configure for bios build"
./configure \ ./configure \
--with-platform="pc" \ --with-platform="pc" \
--target="i386" \ --target="i386" \
@ -97,6 +132,7 @@ _build_grub-common_and_bios() {
--enable-nls \ --enable-nls \
--enable-device-mapper \ --enable-device-mapper \
--enable-cache-stats \ --enable-cache-stats \
--enable-boot-time \
--enable-grub-mkfont \ --enable-grub-mkfont \
--enable-grub-mount \ --enable-grub-mount \
--prefix="/usr" \ --prefix="/usr" \
@ -109,37 +145,42 @@ _build_grub-common_and_bios() {
--program-prefix="" \ --program-prefix="" \
--with-bootdir="/boot" \ --with-bootdir="/boot" \
--with-grubdir="grub" \ --with-grubdir="grub" \
--disable-silent-rules \
--disable-werror --disable-werror
echo echo
msg "Run make for bios build"
make make
echo echo
} }
_build_grub-efi() { _build_grub-efi() {
## Copy the source for building the efi package msg "Copy the source for building the efi package"
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi" cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi"
cd "${srcdir}/grub-${pkgver}-efi/" cd "${srcdir}/grub-${_pkgver}-efi/"
# export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/" msg "Add the grub-extra sources for efi build"
install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/"
for _DIR_ in lua ; do
cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}"
done
export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
# install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/" msg "Unset all compiler FLAGS for efi build"
# for _DIR_ in lua gpxe ; do
# cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
# done
## Unset all compiler FLAGS for efi build
unset CFLAGS unset CFLAGS
unset CPPFLAGS unset CPPFLAGS
unset CXXFLAGS unset CXXFLAGS
unset LDFLAGS unset LDFLAGS
unset MAKEFLAGS unset MAKEFLAGS
cd "${srcdir}/grub-${pkgver}-efi/" cd "${srcdir}/grub-${_pkgver}-efi/"
msg "Run autogen.sh for efi build"
./autogen.sh ./autogen.sh
echo echo
msg "Run ./configure for efi build"
./configure \ ./configure \
--with-platform="efi" \ --with-platform="efi" \
--target="${_EFI_ARCH}" \ --target="${_EFI_ARCH}" \
@ -148,6 +189,7 @@ _build_grub-efi() {
--enable-nls \ --enable-nls \
--enable-device-mapper \ --enable-device-mapper \
--enable-cache-stats \ --enable-cache-stats \
--enable-boot-time \
--enable-grub-mkfont \ --enable-grub-mkfont \
--enable-grub-mount \ --enable-grub-mount \
--prefix="/usr" \ --prefix="/usr" \
@ -160,9 +202,11 @@ _build_grub-efi() {
--program-prefix="" \ --program-prefix="" \
--with-bootdir="/boot" \ --with-bootdir="/boot" \
--with-grubdir="grub" \ --with-grubdir="grub" \
--disable-silent-rules \
--disable-werror --disable-werror
echo echo
msg "Run make for efi build"
make make
echo echo
@ -170,72 +214,51 @@ _build_grub-efi() {
build() { build() {
## Set ARCH dependent variables cd "${srcdir}/grub-${_pkgver}/"
if [[ "${CARCH}" == 'x86_64' ]]; then
_EFIEMU="--enable-efiemu"
else
_EFIEMU="--disable-efiemu"
fi
cd "${srcdir}/grub-${pkgver}/" msg "Build grub bios stuff"
## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs
patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch"
echo
## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
## Requires python2
# sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
## pull in language files
./linguas.sh
# remove not working langs which need LC_ALL=C.UTF-8
sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS
_build_grub-common_and_bios _build_grub-common_and_bios
echo echo
msg "Build grub efi stuff"
_build_grub-efi _build_grub-efi
echo echo
} }
_package_grub-common_and_bios() { _package_grub-common_and_bios() {
cd "${srcdir}/grub-${pkgver}-bios/" cd "${srcdir}/grub-${_pkgver}-bios/"
msg "Run make install for bios build"
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
echo echo
## remove gdb debugging related files msg "Remove gdb debugging related files for bios build"
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
## Fix OS naming FS#33393 msg "Install extra /etc/grub.d/ files"
sed 's|GNU/Linux|Linux|' -i "${pkgdir}/etc/grub.d/10_linux"
## Install extra /etc/grub.d/ files
install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
## Install /etc/default/grub (used by grub-mkconfig) msg "Install /etc/default/grub (used by grub-mkconfig)"
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
## Install grub.cfg for backup array msg "Install grub.cfg for backup array"
install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
} }
_package_grub-efi() { _package_grub-efi() {
cd "${srcdir}/grub-${pkgver}-efi/" cd "${srcdir}/grub-${_pkgver}-efi/"
msg "Run make install for efi build"
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
echo echo
## remove gdb debugging related files msg "Remove gdb debugging related files for efi build"
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
@ -244,8 +267,10 @@ _package_grub-efi() {
package() { package() {
msg "Package grub efi stuff"
_package_grub-efi _package_grub-efi
msg "Package grub bios stuff"
_package_grub-common_and_bios _package_grub-common_and_bios
} }