From 1dc13257a62ef79987eea8072020520b1d6499d3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 30 Jul 2012 19:51:07 +0200 Subject: [PATCH] kdump(1)/truss(1): Fix occasional quickworld breakage. Whenever we messed with our ioctls or certain definitions (like fcntl(2)'s O_* flags), kdump and truss could break quickworld because their generated ioctl.c and kdump_subr.c files in /usr/obj would still have removed stuff. Fix this by regenerating them every time, no matter what. --- usr.bin/kdump/Makefile | 5 ++--- usr.bin/truss/Makefile | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 84ad94eff8..02679a9901 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,6 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/kdump/Makefile,v 1.12 2006/05/20 14:27:22 netchild Exp $ -# $DragonFly: src/usr.bin/kdump/Makefile,v 1.7 2008/01/01 14:09:02 matthias Exp $ .PATH: ${.CURDIR}/../ktrace @@ -10,10 +9,10 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I${.CURDIR}/../ CLEANFILES= ioctl.c kdump_subr.c -ioctl.c: mkioctls +ioctl.c! sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -kdump_subr.c: mksubr +kdump_subr.c! sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET} .include diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile index 23132cc2f0..ac91c4bb90 100644 --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/usr.bin/truss/Makefile,v 1.10.2.2 2002/07/23 09:18:30 ru Exp $ -# $DragonFly: src/usr.bin/truss/Makefile,v 1.8 2007/08/27 16:51:00 pavalos Exp $ PROG= truss SRCS= main.c setup.c syscalls.c syscalls.h ioctl.c ${MACHINE_ARCH}-fbsd.c @@ -28,7 +27,7 @@ syscalls.h: syscalls.master /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \ ${.CURDIR}/i386.conf -ioctl.c: ${.CURDIR}/../kdump/mkioctls +ioctl.c! sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} .include -- 2.41.0