Re: sparc64: bootblk: let bsd.prog.mk do the work
On Wed, Oct 12, 2022 at 05:55:10PM +, Klemens Nanni wrote:
> sets up CLEANFILES, build/install targets and more, so no
> need to roll them ourselves if we just set PROG and SRCS.
>
> STRIPFLAG is defined but not used and in INSTALL_STRIP is
> the magic word, so fix that.
>
> Don't replace "bootblk" wth "${PROG}" to avoid churn.
>
>
> No object change, `make' does exactly the same, `make install' got more
> explicit:
> -install -c -o root -g bin -m 644 bootblk /usr/mdec
> +install -c -o root -g bin -m 644 bootblk /usr/mdec/bootblk
>
> Feedback? OK?
Ping.
Index: sys/arch/sparc64/stand/bootblk/Makefile
===
RCS file: /cvs/src/sys/arch/sparc64/stand/bootblk/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- sys/arch/sparc64/stand/bootblk/Makefile 2 Apr 2020 06:06:22 -
1.15
+++ sys/arch/sparc64/stand/bootblk/Makefile 24 Oct 2022 07:53:27 -
@@ -9,10 +9,12 @@ S=${CURDIR}/../../../..
#
CLEANFILES=machine ffs.fth.h \
- bootblk bootblk.text bootblk.text.tmp -.d
+ bootblk.text bootblk.text.tmp -.d
+PROG= bootblk
+SRCS=
NOMAN=
-STRIPFLAG=
+INSTALL_STRIP=
BINMODE=644
INCLUDES= -I. -I$S/arch -I$S -nostdinc
@@ -24,7 +26,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM}
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
-all: bootblk.text bootblk
+all: bootblk.text
ffs.fth.h: ${.CURDIR}/genassym.sh genfth.cf
sh ${.CURDIR}/genassym.sh -f ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
@@ -38,10 +40,6 @@ bootblk.text: bootblk.fth ffs.fth.h
bootblk: bootblk.fth ffs.fth.h
fgen -o bootblk ${.CURDIR}/bootblk.fth
-
-beforeinstall:
- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- bootblk ${DESTDIR}/usr/mdec
#
# The following are if you grab the fakeboot program from the Sun website
sparc64: bootblk: let bsd.prog.mk do the work
sets up CLEANFILES, build/install targets and more, so no
need to roll them ourselves if we just set PROG and SRCS.
STRIPFLAG is defined but not used and in INSTALL_STRIP is
the magic word, so fix that.
Don't replace "bootblk" wth "${PROG}" to avoid churn.
No object change, `make' does exactly the same, `make install' got more
explicit:
-install -c -o root -g bin -m 644 bootblk /usr/mdec
+install -c -o root -g bin -m 644 bootblk /usr/mdec/bootblk
Feedback? OK?
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile
b/sys/arch/sparc64/stand/bootblk/Makefile
index 2c4d2589ce6..f544c6508ed 100644
--- a/sys/arch/sparc64/stand/bootblk/Makefile
+++ b/sys/arch/sparc64/stand/bootblk/Makefile
@@ -9,10 +9,12 @@ S=${CURDIR}/../../../..
#
CLEANFILES=machine ffs.fth.h \
- bootblk bootblk.text bootblk.text.tmp -.d
+ bootblk.text bootblk.text.tmp -.d
+PROG= bootblk
+SRCS=
NOMAN=
-STRIPFLAG=
+INSTALL_STRIP=
BINMODE=644
INCLUDES= -I. -I$S/arch -I$S -nostdinc
@@ -24,7 +26,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM}
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
-all: bootblk.text bootblk
+all: bootblk.text
ffs.fth.h: ${.CURDIR}/genassym.sh genfth.cf
sh ${.CURDIR}/genassym.sh -f ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
@@ -39,10 +41,6 @@ bootblk.text: bootblk.fth ffs.fth.h
bootblk: bootblk.fth ffs.fth.h
fgen -o bootblk ${.CURDIR}/bootblk.fth
-beforeinstall:
- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- bootblk ${DESTDIR}/usr/mdec
-
#
# The following are if you grab the fakeboot program from the Sun website
#
