Attachment 159122 Details for Bug 183765 – remove menu.rc and loader.rc install guards

[patch] remove menu.rc and loader.rc install guards

rcguards.diff (text/plain), 3.62 KB, created by Nikolai Lifanov on 2015-07-23 19:59:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2015-07-23 19:59:22 UTC

Size: 3.62 KB

patch

obsolete

>Index: sys/boot/i386/loader/Makefile
>===================================================================
>--- sys/boot/i386/loader/Makefile	(revision 285819)
>+++ sys/boot/i386/loader/Makefile	(working copy)
>@@ -110,13 +110,8 @@
> .include	"${.CURDIR}/../../forth/Makefile.inc"
> FILES+=	pcibios.4th
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+=	loader.rc
>+FILES+=	loader.rc menu.rc
> .endif
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-.endif
> 
> # XXX crt0.o needs to be first for pxeboot(8) to work
> OBJS=	${BTXCRT}
>Index: sys/boot/mips/beri/loader/Makefile
>===================================================================
>--- sys/boot/mips/beri/loader/Makefile	(revision 285819)
>+++ sys/boot/mips/beri/loader/Makefile	(working copy)
>@@ -125,14 +125,8 @@
> .PATH: ${.CURDIR}/../../../forth
> .include	"${.CURDIR}/../../../forth/Makefile.inc"
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+= loader.rc
>-.endif
>+FILES+= loader.rc menu.rc
> 
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-
> .if defined(LOADER_USB_SUPPORT)
> # Do garbage collection
> CFLAGS+= -ffunction-sections -fdata-sections
>Index: sys/boot/pc98/loader/Makefile
>===================================================================
>--- sys/boot/pc98/loader/Makefile	(revision 285819)
>+++ sys/boot/pc98/loader/Makefile	(working copy)
>@@ -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: sys/boot/powerpc/kboot/Makefile
>===================================================================
>--- sys/boot/powerpc/kboot/Makefile	(revision 285819)
>+++ sys/boot/powerpc/kboot/Makefile	(working copy)
>@@ -117,12 +117,6 @@
> .PATH: ${.CURDIR}/../../forth
> .include	"${.CURDIR}/../../forth/Makefile.inc"
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+= loader.rc
>-.endif
>+FILES+= loader.rc menu.rc
> 
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-
> .include <bsd.prog.mk>
>Index: sys/boot/powerpc/ofw/Makefile
>===================================================================
>--- sys/boot/powerpc/ofw/Makefile	(revision 285819)
>+++ sys/boot/powerpc/ofw/Makefile	(working copy)
>@@ -112,12 +112,6 @@
> .PATH: ${.CURDIR}/../../forth
> .include	"${.CURDIR}/../../forth/Makefile.inc"
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+= loader.rc
>-.endif
>+FILES+= loader.rc menu.rc
> 
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-
> .include <bsd.prog.mk>
>Index: sys/boot/powerpc/ps3/Makefile
>===================================================================
>--- sys/boot/powerpc/ps3/Makefile	(revision 285819)
>+++ sys/boot/powerpc/ps3/Makefile	(working copy)
>@@ -114,12 +114,6 @@
> .PATH: ${.CURDIR}/../../forth
> .include	"${.CURDIR}/../../forth/Makefile.inc"
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+= loader.rc
>-.endif
>+FILES+= loader.rc menu.rc
> 
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-
> .include <bsd.prog.mk>
>Index: sys/boot/sparc64/loader/Makefile
>===================================================================
>--- sys/boot/sparc64/loader/Makefile	(revision 285819)
>+++ sys/boot/sparc64/loader/Makefile	(working copy)
>@@ -99,12 +99,6 @@
> .PATH: ${.CURDIR}/../../forth
> .include	"${.CURDIR}/../../forth/Makefile.inc"
> 
>-.if !exists(${DESTDIR}/boot/loader.rc)
>-FILES+= loader.rc
>-.endif
>+FILES+= loader.rc menu.rc
> 
>-.if !exists(${DESTDIR}/boot/menu.rc)
>-FILES+= menu.rc
>-.endif
>-
> .include <bsd.prog.mk>

Actions: View | Diff

Attachments on bug 183765: 155127 | 159122