GENFS -> COOKFS (they were hiding in allcaps!)

diff --git a/app-tools/cookfs.in b/app-tools/cookfs.in
index d315d791028dfa56ba48646ae4058a57532e9bb5..2c920eaa6348428a6e58d7004ea1a685650801d2 100644 (file)
--- a/app-tools/cookfs.in
+++ b/app-tools/cookfs.in
@@ -33,9 +33,9 @@
 
 set -eu
 
-: ${RUMPRUN_GENFS_CC:=!LIBEXEC_CC!}
-: ${RUMPRUN_GENFS_OBJCOPY:=!LIBEXEC_OBJCOPY!}
-: ${RUMPRUN_GENFS_INCDIR:=!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/include}
+: ${RUMPRUN_COOKFS_CC:=!LIBEXEC_CC!}
+: ${RUMPRUN_COOKFS_OBJCOPY:=!LIBEXEC_OBJCOPY!}
+: ${RUMPRUN_COOKFS_INCDIR:=!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/include}
 
 usage ()
 {
@@ -162,10 +162,10 @@ processonefile ()
        setfilevars "$f"
        ln -sf -- "${fabs}" ${LINKPATH}
 
-       ${RUMPRUN_GENFS_CC} !CFLAGS! !CPPFLAGS! -nostdlib               \
+       ${RUMPRUN_COOKFS_CC} !CFLAGS! !CPPFLAGS! -nostdlib              \
            -Wl,-r,-b,binary -o ${TMPDIR}/d${fn}.o ${LINKPATH}
 
-       ${RUMPRUN_GENFS_OBJCOPY}                                        \
+       ${RUMPRUN_COOKFS_OBJCOPY}                                       \
            --redefine-sym ${LINKPATH_BIN}_start=${rf}_start            \
            --redefine-sym ${LINKPATH_BIN}_size=${rf}_size              \
            --strip-symbol ${LINKPATH_BIN}_end                          \
@@ -231,8 +231,8 @@ exec 1>&3 3>&-
 
 unset IFS
 
-${RUMPRUN_GENFS_CC} !CFLAGS! !CPPFLAGS! -I${RUMPRUN_GENFS_INCDIR}      \
+${RUMPRUN_COOKFS_CC} !CFLAGS! !CPPFLAGS! -I${RUMPRUN_COOKFS_INCDIR}    \
     -nostdlib -Wl,-r -o ${TMPDIR}/fin.o ${TMPDIR}/d*.o ${TMPDIR}/constr.c
-${RUMPRUN_GENFS_OBJCOPY} ${LSYM} ${TMPDIR}/fin.o ${OUTFILE}
+${RUMPRUN_COOKFS_OBJCOPY} ${LSYM} ${TMPDIR}/fin.o ${OUTFILE}
 
 exit 0

diff --git a/lib/librumprunfs_base/Makefile b/lib/librumprunfs_base/Makefile
index 9b513036b38c0e2466c160b8b270f98d8b7f6496..11fd14ce60751072377498dbd192b7aac8c88a93 100644 (file)
--- a/lib/librumprunfs_base/Makefile
+++ b/lib/librumprunfs_base/Makefile
@@ -10,7 +10,7 @@ includes:
 
 dependall:
        ( cd ${.CURDIR} &&                                              \
-         RUMPRUN_GENFS_CC="${CC}" RUMPRUN_GENFS_OBJCOPY="${OBJCOPY}"   \
-           RUMPRUN_GENFS_INCDIR="${RROBJ}/dest.stage/include"          \
+         RUMPRUN_COOKFS_CC="${CC}" RUMPRUN_COOKFS_OBJCOPY="${OBJCOPY}" \
+           RUMPRUN_COOKFS_INCDIR="${RROBJ}/dest.stage/include"         \
                ${RROBJ}/app-tools/${TOOLTUPLE}-cookfs -s 1             \
                    ${MAKEOBJDIR}/librumprunfs_base.a rootfs )