* config.h.in (GRUB_TARGET_CPU): New definition.
(GRUB_PLATFORM): Likewise.
* configure.ac: Define GRUB_TARGET_CPU and GRUB_PLATFORM.
* grub-core/commands/parttool.c (grub_cmd_parttool): Update dir.
* grub-core/efiemu/main.c (grub_efiemu_autocore): Likewise.
* grub-core/kern/dl.c (grub_dl_load): Likewise.
* grub-core/normal/autofs.c (read_fs_list): Likewise.
* grub-core/normal/crypto.c (read_crypto_list): Likewise.
* grub-core/normal/dyncmd.c (read_command_list): Likewise.
* grub-core/normal/term.c (read_terminal_list): Likewise.
* grub-core/gettext/gettext.c (grub_mofile_open_lang): Use
$prefix/locale.
(grub_gettext_init_ext): Likewise.
* grub-core/normal/main.c (GRUB_MOD_INIT): Define grub_cpu and
grub_platform.
* util/grub-install.in: Update directories.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
+2012-02-04 Vladimir Serbinenko <phcoder@gmail.com>
+
+ Move platform-dependent files from $prefix to $prefix/$platform.
+
+ * config.h.in (GRUB_TARGET_CPU): New definition.
+ (GRUB_PLATFORM): Likewise.
+ * configure.ac: Define GRUB_TARGET_CPU and GRUB_PLATFORM.
+ * grub-core/commands/parttool.c (grub_cmd_parttool): Update dir.
+ * grub-core/efiemu/main.c (grub_efiemu_autocore): Likewise.
+ * grub-core/kern/dl.c (grub_dl_load): Likewise.
+ * grub-core/normal/autofs.c (read_fs_list): Likewise.
+ * grub-core/normal/crypto.c (read_crypto_list): Likewise.
+ * grub-core/normal/dyncmd.c (read_command_list): Likewise.
+ * grub-core/normal/term.c (read_terminal_list): Likewise.
+ * grub-core/gettext/gettext.c (grub_mofile_open_lang): Use
+ $prefix/locale.
+ (grub_gettext_init_ext): Likewise.
+ * grub-core/normal/main.c (GRUB_MOD_INIT): Define grub_cpu and
+ grub_platform.
+ * util/grub-install.in: Update directories.
+ * util/grub-mknetdir.in: Likewise.
+ * util/grub-mkrescue.in: Likewise.
+
2012-02-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/openfw.c (grub_claimmap): Change to
/* Define to 1 to enable disk cache statistics. */
#define DISK_CACHE_STATS @DISK_CACHE_STATS@
+#define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
+#define GRUB_PLATFORM "@GRUB_PLATFORM@"
+
#define RE_ENABLE_I18N 1
#if defined(__i386__)
TARGET_CPP="$TARGET_CC -E"
TARGET_CCAS=$TARGET_CC
+GRUB_TARGET_CPU="${target_cpu}"
+GRUB_PLATFORM="${platform}"
+
+AC_SUBST(GRUB_TARGET_CPU)
+AC_SUBST(GRUB_PLATFORM)
+
AC_SUBST(OBJCONV)
AC_SUBST(TARGET_CPP)
AC_SUBST(TARGET_CCAS)
{
char *filename;
- filename = grub_xasprintf ("%s/parttool.lst", prefix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM
+ "/parttool.lst", prefix);
if (filename)
{
grub_file_t file;
suffix = grub_efiemu_get_default_core_name ();
- filename = grub_xasprintf ("%s/%s", prefix, suffix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM "/%s",
+ prefix, suffix);
if (! filename)
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
"couldn't allocate temporary space");
-
err = grub_efiemu_load_file (filename);
grub_free (filename);
if (err)
/* Returning grub_file_t would be more natural, but grub_mofile_open assigns
to fd_mo anyway ... */
static grub_err_t
-grub_mofile_open_lang (const char *locale_dir, const char *locale)
+grub_mofile_open_lang (const char *part1, const char *part2, const char *locale)
{
char *mo_file;
grub_err_t err;
/* mo_file e.g.: /boot/grub/locale/ca.mo */
- mo_file = grub_xasprintf ("%s/%s.mo", locale_dir, locale);
+ mo_file = grub_xasprintf ("%s%s/%s.mo", part1, part2, locale);
if (!mo_file)
return grub_errno;
static grub_err_t
grub_gettext_init_ext (const char *locale)
{
- const char *locale_dir;
+ const char *part1, *part2;
grub_err_t err;
if (!locale)
return 0;
- locale_dir = grub_env_get ("locale_dir");
- if (locale_dir == NULL)
+ part1 = grub_env_get ("locale_dir");
+ part2 = "";
+ if (!part1)
{
- grub_dprintf ("gettext", "locale_dir variable is not set up.\n");
- return 0;
+ part1 = grub_env_get ("prefix");
+ if (!part1)
+ return 0;
+ part2 = "/locale";
}
- err = grub_mofile_open_lang (locale_dir, locale);
+ err = grub_mofile_open_lang (part1, part2, locale);
/* ll_CC didn't work, so try ll. */
if (err)
{
*underscore = '\0';
grub_errno = GRUB_ERR_NONE;
- err = grub_mofile_open_lang (locale_dir, lang);
+ err = grub_mofile_open_lang (part1, part2, lang);
}
grub_free (lang);
return 0;
}
- filename = grub_xasprintf ("%s/%s.mod", grub_dl_dir, name);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM "/%s.mod",
+ grub_dl_dir, name);
if (! filename)
return 0;
{
char *filename;
- filename = grub_xasprintf ("%s/fs.lst", prefix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM
+ "/fs.lst", prefix);
if (filename)
{
grub_file_t file;
return;
}
- filename = grub_xasprintf ("%s/crypto.lst", prefix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM
+ "/crypto.lst", prefix);
if (!filename)
{
grub_errno = GRUB_ERR_NONE;
{
char *filename;
- filename = grub_xasprintf ("%s/command.lst", prefix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM
+ "/command.lst", prefix);
if (filename)
{
grub_file_t file;
grub_env_set (features[i], "y");
grub_env_export (features[i]);
}
+ grub_env_set ("grub_cpu", GRUB_TARGET_CPU);
+ grub_env_export ("grub_cpu");
+ grub_env_set ("grub_platform", GRUB_PLATFORM);
+ grub_env_export ("grub_platform");
}
GRUB_MOD_FINI(normal)
return;
}
- filename = grub_xasprintf ("%s/terminal.lst", prefix);
+ filename = grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM
+ "/terminal.lst", prefix);
if (!filename)
{
grub_errno = GRUB_ERR_NONE;
# Create the GRUB directory if it is not present.
mkdir -p "$grubdir" || exit 1
+mkdir -p "$grubdir/${target_cpu}-$platform" || exit 1
# If --recheck is specified, remove the device map, if present.
if test $recheck = yes; then
fi
# Copy the GRUB images to the GRUB directory.
-for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
+for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o "${grubdir}"/${target_cpu}-$platform/*.mod "${grubdir}"/${target_cpu}-$platform/*.lst "${grubdir}"/${target_cpu}-$platform/*.img "${grubdir}"/${target_cpu}-$platform/efiemu??.o; do
if test -f "$file" && [ "`basename $file`" != menu.lst ]; then
rm -f "$file" || exit 1
fi
done
for file in "${pkglibdir}"/*.mod "${pkglibdir}"/*.lst; do
- cp -f "$file" "${grubdir}" || exit 1
+ cp -f "$file" "${grubdir}/${target_cpu}-$platform" || exit 1
done
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
for file in "${pkglibdir}"/*.img "${pkglibdir}"/efiemu??.o; do
if test -f "$file"; then
- cp -f "$file" "${grubdir}" || exit 1
+ cp -f "$file" "${grubdir}/${target_cpu}-$platform" || exit 1
fi
done
fi
fi
done
-is_path_readable_by_grub "${grubdir}" || (echo "${grubdir}" not readable 1>&2 ; exit 1)
+is_path_readable_by_grub "${grubdir}/${target_cpu}-$platform" || (echo "${grubdir}" not readable 1>&2 ; exit 1)
# Write device to a variable so we don't have to traverse /dev every time.
grub_device="`"$grub_probe" --device-map="${device_map}" --target=device "${grubdir}"`" || exit 1
prefix_drive=
config_opt=
-rm -f "${grubdir}/load.cfg"
+rm -f "${grubdir}/${target_cpu}-$platform/load.cfg"
if [ "x${debug_image}" != x ]; then
- echo "set debug='${debug_image}'" >> "${grubdir}/load.cfg"
- config_opt="-c ${grubdir}/load.cfg "
+ echo "set debug='${debug_image}'" >> "${grubdir}/${target_cpu}-$platform/load.cfg"
+ config_opt="-c ${grubdir}/${target_cpu}-$platform/load.cfg "
fi
if [ "x${devabstraction_module}" = "x" ] ; then
echo 1>&2
hints=
fi
- echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/load.cfg"
- echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/load.cfg"
- config_opt="-c ${grubdir}/load.cfg "
+ echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${target_cpu}-$platform/load.cfg"
+ echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/${target_cpu}-$platform/load.cfg"
+ config_opt="-c ${grubdir}/${target_cpu}-$platform/load.cfg "
modules="$modules search_fs_uuid"
else
# we need to hardcode the partition number in the core image's prefix.
else
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
for uuid in "`echo "${grub_device}" | xargs "${grub_probe}" --target=cryptodisk_uuid --device`"; do
- echo "cryptomount -u $uuid" >> "${grubdir}/load.cfg"
+ echo "cryptomount -u $uuid" >> "${grubdir}/${target_cpu}-$platform/load.cfg"
done
- config_opt="-c ${grubdir}/load.cfg "
+ config_opt="-c ${grubdir}/${target_cpu}-$platform/load.cfg "
fi
prefix_drive=`"$grub_probe" --device-map="${device_map}" --target=drive --device "${grub_device}"` || exit 1
esac
-"$grub_mkimage" ${config_opt} -d "${pkglibdir}" -O ${mkimage_target} --output="${grubdir}/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $modules || exit 1
+"$grub_mkimage" ${config_opt} -d "${pkglibdir}" -O ${mkimage_target} --output="${grubdir}/${target_cpu}-$platform/core.${imgext}" --prefix="${prefix_drive}${relative_grubdir}" $modules || exit 1
# Backward-compatibility kludges
if [ "${target_cpu}-${platform}" = "mipsel-loongson" ]; then
- cp "${grubdir}/core.${imgext}" "${bootdir}"/grub.elf
+ cp "${grubdir}/${target_cpu}-$platform/core.${imgext}" "${bootdir}"/grub.elf
elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
- cp "${grubdir}/core.${imgext}" "${grubdir}/grub"
+ cp "${grubdir}/${target_cpu}-$platform/core.${imgext}" "${grubdir}/grub"
elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform}" = "x86_64-efi" ]; then
- "$grub_mkimage" ${config_opt} -d "${pkglibdir}" -O ${mkimage_target} --output="${grubdir}/grub.efi" --prefix="" $modules || exit 1
+ "$grub_mkimage" ${config_opt} -d "${pkglibdir}" -O ${mkimage_target} --output="${grubdir}/${target_cpu}-$platform/grub.efi" --prefix="" $modules || exit 1
fi
# Perform the platform-dependent install
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
# Now perform the installation.
- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}" \
+ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${target_cpu}-$platform" \
--device-map="${device_map}" "${install_device}" || exit 1
elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
if [ x"$update_nvram" = xyes ]; then
}
# Point boot-device at the new grub install
- boot_device="$ofpath:$partno,"`"$grub_mkrelpath" "${grubdir}/core.${imgext}" | sed 's,/,\\\\,g'`
+ boot_device="$ofpath:$partno,"`"$grub_mkrelpath" "${grubdir}/${target_cpu}-$platform/core.${imgext}" | sed 's,/,\\\\,g'`
# If a install device is defined, copy the core.elf to PReP partition.
if [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ] \
if [ "$(file -s "${install_device}" -b | awk '{ print $1 }')" = ELF ] || [ $(cmp /dev/zero "${install_device}" &>/dev/null) ]; then
# Change boot device to the harddisk root
boot_device="$ofpath"
- dd if="${grubdir}/core.${imgext}" of="${install_device}" status=noxfer || {
+ dd if="${grubdir}/${target_cpu}-$platform/core.${imgext}" of="${install_device}" status=noxfer || {
gettext "Failed to copy Grub to the PReP partition." 1>&2
echo 1>&2
exit 1
}
fi
elif [ x"${target_cpu}-${platform}" = xmips-arc ]; then
- dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/core.${imgext}" grub
+ dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/${target_cpu}-$platform/core.${imgext}" grub
gettext "You will have to set SystemPartition and OSLoader manually." 1>&2
echo 1>&2
elif [ x"$platform" = xefi ]; then
- cp "${grubdir}/core.${imgext}" "${efidir}/${efi_file}"
+ cp "${grubdir}/${target_cpu}-$platform/core.${imgext}" "${efidir}/${efi_file}"
# For old macs. Suggested by Peter Jones.
if [ x$target_cpu = xi386 ]; then
- cp "${grubdir}/core.${imgext}" "${efidir}/boot.efi"
+ cp "${grubdir}/${target_cpu}-$platform/core.${imgext}" "${efidir}/boot.efi"
fi
# Try to make this image bootable using the EFI Boot Manager, if available.
config_opt="-c ${grubdir}/load.cfg "
fi
- prefix="/${subdir}/${platform}";
+ prefix="/${subdir}";
case "${platform}" in
i386-pc) mkimage_target=i386-pc-pxe;
netmodules="pxe";
{
input_dir="$1"
platform="$2"
- mkdir -p ${iso9660_dir}/boot/grub/${platform}
+ mkdir -p "${iso9660_dir}/boot/grub/${platform}"
for file in "${input_dir}/"*.mod "${input_dir}/"efiemu32.o "${input_dir}/"efiemu64.o; do
if test -f "$file"; then
- cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
+ cp -f "$file" "${iso9660_dir}/boot/grub/${platform}/"
fi
done
for file in ${pkglib_DATA}; do
if test -f "${input_dir}/${file}"; then
- cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
+ cp -f "${input_dir}/${file}" "${iso9660_dir}/boot/grub/${platform}/"
fi
done
- mkdir -p ${iso9660_dir}/boot/grub/locale
- for file in ${input_dir}/po/*.mo; do
+ mkdir -p "${iso9660_dir}/boot/grub/locale"
+ for file in "${input_dir}"/po/*.mo; do
if test -f "$file"; then
cp -f "$file" ${iso9660_dir}/boot/grub/locale/
fi
gettext_printf "Enabling %s support ...\n" "$2"
- memdisk_img=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
- memdisk_dir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
- mkdir -p ${memdisk_dir}/boot/grub
+ memdisk_img="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
+ memdisk_dir="`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
+ mkdir -p "${memdisk_dir}/boot/grub"
- cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
+ (cat << EOF
search --fs-uuid --set=root ${iso_uuid}
-set prefix=(\${root})/boot/grub/${platform}
-source \$prefix/grub.cfg
+set prefix=(\${root})/boot/grub
EOF
- (for i in $(cat ${source_directory}/partmap.lst) ${modules} ; do
+ for i in $(cat "${source_directory}/partmap.lst") ${modules} ; do
echo "insmod $i"
done ; \
- echo "source /boot/grub/grub.cfg") \
- > ${iso9660_dir}/boot/grub/${platform}/grub.cfg
+ echo "source \$prefix/grub.cfg") \
+ > "${memdisk_dir}/boot/grub/grub.cfg"
(cd "${memdisk_dir}"; tar -cf - boot) > "${memdisk_img}"
- rm -rf ${memdisk_dir}
- $grub_mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
+ rm -rf "${memdisk_dir}"
+ "$grub_mkimage" -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
search iso9660 configfile normal memdisk tar $4
- rm -rf ${memdisk_img}
+ rm -rf "${memdisk_img}"
}
if [ "${override_dir}" = "" ] ; then
# build BIOS core.img
if test -e "${pc_dir}" ; then
gettext_printf "Enabling %s support ...\n" "BIOS"
- core_img=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
- $grub_mkimage -O i386-pc -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
- iso9660 biosdisk
- cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
+ load_cfg="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`"
+ core_img="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
+
+ (for i in $(cat "${pc_dir}/partmap.lst") ${modules} ; do
+ echo "insmod $i"
+ done ;) > "${load_cfg}"
- embed_img=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
- cat ${pc_dir}/boot.img ${core_img} > ${embed_img}
+ "$grub_mkimage" -O i386-pc -d "${pc_dir}/" -o "${core_img}" -c "$load_cfg" --prefix=/boot/grub \
+ iso9660 biosdisk
+ cat "${pc_dir}/cdboot.img" "${core_img}" > "${iso9660_dir}/boot/grub/i386-pc/eltorito.img"
- rm -f ${core_img}
+ embed_img="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
+ cat "${pc_dir}/boot.img" "${core_img}" > "${embed_img}"
- (for i in $(cat ${pc_dir}/partmap.lst) ${modules} ; do
- echo "insmod $i"
- done ; \
- echo "source /boot/grub/grub.cfg") \
- > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg
+ rm -f $"{core_img}"
grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -no-emul-boot -boot-info-table \
--embedded-boot ${embed_img}"
fi
# build iso image
-"${xorriso}" -as mkisofs -graft-points ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
-rm -rf ${iso9660_dir}
+"${xorriso}" -as mkisofs -graft-points ${grub_mkisofs_arguments} --protective-msdos-label -o "${output_image}" -r "${iso9660_dir}" --sort-weight 0 / --sort-weight 1 /boot ${source}
+rm -rf "${iso9660_dir}"
-rm -f ${embed_img}
+rm -f "${embed_img}"
exit 0