Author: bdrewery
Date: Wed Jun 12 00:03:00 2019
New Revision: 348979
URL: https://svnweb.freebsd.org/changeset/base/348979

Log:
  Stop using .OODATE for extracting firmware.
  
  This fixes META_MODE rebuilding since it assumes that it this is
  a non-consistent build command. These are always unencoded consistently
  though and do not need to use the .OODATE/$? mechanism.
  
  MFC after:    2 weeks
  Reported by:  npn
  Sponsored by: DellEMC

Modified:
  head/sys/modules/iwmfw/Makefile.inc
  head/sys/modules/iwnfw/Makefile.inc
  head/sys/modules/mwlfw/Makefile
  head/sys/modules/ralfw/Makefile.inc
  head/sys/modules/rtwnfw/Makefile.inc
  head/sys/modules/usb/rsufw/Makefile.inc
  head/sys/modules/usb/runfw/Makefile

Modified: head/sys/modules/iwmfw/Makefile.inc
==============================================================================
--- head/sys/modules/iwmfw/Makefile.inc Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/iwmfw/Makefile.inc Wed Jun 12 00:03:00 2019        
(r348979)
@@ -15,4 +15,4 @@ FIRMWS=       ${_FIRM}:${KMOD}
 #FIRMWARE_LICENSE=
 
 ${_FIRM}: ${SRCTOP}/sys/contrib/dev/iwm/${_FIRM}.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}

Modified: head/sys/modules/iwnfw/Makefile.inc
==============================================================================
--- head/sys/modules/iwnfw/Makefile.inc Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/iwnfw/Makefile.inc Wed Jun 12 00:03:00 2019        
(r348979)
@@ -15,4 +15,4 @@ FIRMWS=       ${_FIRM}:${KMOD}
 #FIRMWARE_LICENSE=
 
 ${_FIRM}: ${SRCTOP}/sys/contrib/dev/iwn/${_FIRM}.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}

Modified: head/sys/modules/mwlfw/Makefile
==============================================================================
--- head/sys/modules/mwlfw/Makefile     Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/mwlfw/Makefile     Wed Jun 12 00:03:00 2019        
(r348979)
@@ -6,9 +6,9 @@ FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot
 CLEANFILES+= mw88W8363.fw mwlboot.fw
 
 mw88W8363.fw: ${SRCTOP}/sys/contrib/dev/mwl/mw88W8363.fw.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}
 
 mwlboot.fw: ${SRCTOP}/sys/contrib/dev/mwl/mwlboot.fw.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/ralfw/Makefile.inc
==============================================================================
--- head/sys/modules/ralfw/Makefile.inc Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/ralfw/Makefile.inc Wed Jun 12 00:03:00 2019        
(r348979)
@@ -12,4 +12,4 @@ CLEANFILES+=  ${_FIRM}
 FIRMWS=        ${_FIRM}:${KMOD}
 
 ${_FIRM}: ${SRCTOP}/sys/contrib/dev/ral/${_FIRM}.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}

Modified: head/sys/modules/rtwnfw/Makefile.inc
==============================================================================
--- head/sys/modules/rtwnfw/Makefile.inc        Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/rtwnfw/Makefile.inc        Wed Jun 12 00:03:00 2019        
(r348979)
@@ -12,4 +12,4 @@ FIRMWS=       ${_FIRM}:${KMOD}:111
 # FIRMWARE_LICENSE=    realtek
 
 ${_FIRM}: ${SRCTOP}/sys/contrib/dev/rtwn/${_FIRM}.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}

Modified: head/sys/modules/usb/rsufw/Makefile.inc
==============================================================================
--- head/sys/modules/usb/rsufw/Makefile.inc     Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/usb/rsufw/Makefile.inc     Wed Jun 12 00:03:00 2019        
(r348979)
@@ -12,4 +12,4 @@ FIRMWS=       ${_FIRM}:${KMOD}:120
 # FIRMWARE_LICENSE=    realtek
 
 ${_FIRM}: ${SRCTOP}/sys/contrib/dev/rsu/${_FIRM}.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}

Modified: head/sys/modules/usb/runfw/Makefile
==============================================================================
--- head/sys/modules/usb/runfw/Makefile Tue Jun 11 23:46:31 2019        
(r348978)
+++ head/sys/modules/usb/runfw/Makefile Wed Jun 12 00:03:00 2019        
(r348979)
@@ -6,6 +6,6 @@ FIRMWS= run.fw:runfw:1
 CLEANFILES=    run.fw
 
 run.fw: ${SRCTOP}/sys/contrib/dev/run/rt2870.fw.uu
-       uudecode -p $? > ${.TARGET}
+       uudecode -p ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.kmod.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to