summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild2
-rwxr-xr-xscript/roms12
2 files changed, 6 insertions, 8 deletions
diff --git a/build b/build
index 1cb93f84..aa892d0e 100755
--- a/build
+++ b/build
@@ -71,8 +71,6 @@ install_packages()
printf "You must install AUR packages: %s\n" "$aur_notice" 1>&2
}
-# release archives contain .gitignore, but not .git.
-# xbmk can be run from xbmk.git, or an archive.
git_init()
{
[ -L ".git" ] && $err "Reference .git is a symlink"
diff --git a/script/roms b/script/roms
index 66d6134d..e18bdf17 100755
--- a/script/roms
+++ b/script/roms
@@ -313,7 +313,7 @@ build_seabios_roms()
newrom="${romdir}/seabios_${board}_${initmode}_${displaymode}"
[ "${initmode}" = "normal" ] && newrom="${romdir}/seabios" \
&& newrom="${newrom}_${board}_${initmode}"
- x_ moverom "${t}" "${newrom}.rom"
+ x_ copyrom "${t}" "${newrom}.rom"
fi
x_ rm -f "${t}"
}
@@ -377,14 +377,14 @@ build_grub_roms()
[ "${initmode}" = "normal" ] && \
newrom="${romdir}/${payload1}_${board}_" && \
newrom="${newrom}${initmode}_${keymap}.rom"
- x_ moverom "${tmpgrubrom}" "${newrom}"
+ x_ copyrom "${tmpgrubrom}" "${newrom}"
if [ "${payload_seabios_grubonly}" = "y" ]; then
x_ "$cbfstool" "$tmpgrubrom" add \
-f "config/grub/bootorder" -n bootorder -t raw
- x_ moverom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
+ x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \
-n etc/show-boot-menu
- x_ moverom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom"
+ x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom"
fi
x_ rm -f "${tmpgrubrom}"
done
@@ -418,7 +418,7 @@ build_uboot_roms()
tmprom=$(mkUbootRom "${cbrom}" "fallback/payload") || \
$err "build_uboot_roms $board: could not create tmprom"
newrom="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom"
- x_ moverom "${tmprom}" "${newrom}"
+ x_ copyrom "${tmprom}" "${newrom}"
x_ rm -f "${tmprom}"
}
@@ -441,7 +441,7 @@ mkUbootRom() {
printf "%s\n" "${tmprom}"
}
-moverom()
+copyrom()
{
printf "Creating target image: %s\n" "$2"