Re: Fix config -p

2017-02-09 Thread Jeremie Courreges-Anglas
Martin Pieuchot  writes:

> One of the last build system changes broke 'config -p'.  Currently you
> get:
>
> $ cd /sys/arch/amd64/conf/
> $ config -p GENERIC.MP
> config -b /usr/src/sys/arch/amd64/compile/GENERIC.MP.PROF/obj -s
> /usr/src/sys /usr/src/sys/arch/amd64/conf/GENERIC.MP.PROF
> config: cannot read /usr/src/sys/arch/amd64/conf/GENERIC.MP.PROF: No
> such file or directory
> *** Error 2 in /usr/src/sys/arch/amd64/compile/GENERIC.MP.PROF
> (../Makefile.inc:12 'config')
>
> Diff below fixes that, ok?

ok

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Fix config -p

2017-02-09 Thread Martin Pieuchot
One of the last build system changes broke 'config -p'.  Currently you
get:

$ cd /sys/arch/amd64/conf/
$ config -p GENERIC.MP
config -b /usr/src/sys/arch/amd64/compile/GENERIC.MP.PROF/obj -s
/usr/src/sys /usr/src/sys/arch/amd64/conf/GENERIC.MP.PROF
config: cannot read /usr/src/sys/arch/amd64/conf/GENERIC.MP.PROF: No
such file or directory
*** Error 2 in /usr/src/sys/arch/amd64/compile/GENERIC.MP.PROF
(../Makefile.inc:12 'config')

Diff below fixes that, ok?

Index: alpha/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/alpha/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- alpha/compile/Makefile.inc  5 Nov 2016 15:48:52 -   1.3
+++ alpha/compile/Makefile.inc  9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: amd64/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/amd64/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- amd64/compile/Makefile.inc  5 Nov 2016 15:48:53 -   1.3
+++ amd64/compile/Makefile.inc  9 Feb 2017 10:13:51 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: arm64/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/arm64/compile/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- arm64/compile/Makefile.inc  17 Dec 2016 23:38:33 -  1.1
+++ arm64/compile/Makefile.inc  9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: armv7/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/armv7/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- armv7/compile/Makefile.inc  5 Nov 2016 15:48:53 -   1.3
+++ armv7/compile/Makefile.inc  9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: hppa/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/hppa/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- hppa/compile/Makefile.inc   5 Nov 2016 15:48:53 -   1.3
+++ hppa/compile/Makefile.inc   9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: i386/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/i386/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- i386/compile/Makefile.inc   5 Nov 2016 15:48:53 -   1.3
+++ i386/compile/Makefile.inc   9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: landisk/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/landisk/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- landisk/compile/Makefile.inc5 Nov 2016 15:48:53 -   1.3
+++ landisk/compile/Makefile.inc9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T:S/.PROF$//}
 .endif
 
 cleandir clean:
Index: loongson/compile/Makefile.inc
===
RCS file: /cvs/src/sys/arch/loongson/compile/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- loongson/compile/Makefile.inc   5 Nov 2016 15:48:53 -   1.3
+++ loongson/compile/Makefile.inc   9 Feb 2017 10:13:53 -
@@ -9,7 +9,7 @@ config:
 .else
 .PHONY: config clean
 config:
-   config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
+   config -b ${.OBJDIR} -s $