Author: dim
Date: Fri May 13 16:35:37 2016
New Revision: 299684
URL: https://svnweb.freebsd.org/changeset/base/299684

Log:
  After r299241, which added bhnd(4), use sh to run the shell scripts for
  generating nvram maps, to allow a noexec-mounted source directory.
  
  Reported by:  Johan Hendriks <[email protected]>
  PR:           209435

Modified:
  head/sys/conf/files
  head/sys/conf/kmod.mk

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri May 13 16:03:50 2016        (r299683)
+++ head/sys/conf/files Fri May 13 16:35:37 2016        (r299684)
@@ -10,13 +10,13 @@ acpi_quirks.h                       optional acpi           
                   \
        no-obj no-implicit-rule before-depend                              \
        clean           "acpi_quirks.h"
 bhnd_nvram_map.h               optional bhndbus | bhnd                    \
-       dependency      "$S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
-       compile-with    "$S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/nvram/nvram_map -h" \
+       dependency      "sh $S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
+       compile-with    "sh $S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/nvram/nvram_map -h" \
        no-obj no-implicit-rule before-depend                              \
        clean           "bhnd_nvram_map.h"
 bhnd_nvram_map_data.h          optional bhndbus | bhnd                    \
-       dependency      "$S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
-       compile-with    "$S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/nvram/nvram_map -d" \
+       dependency      "sh $S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
+       compile-with    "sh $S/dev/bhnd/tools/nvram_map_gen.sh 
$S/dev/bhnd/nvram/nvram_map -d" \
        no-obj no-implicit-rule before-depend                              \
        clean           "bhnd_nvram_map_data.h"
 #

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk       Fri May 13 16:03:50 2016        (r299683)
+++ head/sys/conf/kmod.mk       Fri May 13 16:35:37 2016        (r299684)
@@ -417,7 +417,7 @@ bhnd_nvram_map.h: ${SYSDIR}/dev/bhnd/too
     ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
     ${SYSDIR}/dev/bhnd/nvram/nvram_map
 bhnd_nvram_map.h:
-       ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
+       sh ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
            ${SYSDIR}/dev/bhnd/nvram/nvram_map -h
 .endif
 
@@ -427,7 +427,7 @@ bhnd_nvram_map_data.h: ${SYSDIR}/dev/bhn
     ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
     ${SYSDIR}/dev/bhnd/nvram/nvram_map
 bhnd_nvram_map_data.h:
-       ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
+       sh ${SYSDIR}/dev/bhnd/tools/nvram_map_gen.sh \
            ${SYSDIR}/dev/bhnd/nvram/nvram_map -d
 .endif
 
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to