diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-07-10 22:14:39 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-07-10 23:11:23 +0100 |
| commit | 3263eeb6b67cf2b2290b0c4bd69b298879f1f937 (patch) | |
| tree | 04f5270d5fdc8703bea3bcf30c368eba09b5a3bd /include | |
| parent | 17f3e61a0e4fa84b78ab2951a780d6964095a052 (diff) | |
trees: general code cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/git.sh | 2 | ||||
| -rw-r--r-- | include/lib.sh | 2 | ||||
| -rw-r--r-- | include/rom.sh | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/git.sh b/include/git.sh index b0acd7dc..58f62ef3 100644 --- a/include/git.sh +++ b/include/git.sh @@ -12,7 +12,7 @@ fetch_targets() e "src/$project/$tree" d && return 0 printf "Creating %s tree %s\n" "$project" "$tree" - git_prep "$loc" "$loc" "$PWD/$cfgsdir/$tree/patches" \ + git_prep "$loc" "$loc" "$PWD/$configdir/$tree/patches" \ "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree" } diff --git a/include/lib.sh b/include/lib.sh index 52187734..2fb97c44 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -37,7 +37,7 @@ chkvars() } eval `setvars "" _nogit board xbmk_parent versiondate projectsite projectname \ - aur_notice cfgsdir datadir version relname` + aur_notice configdir datadir version relname` for fv in projectname projectsite version versiondate; do eval "[ ! -f "$fv" ] || read -r $fv < \"$fv\" || :" diff --git a/include/rom.sh b/include/rom.sh index 18770847..574b1b6c 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -29,13 +29,13 @@ mkpayload_grub() eval `setvars "" grub_modules grub_install_modules` $dry eval `setcfg "$grubdata/module/$tree"` - $dry x_ rm -f "$cdir/grub.elf" + $dry x_ rm -f "$srcdir/grub.elf" - $dry "${cdir}/grub-mkstandalone" --grub-mkimage="${cdir}/grub-mkimage" \ - -O i386-coreboot -o "${cdir}/grub.elf" -d "${cdir}/grub-core/" \ + $dry "$srcdir/grub-mkstandalone" --grub-mkimage="$srcdir/grub-mkimage" \ + -O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \ --fonts= --themes= --locales= --modules="$grub_modules" \ --install-modules="$grub_install_modules" \ - "/boot/grub/grub_default.cfg=${cdir}/.config" \ + "/boot/grub/grub_default.cfg=${srcdir}/.config" \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" \ "/background.png=$grubdata/background/background1280x800.png" || \ $err "$tree: cannot build grub.elf"; return 0 @@ -44,8 +44,8 @@ mkpayload_grub() mkvendorfiles() { check_coreboot_utils "$tree" - printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" || \ - $err "!mk $cdir .coreboot-version" + printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \ + $err "!mk $srcdir .coreboot-version" [ -z "$mode" ] && [ "$target" != "$tree" ] && \ x_ ./vendor download $target; return 0 } @@ -71,7 +71,7 @@ mkcorebootbin() { [ "$target" = "$tree" ] && return 0 - tmprom="$cdir/build/coreboot.rom" + tmprom="$srcdir/build/coreboot.rom" initmode="${defconfig##*/}"; displaymode="${initmode##*_}" initmode="${initmode%%_*}" [ -n "$displaymode" ] && displaymode="_$displaymode" |