splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: call it nvmutil in makefile

Browse Source 
a package manager by the name "nvm" exists, as
i discovered.

this is a courtesy to them.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-08 01:07:03 +00:00
parent 6203f3ae61
commit 1d17a8ffcf
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/inject.sh
View File

@@ -6,7 +6,7 @@
cbcfgsdir="config/coreboot" cbcfgsdir="config/coreboot"
tmpromdel="$XBMK_CACHE/DO_NOT_FLASH" tmpromdel="$XBMK_CACHE/DO_NOT_FLASH"
nvm="util/nvmutil/nvm" nvmutil="util/nvmutil/nvmutil"
ifdtool="elf/coreboot/default/ifdtool" ifdtool="elf/coreboot/default/ifdtool"
checkvars="CONFIG_GBE_BIN_PATH" checkvars="CONFIG_GBE_BIN_PATH"
@@ -200,13 +200,13 @@ modify_mac()
x_ make -C util/nvmutil clean x_ make -C util/nvmutil clean
x_ make -C util/nvmutil x_ make -C util/nvmutil
x_ "$nvm" "$xbtmp/gbe" setmac "$new_mac" x_ "$nvmutil" "$xbtmp/gbe" setmac "$new_mac"
fi fi
fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
printf "\nThe following GbE NVM data will be written:\n" printf "\nThe following GbE NVM data will be written:\n"
x_ "$nvm" "$xbtmp/gbe" dump | grep -v "bytes read from file" || : x_ "$nvmutil" "$xbtmp/gbe" dump | grep -v "bytes read from file" || :
} }
newmac() newmac()

23
util/nvmutil/Makefile
View File

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2022,2025 Leah Rowe <leah@libreboot.org> # SPDX-FileCopyrightText: 2022,2026 Leah Rowe <leah@libreboot.org>
# SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com> # SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com>
CC?=cc CC?=cc
@@ -8,17 +8,28 @@ DESTDIR?=
PREFIX?=/usr/local PREFIX?=/usr/local
INSTALL?=install INSTALL?=install
# nvm is the old binary name,
# but it was renamed to nvmutil
# to avoid conflict with a certain
# package manager by that name!
nvm: nvmutil.c nvm: nvmutil.c
$(CC) $(CFLAGS) nvmutil.c -o nvm rm -f nvm
$(CC) $(CFLAGS) nvmutil.c -o nvmutil
install: install:
$(INSTALL) nvm $(DESTDIR)$(PREFIX)/bin/nvm $(INSTALL) nvmutil $(DESTDIR)$(PREFIX)/bin/nvmutil
# do not delete *bin/nvm because
# there is a package manager by
# that name. this makefile now
# treats nvmutil as the binary
uninstall: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/nvm rm -f $(DESTDIR)$(PREFIX)/bin/nvmutil
distclean: distclean:
rm -f nvm rm -f nvm nvmutil
clean: clean:
rm -f nvm rm -f nvm nvmutil