bump to latest version
This commit is contained in:
Tobias Powalowski
parent
514d26f6eb
commit
d8bcb73692
61
10_archlinux
61
10_archlinux
@ -18,11 +18,38 @@
|
||||
## GNU General Public License for more details.
|
||||
##
|
||||
|
||||
_FUNC_GRUB_FILE_PRESENT() {
|
||||
|
||||
[[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86"
|
||||
|
||||
if [[ "${GRUB_PLATFORM}" == "x86" ]]; then
|
||||
check="--is-x86-linux32"
|
||||
elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then
|
||||
check="--is-i386-xen-pae-domu"
|
||||
elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then
|
||||
check="--is-x86_64-xen-domu"
|
||||
else
|
||||
check="--is-${GRUB_PLATFORM}-linux"
|
||||
fi
|
||||
|
||||
case "${GRUB_PLATFORM}" in
|
||||
x86)
|
||||
list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
|
||||
if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
|
||||
done)" ;;
|
||||
*)
|
||||
list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
|
||||
if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
|
||||
done)" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
set -e
|
||||
|
||||
prefix="/usr"
|
||||
exec_prefix="/usr"
|
||||
exec_prefix="${prefix}"
|
||||
datarootdir="/usr/share"
|
||||
datadir="${datarootdir}"
|
||||
sysconfdir="/etc"
|
||||
|
||||
. "${datarootdir}/grub/grub-mkconfig_lib"
|
||||
@ -34,13 +61,15 @@ export TEXTDOMAINDIR="${datarootdir}/locale"
|
||||
|
||||
CLASS="--class arch-linux --class arch --class gnu-linux --class gnu --class os"
|
||||
|
||||
BOOT_PART_FS_UUID="$(grub-probe --target="fs_uuid" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_HINTS_STRING="$(grub-probe --target="hints_string" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS="$(grub-probe --target="fs" "/boot" 2>/dev/null)"
|
||||
[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT
|
||||
|
||||
ROOT_PART_FS_UUID="$(grub-probe --target="fs_uuid" "/" 2>/dev/null)"
|
||||
ROOT_PART_HINTS_STRING="$(grub-probe --target="hints_string" "/" 2>/dev/null)"
|
||||
ROOT_PART_FS="$(grub-probe --target="fs" "/" 2>/dev/null)"
|
||||
BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)"
|
||||
|
||||
ROOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/" 2>/dev/null)"
|
||||
ROOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/" 2>/dev/null)"
|
||||
ROOT_PART_FS="$(${grub_probe} --target="fs" "/" 2>/dev/null)"
|
||||
|
||||
if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then
|
||||
SUBDIR="/boot"
|
||||
@ -61,7 +90,7 @@ fi
|
||||
|
||||
[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||
|
||||
for _KERNEL_ in $(ls /boot/vmlinuz-linux*) ; do
|
||||
for _KERNEL_ in ${list} ; do
|
||||
|
||||
echo "Found linux image: ${_KERNEL_}" >&2
|
||||
|
||||
@ -77,7 +106,9 @@ for _KERNEL_ in $(ls /boot/vmlinuz-linux*) ; do
|
||||
cat << EOF
|
||||
|
||||
menuentry "Arch Linux ${_KERNEL_PKG_} kernel" ${CLASS} {
|
||||
load_video
|
||||
if [ x\$feature_all_video_module = xy ]; then
|
||||
insmod all_video
|
||||
fi
|
||||
set gfxpayload=keep
|
||||
insmod ${BOOT_PART_FS}
|
||||
if [ x\$feature_platform_search_hint = xy ]; then
|
||||
@ -88,7 +119,7 @@ menuentry "Arch Linux ${_KERNEL_PKG_} kernel" ${CLASS} {
|
||||
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...'
|
||||
linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
|
||||
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel initramfs ...'
|
||||
initrd ${subdir}/${_INITRAMFS_}
|
||||
initrd ${SUBDIR}/${_INITRAMFS_}
|
||||
}
|
||||
|
||||
EOF
|
||||
@ -103,7 +134,9 @@ EOF
|
||||
cat << EOF
|
||||
|
||||
menuentry "Arch Linux ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} {
|
||||
load_video
|
||||
if [ x\$feature_all_video_module = xy ]; then
|
||||
insmod all_video
|
||||
fi
|
||||
set gfxpayload=keep
|
||||
insmod ${BOOT_PART_FS}
|
||||
if [ x\$feature_platform_search_hint = xy ]; then
|
||||
@ -114,7 +147,7 @@ menuentry "Arch Linux ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} {
|
||||
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...'
|
||||
linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
|
||||
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel fallback initramfs ...'
|
||||
initrd ${subdir}/${_INITRAMFS_FALLBACK_}
|
||||
initrd ${SUBDIR}/${_INITRAMFS_FALLBACK_}
|
||||
}
|
||||
|
||||
EOF
|
||||
@ -124,7 +157,9 @@ EOF
|
||||
cat << EOF
|
||||
|
||||
menuentry "Arch Linux ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} {
|
||||
load_video
|
||||
if [ x\$feature_all_video_module = xy ]; then
|
||||
insmod all_video
|
||||
fi
|
||||
set gfxpayload=keep
|
||||
insmod ${BOOT_PART_FS}
|
||||
if [ x\$feature_platform_search_hint = xy ]; then
|
||||
|
||||
7
PKGBUILD
7
PKGBUILD
@ -3,7 +3,7 @@
|
||||
# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
|
||||
|
||||
_pkgver="2.02"
|
||||
_GRUB_GIT_TAG="grub-2.02-beta1"
|
||||
_GRUB_GIT_TAG="grub-2.02-beta2"
|
||||
|
||||
_UNIFONT_VER="6.3.20131217"
|
||||
|
||||
@ -12,7 +12,7 @@ _UNIFONT_VER="6.3.20131217"
|
||||
|
||||
pkgname="grub"
|
||||
pkgdesc="GNU GRand Unified Bootloader (2)"
|
||||
pkgver=2.02.beta1
|
||||
pkgver=2.02.beta2
|
||||
pkgrel=1
|
||||
epoch="1"
|
||||
url="https://www.gnu.org/software/grub/"
|
||||
@ -46,13 +46,12 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
|
||||
'60_memtest86+'
|
||||
'grub.default'
|
||||
'grub.cfg')
|
||||
|
||||
md5sums=('SKIP'
|
||||
'SKIP'
|
||||
'728b7439ac733a7c0d56049adec364c7'
|
||||
'SKIP'
|
||||
'e506ae4a9f9f7d1b765febfa84e10d48'
|
||||
'b7f3fc13d5afcb1e6f7d49010025b725'
|
||||
'cc988384d9b3bfb61384342e3e1f28c3'
|
||||
'be55eabc102f2c60b38ed35c203686d6'
|
||||
'a03ffd56324520393bf574cefccb893d'
|
||||
'c8b9511586d57d6f2524ae7898397a46')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user