Author: gonzo
Date: Fri Jun 21 18:16:54 2013
New Revision: 252064
URL: http://svnweb.freebsd.org/changeset/base/252064
Log:
Rename run(4) firmware file from runfw to run.fw. Previous name was the
same as top-level target name for "device runfw" kernel option and
caused cyclic dependancy that lead to kernel build breakage
Module change is not strictly required and done for name unification sake
PR: conf/175751
Submitted by: Issei <i10a at herbmint.jp>
Modified:
head/sys/conf/files
head/sys/modules/runfw/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Jun 21 17:36:33 2013 (r252063)
+++ head/sys/conf/files Fri Jun 21 18:16:54 2013 (r252064)
@@ -2284,19 +2284,19 @@ dev/usb/net/uhso.c optional uhso
dev/usb/wlan/if_rum.c optional rum
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw
\
- compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw
-c${.TARGET}" \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw
-c${.TARGET}" \
no-implicit-rule before-depend local
\
clean "runfw.c"
runfw.fwo optional runfw
\
- dependency "runfw"
\
+ dependency "run.fw"
\
compile-with "${NORMAL_FWO}"
\
no-implicit-rule
\
clean "runfw.fwo"
-runfw optional runfw
\
+run.fw optional runfw
\
dependency "$S/contrib/dev/run/rt2870.fw.uu"
\
compile-with "${NORMAL_FW}"
\
no-obj no-implicit-rule
\
- clean "runfw"
+ clean "run.fw"
dev/usb/wlan/if_uath.c optional uath
dev/usb/wlan/if_upgt.c optional upgt
dev/usb/wlan/if_ural.c optional ural
Modified: head/sys/modules/runfw/Makefile
==============================================================================
--- head/sys/modules/runfw/Makefile Fri Jun 21 17:36:33 2013
(r252063)
+++ head/sys/modules/runfw/Makefile Fri Jun 21 18:16:54 2013
(r252064)
@@ -1,11 +1,11 @@
# $FreeBSD$
KMOD= runfw
-FIRMWS= runfw:runfw:1
+FIRMWS= run.fw:runfw:1
-CLEANFILES= runfw
+CLEANFILES= run.fw
-runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
+run.fw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
uudecode -p ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
.include <bsd.kmod.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
