diff options
| author | gonzo <gonzo@FreeBSD.org> | 2013-06-21 18:16:54 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2013-06-21 18:16:54 +0000 |
| commit | df388a8521da97e28c1c7e9c490fd68e6f80eb9e (patch) | |
| tree | 780fd0f0939accb23eda82f5fb7b470c33c09bee | |
| parent | 8d3f5f270f62e1ca418f0b0b69ede89ac0c31511 (diff) | |
| download | FreeBSD-src-df388a8521da97e28c1c7e9c490fd68e6f80eb9e.zip FreeBSD-src-df388a8521da97e28c1c7e9c490fd68e6f80eb9e.tar.gz | |
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>
| -rw-r--r-- | sys/conf/files | 8 | ||||
| -rw-r--r-- | sys/modules/runfw/Makefile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files index 8ec5994..ed0eba9 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/modules/runfw/Makefile b/sys/modules/runfw/Makefile index 320a624..c6e7884 100644 --- a/sys/modules/runfw/Makefile +++ b/sys/modules/runfw/Makefile @@ -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> |
