ソースを参照

remove env command and just add sbin dirs to RVPATH, update build.sh

Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
Stephen L Arnold 3 年 前
コミット
d8a6f7a896
2 ファイル変更10 行追加6 行削除
  1. 5 5
      Makefile
  2. 5 1
      build.sh

+ 5 - 5
Makefile

@@ -13,7 +13,7 @@ buildroot_initramfs_wrkdir := $(wrkdir)/buildroot_initramfs
 
 # TODO: make RISCV be able to be set to alternate toolchain path
 RISCV ?= $(buildroot_initramfs_wrkdir)/host
-RVPATH ?= $(RISCV)/bin:$(PATH)
+RVPATH ?= $(RISCV)/bin:/usr/sbin:/sbin:$(PATH)
 target ?= riscv64-buildroot-linux-gnu
 
 CROSS_COMPILE ?= $(RISCV)/bin/$(target)-
@@ -314,10 +314,10 @@ qemu-rootfs: $(qemu) $(bbl) $(vmlinux) $(initramfs) $(rootfs)
 uboot: $(uboot)
 
 # disk tools
-MKFS_VFAT ?= /usr/bin/env mkfs.vfat
-MKFS_EXT4 ?= /usr/bin/env mkfs.ext4
-PARTPROBE ?= /usr/bin/env partprobe
-SGDISK ?= /usr/bin/env sgdisk
+MKFS_VFAT ?= mkfs.vfat
+MKFS_EXT4 ?= mkfs.ext4
+PARTPROBE ?= partprobe
+SGDISK ?= sgdisk
 
 # Relevant partition type codes
 BBL		= 2E54B353-1271-4842-806F-E436D6AF6985

+ 5 - 1
build.sh

@@ -8,4 +8,8 @@ make distclean || true
 git submodule sync
 git submodule update --recursive --init
 
-make -j${CORES}
+make MKFS_VFAT="/sbin/mkfs.vfat" \
+    MKFS_EXT4="/sbin/mkfs.ext4" \
+    PARTPROBE="/sbin/partprobe" \
+    SGDISK="/sbin/sgdisk" \
+    -j${CORES}