Fix the build package (PKG) without using buildme

This commit is contained in:
chris1111 2024-03-23 20:26:40 -04:00
parent 98c4841008
commit 1e970b0542
2 changed files with 10 additions and 2 deletions

View File

@ -222,6 +222,7 @@ Will replace your BOOTX64.efi, you can choose between several bootloader version
The first time, you'll get the menu. Choose one bootloader. The first time, you'll get the menu. Choose one bootloader.
The next times, it'll immediately load the bootloader you chose before. The next times, it'll immediately load the bootloader you chose before.
When you need the menu back, just boot your computer with a key pressed. When you need the menu back, just boot your computer with a key pressed.
INSTALL ONLY FROM BUILDME !!!
INSTALL ONLY IF YOU KNOW WHAT YOU ARE DOING !!! INSTALL ONLY IF YOU KNOW WHAT YOU ARE DOING !!!
More infos https://github.com/jief666/BootloaderChooser. "; More infos https://github.com/jief666/BootloaderChooser. ";

View File

@ -1418,6 +1418,7 @@ fi
# build BootLoaderChooser # build BootLoaderChooser
if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"* ]]; then if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"* ]]; then
echo "===================== BootLoaderChooser =====================" echo "===================== BootLoaderChooser ====================="
BLC_Dir="${SRCROOT}/BootLoaderChooser"
local BLC_Dir="${SRCROOT}"/BootLoaderChooser local BLC_Dir="${SRCROOT}"/BootLoaderChooser
local BLC_Dest='/EFI/BOOT' local BLC_Dest='/EFI/BOOT'
@ -1431,11 +1432,17 @@ if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"*
--subst="INSTALLER_CHOICE=$packageRefId" \ --subst="INSTALLER_CHOICE=$packageRefId" \
BootLoaderChooser BootLoaderChooser
buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Private/tmp/EFIROOTDIR" buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Private/tmp/EFIROOTDIR"
if [ -d "$BLC_Dir" ]; then
addChoice --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')" \ addChoice --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')" \
--pkg-refs="$packageRefId" "${choiceId}" --pkg-refs="$packageRefId" "${choiceId}"
echo " **** Option usable with buildme only ****"
else else
addChoice --start-visible="true" --start-selected="false" \
addChoice --start-visible="false" --start-selected="false" \
--pkg-refs="$packageRefId" "${choiceId}" --pkg-refs="$packageRefId" "${choiceId}"
fi
# End BootLoaderChooser # End BootLoaderChooser
fi fi