Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Aug 2015 16:07:28 +0000 (UTC)
From:      Allan Jude <allanjude@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r286368 - in head: . sys/boot/forth sys/boot/i386/loader sys/boot/mips/beri/loader sys/boot/pc98/loader sys/boot/powerpc/kboot sys/boot/powerpc/ofw sys/boot/powerpc/ps3 sys/boot/sparc64...
Message-ID:  <201508061607.t76G7SL8007270@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: allanjude
Date: Thu Aug  6 16:07:27 2015
New Revision: 286368
URL: https://svnweb.freebsd.org/changeset/base/286368

Log:
  Remove guards around overwriting loader.rc and menu.rc
  
  There have been .local version of each for user modifications for some time
  This allows users to receive future updates to these files
  
  PR:		183765
  Submitted by:	Bertram Scharpf, Nikolai Lifanov (patch)
  Reviewed by:	dteske, loos, eadler
  Approved by:	bapt (mentor)
  MFC after:	1 month
  Relnotes:	yes
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D3176

Modified:
  head/UPDATING
  head/sys/boot/forth/loader.rc
  head/sys/boot/forth/menu.rc
  head/sys/boot/i386/loader/Makefile
  head/sys/boot/mips/beri/loader/Makefile
  head/sys/boot/pc98/loader/Makefile
  head/sys/boot/powerpc/kboot/Makefile
  head/sys/boot/powerpc/ofw/Makefile
  head/sys/boot/powerpc/ps3/Makefile
  head/sys/boot/sparc64/loader/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/UPDATING	Thu Aug  6 16:07:27 2015	(r286368)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 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

Modified: head/sys/boot/forth/loader.rc
==============================================================================
--- head/sys/boot/forth/loader.rc	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/forth/loader.rc	Thu Aug  6 16:07:27 2015	(r286368)
@@ -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

Modified: head/sys/boot/forth/menu.rc
==============================================================================
--- head/sys/boot/forth/menu.rc	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/forth/menu.rc	Thu Aug  6 16:07:27 2015	(r286368)
@@ -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

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/i386/loader/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -110,12 +110,7 @@ FILESMODE_${LOADER}= ${BINMODE} -b
 .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

Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/mips/beri/loader/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -125,13 +125,7 @@ loader.help: help.common help.mips
 .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

Modified: head/sys/boot/pc98/loader/Makefile
==============================================================================
--- head/sys/boot/pc98/loader/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/pc98/loader/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -90,12 +90,7 @@ FILESMODE_${LOADER}= ${BINMODE} -b
 .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}

Modified: head/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/kboot/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/powerpc/kboot/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -117,12 +117,6 @@ loader.help: help.common help.kboot ${.C
 .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>

Modified: head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- head/sys/boot/powerpc/ofw/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/powerpc/ofw/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -112,12 +112,6 @@ loader.help: help.common help.ofw ${.CUR
 .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>

Modified: head/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- head/sys/boot/powerpc/ps3/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/powerpc/ps3/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -114,12 +114,6 @@ loader.help: help.common help.ps3 ${.CUR
 .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>

Modified: head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- head/sys/boot/sparc64/loader/Makefile	Thu Aug  6 15:30:14 2015	(r286367)
+++ head/sys/boot/sparc64/loader/Makefile	Thu Aug  6 16:07:27 2015	(r286368)
@@ -99,12 +99,6 @@ loader.help: help.common help.sparc64
 .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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508061607.t76G7SL8007270>