Page MenuHomeFreeBSD
Files F150366805

D3176.id.diff
No OneTemporary
Actions

D3176.id.diff
View Options

Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -31,6 +31,11 @@
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150806:
+ The menu.rc and loader.rc files will now be replaced during
+ upgrades. Please migrate local changes to menu.rc.local and
+ loader.rc.local instead.
+
20150805:
GNU Binutils versions of addr2line, c++filt, nm, readelf, size,
strings and strip have been removed. The src.conf(5) knob
Index: head/sys/boot/forth/loader.rc
===================================================================
--- head/sys/boot/forth/loader.rc
+++ head/sys/boot/forth/loader.rc
@@ -1,6 +1,9 @@
\ Loader.rc
\ $FreeBSD$
\
+\ You should not edit this file! Put any overrides in loader.rc.local
+\ instead as this file can be replaced during system updates.
+\
\ Includes additional commands
include /boot/loader.4th
try-include /boot/loader.rc.local
Index: head/sys/boot/forth/menu.rc
===================================================================
--- head/sys/boot/forth/menu.rc
+++ head/sys/boot/forth/menu.rc
@@ -1,6 +1,9 @@
\ Menu.rc
\ $FreeBSD$
\
+\ You should not edit this file! Put any overrides in menu.rc.local
+\ instead as this file can be replaced during system updates.
+\
\ Load required Forth modules
include /boot/version.4th
include /boot/brand.4th
Index: head/sys/boot/i386/loader/Makefile
===================================================================
--- head/sys/boot/i386/loader/Makefile
+++ head/sys/boot/i386/loader/Makefile
@@ -110,12 +110,7 @@
.include "${.CURDIR}/../../forth/Makefile.inc"
FILES+= pcibios.4th
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.endif
# XXX crt0.o needs to be first for pxeboot(8) to work
Index: head/sys/boot/mips/beri/loader/Makefile
===================================================================
--- head/sys/boot/mips/beri/loader/Makefile
+++ head/sys/boot/mips/beri/loader/Makefile
@@ -125,13 +125,7 @@
.PATH: ${.CURDIR}/../../../forth
.include "${.CURDIR}/../../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.if defined(LOADER_USB_SUPPORT)
# Do garbage collection
Index: head/sys/boot/pc98/loader/Makefile
===================================================================
--- head/sys/boot/pc98/loader/Makefile
+++ head/sys/boot/pc98/loader/Makefile
@@ -90,12 +90,7 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= ${.CURDIR}/../../i386/loader/loader.rc
-.endif
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= ${.CURDIR}/../../i386/loader/loader.rc menu.rc
# XXX crt0.o needs to be first for pxeboot(8) to work
OBJS= ${BTXCRT}
Index: head/sys/boot/powerpc/kboot/Makefile
===================================================================
--- head/sys/boot/powerpc/kboot/Makefile
+++ head/sys/boot/powerpc/kboot/Makefile
@@ -117,12 +117,6 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.include <bsd.prog.mk>
Index: head/sys/boot/powerpc/ofw/Makefile
===================================================================
--- head/sys/boot/powerpc/ofw/Makefile
+++ head/sys/boot/powerpc/ofw/Makefile
@@ -112,12 +112,6 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.include <bsd.prog.mk>
Index: head/sys/boot/powerpc/ps3/Makefile
===================================================================
--- head/sys/boot/powerpc/ps3/Makefile
+++ head/sys/boot/powerpc/ps3/Makefile
@@ -114,12 +114,6 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.include <bsd.prog.mk>
Index: head/sys/boot/sparc64/loader/Makefile
===================================================================
--- head/sys/boot/sparc64/loader/Makefile
+++ head/sys/boot/sparc64/loader/Makefile
@@ -99,12 +99,6 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 1, 2:37 PM (17 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30680260
Default Alt Text
D3176.id.diff (4 KB)

Event Timeline