upg grub add os-prober dependency
This commit is contained in:
parent
21a773faa1
commit
94e37164e9
6 changed files with 40 additions and 36 deletions
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
|
||||
|
|
@ -20,11 +21,10 @@ pkgname='grub'
|
|||
pkgdesc='GNU GRand Unified Bootloader (2)'
|
||||
epoch=2
|
||||
_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
|
||||
_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
|
||||
_unifont_ver='14.0.01'
|
||||
_unifont_ver='14.0.02'
|
||||
_pkgver=2.06
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=05
|
||||
pkgrel=06
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
arch=('x86_64')
|
||||
backup=('etc/default/grub'
|
||||
|
|
@ -38,14 +38,13 @@ provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
|
|||
|
||||
makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-liberation' 'python' 'autogen'
|
||||
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
|
||||
depends=('sh' 'xz' 'gettext' 'device-mapper')
|
||||
depends=('sh' 'xz' 'gettext' 'device-mapper' 'os-prober')
|
||||
optdepends=('freetype2: For grub-mkfont usage'
|
||||
'fuse2: For grub-mount usage'
|
||||
'dosfstools: For grub-mkrescue FAT FS and EFI support'
|
||||
'lzop: For grub-mkrescue LZO support'
|
||||
'efibootmgr: For grub-install EFI support'
|
||||
'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
|
||||
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
|
||||
'mtools: For grub-mkrescue FAT FS support')
|
||||
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
|
|
@ -55,15 +54,19 @@ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
|||
fi
|
||||
|
||||
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
|
||||
"git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
|
||||
'git+https://git.savannah.gnu.org/git/gnulib.git'
|
||||
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
|
||||
'0001-00_header-add-GRUB_COLOR_-variables.patch'
|
||||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'grub.default')
|
||||
'grub.default'
|
||||
'sbat.csv')
|
||||
|
||||
_backports=(
|
||||
# fs/xfs: Fix unreadable filesystem with v4 superblock
|
||||
'a4b495520e4dc41a896a8b916a64eda9970c50ea'
|
||||
|
||||
# fs/btrfs: Use full btrfs bootloader area
|
||||
'b0f06a81c6f31b6fa20be67a96b6683bba8210c9'
|
||||
)
|
||||
|
||||
_configure_options=(
|
||||
|
|
@ -101,10 +104,10 @@ prepare() {
|
|||
|
||||
echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
|
||||
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
|
||||
patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
|
||||
|
||||
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
|
||||
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
|
||||
|
||||
echo "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 "configure.ac"
|
||||
|
|
@ -262,11 +265,7 @@ _package_grub-efi() {
|
|||
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
|
||||
|
||||
_sbat_file="${pkgdir}/usr/share/grub/sbat.csv"
|
||||
touch "${_sbat_file}"
|
||||
echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md" >> "${_sbat_file}"
|
||||
echo "grub,1,Free Software Foundation,grub,${_pkgver},https//www.gnu.org/software/grub/" >> "${_sbat_file}"
|
||||
echo "grub.arch,1,Arch Linux,grub,${_pkgver},https://archlinux.org/packages/core/x86_64/grub/" >> "${_sbat_file}"
|
||||
sed -e "s/%PKGVER%/${pkgver}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
|
||||
}
|
||||
|
||||
_package_grub-emu() {
|
||||
|
|
@ -311,8 +310,9 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
|
|||
|
||||
sha256sums=(SKIP
|
||||
SKIP
|
||||
391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e # unifont-14.0.01.bdf.gz
|
||||
a76e389b444b2ad4c3a22b68b53c6fe27b66bc412de102d111483940b40eb56c # unifont-14.0.01.bdf.gz.sig
|
||||
5b314364d23143755a4b11b641a953c07837f48fefcc7454318e334265e4974b # unifont-14.0.02.bdf.gz
|
||||
c80ed535fa607fca0f137c42b17f8dec763385d157f99eac9223c9b75dff47ae # unifont-14.0.02.bdf.gz.sig
|
||||
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
|
||||
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
|
||||
5f82bf6d68dc690765f447fce8e52a0204d24805b23d63db04020d727b0f13f8) # grub.default
|
||||
16377fa6bbe007bbbb15ecab98c4ffd4638763e3b034bb4d3e53f764de3c66b1 # grub.default
|
||||
98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv
|
||||
|
|
|
|||
|
|
@ -19,11 +19,10 @@ pkgname='grub'
|
|||
pkgdesc='GNU GRand Unified Bootloader (2)'
|
||||
epoch=2
|
||||
_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
|
||||
_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
|
||||
_unifont_ver='14.0.01'
|
||||
_unifont_ver='14.0.02'
|
||||
_pkgver=2.06
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
arch=('x86_64')
|
||||
license=('GPL3')
|
||||
|
|
@ -59,23 +58,28 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
|
|||
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
|
||||
|
||||
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
|
||||
"git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
|
||||
'git+https://git.savannah.gnu.org/git/gnulib.git'
|
||||
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
|
||||
'0001-00_header-add-GRUB_COLOR_-variables.patch'
|
||||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'grub.default')
|
||||
'grub.default'
|
||||
'sbat.csv')
|
||||
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e'
|
||||
'5b314364d23143755a4b11b641a953c07837f48fefcc7454318e334265e4974b'
|
||||
'SKIP'
|
||||
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
|
||||
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
|
||||
'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682')
|
||||
'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682'
|
||||
'98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
|
||||
|
||||
_backports=(
|
||||
# fs/xfs: Fix unreadable filesystem with v4 superblock
|
||||
'a4b495520e4dc41a896a8b916a64eda9970c50ea'
|
||||
|
||||
# fs/btrfs: Use full btrfs bootloader area
|
||||
'b0f06a81c6f31b6fa20be67a96b6683bba8210c9'
|
||||
)
|
||||
|
||||
_configure_options=(
|
||||
|
|
@ -274,11 +278,7 @@ _package_grub-efi() {
|
|||
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
|
||||
|
||||
_sbat_file="${pkgdir}/usr/share/grub/sbat.csv"
|
||||
touch "${_sbat_file}"
|
||||
echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md" >> "${_sbat_file}"
|
||||
echo "grub,1,Free Software Foundation,grub,${_pkgver},https//www.gnu.org/software/grub/" >> "${_sbat_file}"
|
||||
echo "grub.arch,1,Arch Linux,grub,${_pkgver},https://archlinux.org/packages/core/x86_64/grub/" >> "${_sbat_file}"
|
||||
sed -e "s/%PKGVER%/${pkgver}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
|
||||
}
|
||||
|
||||
_package_grub-emu() {
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ fuse2
|
|||
autoconf
|
||||
automake
|
||||
bison
|
||||
os-prober
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=8
|
||||
GRUB_DISTRIBUTOR="joborun linux"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="loglevel=0 quiet"
|
||||
GRUB_CMDLINE_LINUX="net.ifnames=0 ipv6.disable=1 init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
|
||||
|
|
@ -60,4 +60,4 @@ GRUB_INIT_TUNE="333 565 2"
|
|||
# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this
|
||||
# functionality install os-prober and uncomment to detect and include other
|
||||
# operating systems.
|
||||
#GRUB_DISABLE_OS_PROBER=false
|
||||
GRUB_DISABLE_OS_PROBER=false
|
||||
|
|
|
|||
3
grub/sbat.csv
Normal file
3
grub/sbat.csv
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
|
||||
grub,1,Free Software Foundation,grub,%PKGVER%,https//www.gnu.org/software/grub/
|
||||
grub.arch,1,Arch Linux,grub,%PKGVER%,https://archlinux.org/packages/core/x86_64/grub/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
real 9m36.002s
|
||||
user 8m29.848s
|
||||
sys 0m55.808s
|
||||
real 8m0.553s
|
||||
user 7m13.665s
|
||||
sys 0m45.978s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue